Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

1 files changed, 7 insertions, 7 deletions

diff --git a/webkit/glue/form_data.h b/webkit/glue/form_data.h
index 2bb7115..063b021 100644
--- a/webkit/glue/form_data.h
+++ b/webkit/glue/form_data.h
@@ -27,17 +27,17 @@ struct FormData {
   GURL origin;
   // The action target of the form.
   GURL action;
+  // true if this form was submitted by a user gesture and not javascript.
+  bool user_submitted;
   // A vector of all the input fields in the form.
   std::vector<FormField> fields;
 
+  FormData();
+  FormData(const FormData& data);
+  ~FormData();
+
   // Used by FormStructureTest.
-  inline bool operator==(const FormData& form) const {
-    return (name == form.name &&
-            StringToLowerASCII(method) == StringToLowerASCII(form.method) &&
-            origin == form.origin &&
-            action == form.action &&
-            fields == form.fields);
-  }
+  bool operator==(const FormData& form) const;
 };
 
 }  // namespace webkit_glue