Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1027)

Unified Diff: Source/core/html/HTMLOptionsCollection.cpp

Issue 280123002: Oilpan: move LiveNodeList collections to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Pre-emptively GC a long runnning test Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/html/HTMLOptionsCollection.cpp
diff --git a/Source/core/html/HTMLOptionsCollection.cpp b/Source/core/html/HTMLOptionsCollection.cpp
index fdf20fe71a3bef525f0720e13a133c6eaaa76671..c4231951208b0692386dc91b67cb5152b842336e 100644
--- a/Source/core/html/HTMLOptionsCollection.cpp
+++ b/Source/core/html/HTMLOptionsCollection.cpp
@@ -64,9 +64,9 @@ void HTMLOptionsCollection::supportedPropertyNames(Vector<String>& names)
}
}
-PassRefPtr<HTMLOptionsCollection> HTMLOptionsCollection::create(ContainerNode& select, CollectionType)
+PassRefPtrWillBeRawPtr<HTMLOptionsCollection> HTMLOptionsCollection::create(ContainerNode& select, CollectionType)
{
- return adoptRef(new HTMLOptionsCollection(select));
+ return adoptRefWillBeNoop(new HTMLOptionsCollection(select));
}
void HTMLOptionsCollection::add(PassRefPtrWillBeRawPtr<HTMLOptionElement> element, ExceptionState& exceptionState)
@@ -123,9 +123,9 @@ void HTMLOptionsCollection::setLength(unsigned length, ExceptionState& exception
toHTMLSelectElement(ownerNode()).setLength(length, exceptionState);
}
-void HTMLOptionsCollection::namedGetter(const AtomicString& name, bool& returnValue0Enabled, RefPtr<NodeList>& returnValue0, bool& returnValue1Enabled, RefPtr<Element>& returnValue1)
+void HTMLOptionsCollection::namedGetter(const AtomicString& name, bool& returnValue0Enabled, RefPtrWillBeRawPtr<NodeList>& returnValue0, bool& returnValue1Enabled, RefPtr<Element>& returnValue1)
{
- Vector<RefPtr<Element> > namedItems;
+ WillBeHeapVector<RefPtrWillBeMember<Element> > namedItems;
this->namedItems(name, namedItems);
if (!namedItems.size())
@@ -133,7 +133,12 @@ void HTMLOptionsCollection::namedGetter(const AtomicString& name, bool& returnVa
if (namedItems.size() == 1) {
returnValue1Enabled = true;
+#if ENABLE(OILPAN)
+ // FIXME: Oilpan: remove once Element becomes [GarbageCollected].
+ returnValue1 = PassRefPtr<Element>(namedItems.at(0).get());
+#else
returnValue1 = namedItems.at(0);
+#endif
return;
}

Powered by Google App Engine
This is Rietveld 408576698