Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebFormElement.cpp

diff --git a/src/third_party/WebKit/Source/web/WebFormElement.cpp b/src/third_party/WebKit/Source/web/WebFormElement.cpp
index 43a014d..196b12c 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebFormElement.cpp
+++ b/src/third_party/WebKit/Source/web/WebFormElement.cpp
@@ -29,17 +29,16 @@
  */
 
 #include "config.h"
-#include "WebFormElement.h"
+#include "public/web/WebFormElement.h"
 
 #include "HTMLNames.h"
-#include "WebFormControlElement.h"
-#include "WebInputElement.h"
 #include "core/html/HTMLFormControlElement.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLInputElement.h"
-#include "core/loader/FormState.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
+#include "public/web/WebFormControlElement.h"
+#include "public/web/WebInputElement.h"
 #include "wtf/PassRefPtr.h"
 
 using namespace WebCore;
@@ -81,25 +80,35 @@ void WebFormElement::getNamedElements(const WebString& name,
 {
     Vector<RefPtr<Element> > tempVector;
     unwrap<HTMLFormElement>()->getNamedElements(name, tempVector);
+#if ENABLE(OILPAN)
+    // FIXME: The second argument of HTMLFormElement::getNamedElements should be
+    // HeapVector<Member<Element>>.
+    Vector<WebNode> tempVector2;
+    tempVector2.reserveCapacity(tempVector.size());
+    for (size_t i = 0; i < tempVector.size(); ++i)
+        tempVector2.append(WebNode(tempVector[i].get()));
+    result.assign(tempVector2);
+#else
     result.assign(tempVector);
+#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) {
+    const FormAssociatedElement::List& associatedElements = form->associatedElements();
+    for (FormAssociatedElement::List::const_iterator it = associatedElements.begin(); it != associatedElements.end(); ++it) {
         if ((*it)->isFormControlElement())
             formControlElements.append(toHTMLFormControlElement(*it));
     }
     result.assign(formControlElements);
 }
 
-bool WebFormElement::checkValidityWithoutDispatchingEvents()
+bool WebFormElement::checkValidity()
 {
-    return unwrap<HTMLFormElement>()->checkValidityWithoutDispatchingEvents();
+    return unwrap<HTMLFormElement>()->checkValidity();
 }
 
 void WebFormElement::finishRequestAutocomplete(WebFormElement::AutocompleteResult result)
@@ -107,18 +116,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());
 }