Oilpan: Prepare to support garbage-collected Node in WebNode hierarchy.

Source/web/WebFormElement.cpp

Index: Source/web/WebFormElement.cpp
diff --git a/Source/web/WebFormElement.cpp b/Source/web/WebFormElement.cpp
index 1a460e9272f51cb7a854867f48ab05e6a4ee74f9..b470f99e100fd4f6e582676a1a7b5d6d9480f02d 100644
--- a/Source/web/WebFormElement.cpp
+++ b/Source/web/WebFormElement.cpp
@@ -80,13 +80,21 @@ void WebFormElement::getNamedElements(const WebString& name,
 {
     Vector<RefPtr<Element> > tempVector;
     unwrap<HTMLFormElement>()->getNamedElements(name, tempVector);
+#if !ENABLE(OILPAN)

[haraken, 2014/05/08 06:22:37]

#if ENABLE(OILPAN)
#else
#endif

would be better.

Also add a FIXME that this should be removed once we change |tempVector| to
WillBeHeapVector<RefPtrWillBeMember<Element>>.

[tkent, 2014/05/08 07:39:30]

Done.

     result.assign(tempVector);
+#else
+    Vector<WebNode> tempVector2;

[wibling-chromium, 2014/05/08 07:07:01]

Just to make sure i understand. This extra copy is only needed until we change
HTMLFormElement's getNamedLElements to return a Vector<RefPtrWillBeRawPtr<Node>?
If so could we add a FIXME?

[tkent, 2014/05/08 07:39:30]

Right.  We can remove the extra copy later.

+    tempVector2.reserveCapacity(tempVector.size());
+    for (size_t i = 0; i < tempVector.size(); ++i)
+        tempVector2.append(WebNode(tempVector[i].get()));
+    result.assign(tempVector2);
+#endif
 }
 
 void WebFormElement::getFormControlElements(WebVector<WebFormControlElement>& result) const
 {
     const HTMLFormElement* form = constUnwrap<HTMLFormElement>();
-    Vector<RefPtr<HTMLFormControlElement> > formControlElements;
+    Vector<WebFormControlElement> formControlElements;
 
     const Vector<FormAssociatedElement*>& associatedElements = form->associatedElements();
     for (Vector<FormAssociatedElement*>::const_iterator it = associatedElements.begin(); it != associatedElements.end(); ++it) {
@@ -106,18 +114,18 @@ void WebFormElement::finishRequestAutocomplete(WebFormElement::AutocompleteResul
     unwrap<HTMLFormElement>()->finishRequestAutocomplete(static_cast<HTMLFormElement::AutocompleteResult>(result));
 }
 
-WebFormElement::WebFormElement(const PassRefPtr<HTMLFormElement>& e)
+WebFormElement::WebFormElement(const PassRefPtrWillBeRawPtr<HTMLFormElement>& e)
     : WebElement(e)
 {
 }
 
-WebFormElement& WebFormElement::operator=(const PassRefPtr<HTMLFormElement>& e)
+WebFormElement& WebFormElement::operator=(const PassRefPtrWillBeRawPtr<HTMLFormElement>& e)
 {
     m_private = e;
     return *this;
 }
 
-WebFormElement::operator PassRefPtr<HTMLFormElement>() const
+WebFormElement::operator PassRefPtrWillBeRawPtr<HTMLFormElement>() const
 {
     return toHTMLFormElement(m_private.get());
 }