Revert "Merge Chromium at r65505: Work around regression introduced by 64761"

This reverts commit 0c918ae77b5edfe59b726ff40a7c86dbc4a94307.

This was actually not really a regression as we were still broken
previously it's just that this change makes that breakage more visible.

The problem reproduces on tip of tree Chromium, so we can make the fix
upstream and then cherry pick into Android.

Change-Id: I4d65544b4ea137d77c00a39fcd29edb28b40aa1c

diff --git a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp
index bd10eb8..9942bec 100644 (file)
--- a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp
@@ -91,12 +91,6 @@ 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())