From d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 11 Jan 2012 10:03:25 +0100
Subject: Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3
 (http://svn.webkit.org/repository/webkit/trunk@104681)

---
 Source/WebCore/html/HTMLSelectElement.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'Source/WebCore/html/HTMLSelectElement.cpp')

diff --git a/Source/WebCore/html/HTMLSelectElement.cpp b/Source/WebCore/html/HTMLSelectElement.cpp
index 95421f30b..bfebf8e64 100644
--- a/Source/WebCore/html/HTMLSelectElement.cpp
+++ b/Source/WebCore/html/HTMLSelectElement.cpp
@@ -92,12 +92,6 @@ HTMLSelectElement::HTMLSelectElement(const QualifiedName& tagName, Document* doc
     ASSERT(hasTagName(selectTag));
 }
 
-HTMLSelectElement::~HTMLSelectElement()
-{
-    if (m_optionsCollection)
-        m_optionsCollection->detachFromNode();
-}
-
 PassRefPtr<HTMLSelectElement> HTMLSelectElement::create(const QualifiedName& tagName, Document* document, HTMLFormElement* form)
 {
     ASSERT(tagName.matches(selectTag));
@@ -331,11 +325,11 @@ RenderObject* HTMLSelectElement::createRenderer(RenderArena* arena, RenderStyle*
     return new (arena) RenderListBox(this);
 }
 
-PassRefPtr<HTMLOptionsCollection> HTMLSelectElement::options()
+HTMLOptionsCollection* HTMLSelectElement::options()
 {
     if (!m_optionsCollection)
         m_optionsCollection = HTMLOptionsCollection::create(this);
-    return m_optionsCollection;
+    return m_optionsCollection.get();
 }
 
 void HTMLSelectElement::updateListItemSelectedStates()
-- 
cgit v1.2.1