Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/web/WebSearchableFormData.cpp b/src/third_party/WebKit/Source/web/WebSearchableFormData.cpp
index f4c9855..0c78ee4 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebSearchableFormData.cpp
+++ b/src/third_party/WebKit/Source/web/WebSearchableFormData.cpp
@@ -29,11 +29,9 @@
  */
 
 #include "config.h"
-#include "WebSearchableFormData.h"
+#include "public/web/WebSearchableFormData.h"
 
 #include "HTMLNames.h"
-#include "WebFormElement.h"
-#include "WebInputElement.h"
 #include "core/dom/Document.h"
 #include "core/html/FormDataList.h"
 #include "core/html/HTMLFormControlElement.h"
@@ -42,6 +40,8 @@
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/HTMLSelectElement.h"
 #include "platform/network/FormDataBuilder.h"
+#include "public/web/WebFormElement.h"
+#include "public/web/WebInputElement.h"
 #include "wtf/text/TextEncoding.h"
 
 using namespace WebCore;
@@ -80,8 +80,8 @@ bool IsHTTPFormSubmit(const HTMLFormElement* form)
 HTMLFormControlElement* GetButtonToActivate(HTMLFormElement* form)
 {
     HTMLFormControlElement* firstSubmitButton = 0;
-    const Vector<FormAssociatedElement*>& element = form->associatedElements();
-    for (Vector<FormAssociatedElement*>::const_iterator i(element.begin()); i != element.end(); ++i) {
+    const FormAssociatedElement::List& element = form->associatedElements();
+    for (FormAssociatedElement::List::const_iterator i(element.begin()); i != element.end(); ++i) {
         if (!(*i)->isFormControlElement())
             continue;
         HTMLFormControlElement* control = toHTMLFormControlElement(*i);
@@ -99,9 +99,9 @@ HTMLFormControlElement* GetButtonToActivate(HTMLFormElement* form)
 // selected state.
 bool IsSelectInDefaultState(HTMLSelectElement* select)
 {
-    const Vector<HTMLElement*>& listItems = select->listItems();
+    const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = select->listItems();
     if (select->multiple() || select->size() > 1) {
-        for (Vector<HTMLElement*>::const_iterator i(listItems.begin()); i != listItems.end(); ++i) {
+        for (WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >::const_iterator i(listItems.begin()); i != listItems.end(); ++i) {
             if (!(*i)->hasLocalName(HTMLNames::optionTag))
                 continue;
             HTMLOptionElement* optionElement = toHTMLOptionElement(*i);
@@ -114,7 +114,7 @@ bool IsSelectInDefaultState(HTMLSelectElement* select)
     // The select is rendered as a combobox (called menulist in WebKit). At
     // least one item is selected, determine which one.
     HTMLOptionElement* initialSelected = 0;
-    for (Vector<HTMLElement*>::const_iterator i(listItems.begin()); i != listItems.end(); ++i) {
+    for (WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >::const_iterator i(listItems.begin()); i != listItems.end(); ++i) {
         if (!(*i)->hasLocalName(HTMLNames::optionTag))
             continue;
         HTMLOptionElement* optionElement = toHTMLOptionElement(*i);
@@ -155,8 +155,8 @@ bool IsInDefaultState(HTMLFormControlElement* formElement)
 HTMLInputElement* findSuitableSearchInputElement(const HTMLFormElement* form)
 {
     HTMLInputElement* textElement = 0;
-    const Vector<FormAssociatedElement*>& element = form->associatedElements();
-    for (Vector<FormAssociatedElement*>::const_iterator i(element.begin()); i != element.end(); ++i) {
+    const FormAssociatedElement::List& element = form->associatedElements();
+    for (FormAssociatedElement::List::const_iterator i(element.begin()); i != element.end(); ++i) {
         if (!(*i)->isFormControlElement())
             continue;
 
@@ -198,8 +198,8 @@ bool buildSearchString(const HTMLFormElement* form, Vector<char>* encodedString,
 {
     bool isElementFound = false;
 
-    Vector<FormAssociatedElement*> elements = form->associatedElements();
-    for (Vector<FormAssociatedElement*>::const_iterator i(elements.begin()); i != elements.end(); ++i) {
+    const FormAssociatedElement::List& elements = form->associatedElements();
+    for (FormAssociatedElement::List::const_iterator i(elements.begin()); i != elements.end(); ++i) {
         if (!(*i)->isFormControlElement())
             continue;
 
@@ -235,8 +235,8 @@ namespace blink {
 
 WebSearchableFormData::WebSearchableFormData(const WebFormElement& form, const WebInputElement& selectedInputElement)
 {
-    RefPtr<HTMLFormElement> formElement = form.operator PassRefPtr<HTMLFormElement>();
-    HTMLInputElement* inputElement = selectedInputElement.operator PassRefPtr<HTMLInputElement>().get();
+    RefPtrWillBeRawPtr<HTMLFormElement> formElement = static_cast<PassRefPtrWillBeRawPtr<HTMLFormElement> >(form);
+    HTMLInputElement* inputElement = static_cast<PassRefPtrWillBeRawPtr<HTMLInputElement> >(selectedInputElement).get();
 
     // Only consider forms that GET data.
     // Allow HTTPS only when an input element is provided.