Merge Chromium at r65505: Work around regression introduced by 64761

This is a temporary workaround to fix the regression introduced on
Android by http://src.chromium.org/viewvc/chrome?view=rev&revision=64761

It should be reverted when we understand better the root cause of the
regression.

Change-Id: I6652d817254f1b8c3857e2f14b53d5d034d2f12f

1 files changed, 7 insertions, 1 deletions

diff --git a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp
index ea389f7..bd10eb8 100644
--- a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp
@@ -91,6 +91,12 @@ string16 FindChildTextInner(Node* node, int depth) {
     if (!node || depth <= 0)
         return element_text;
 
+    // FIXME: Temporary ANDROID workaround for regression introduced by
+    // Chromium change 64761 on sites that have script inbetween form controls.
+    // Need to understand why Chromium doesn't need this.
+    if (node->hasTagName(scriptTag))
+        return element_text;
+
     string16 node_text = WTFStringToString16(node->nodeValue());
     TrimWhitespace(node_text, TRIM_ALL, &node_text);
     if (!node_text.empty())
@@ -216,7 +222,7 @@ string16 InferLabelFromTable(const HTMLFormControlElement& element) {
         }
         previous = previous->previousSibling();
     }
-   return inferred_label;
+    return inferred_label;
 }
 
 // Helper for |InferLabelForElement()| that infers a label, if possible, from