[Password Manager] Check node visibility with isFocusable instead of hasNonEmptyLayoutSize

components/autofill/content/renderer/form_autofill_util.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/content/renderer/form_autofill_util.h"
 
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
@@ skipping 1240 matching lines @@
       }
     }
   }
 
   return false;
 }
 
 bool IsSomeControlElementVisible(
     const WebVector<WebFormControlElement>& control_elements) {
   for (const WebFormControlElement& control_element : control_elements) {
-    if (IsWebNodeVisible(control_element))
+    if (IsWebElementVisible(control_element))
       return true;
   }
   return false;
 }
 
 bool AreFormContentsVisible(const WebFormElement& form) {
   WebVector<WebFormControlElement> control_elements;
   form.getFormControlElements(control_elements);
   return IsSomeControlElementVisible(control_elements);
 }
@@ skipping 54 matching lines @@
 
 const base::string16 GetFormIdentifier(const WebFormElement& form) {
   base::string16 identifier = form.name().utf16();
   CR_DEFINE_STATIC_LOCAL(WebString, kId, ("id"));
   if (identifier.empty())
     identifier = form.getAttribute(kId).utf16();
 
   return identifier;
 }
 
-bool IsWebNodeVisible(const blink::WebNode& node) {
-  // TODO(esprehn): This code doesn't really check if the node is visible, just
-  // if the node takes up space in the layout. Does it want to check opacity,
-  // transform, and visibility too?
-  if (!node.isElementNode())
-    return false;
-  const WebElement element = node.toConst<WebElement>();
-  return element.hasNonEmptyLayoutSize();
+bool IsWebElementVisible(const blink::WebElement& element) {
+  // hasNonEmptyLayoutSize might trigger layout, but it didn't cause problems so
+  // far. If the layout is prohibited, hasNonEmptyLayoutSize is still used. See
+  // details in crbug.com/595078.
+  bool res = g_prevent_layout ? element.hasNonEmptyLayoutSize()
+                              : element.isFocusable();
+  return res;
 }
 
 std::vector<blink::WebFormControlElement> ExtractAutofillableElementsFromSet(
     const WebVector<WebFormControlElement>& control_elements) {
   std::vector<blink::WebFormControlElement> autofillable_elements;
   for (size_t i = 0; i < control_elements.size(); ++i) {
     WebFormControlElement element = control_elements[i];
     if (!IsAutofillableElement(element))
       continue;
 
@@ skipping 462 matching lines @@
     // Zero selection start is for password manager, which can show usernames
     // that do not begin with the user input value.
     selection_start = (offset == base::string16::npos) ? 0 : offset;
   }
 
   input_element->setSelectionRange(selection_start, suggestion.length());
 }
 
 }  // namespace form_util
 }  // namespace autofill