Make sure Document::updateLayoutTree*() is called before Element::isFocusable().

third_party/WebKit/Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 240 matching lines @@
 bool Element::layoutObjectIsFocusable() const
 {
     // Elements in canvas fallback content are not rendered, but they are allowed to be
     // focusable as long as their canvas is displayed and visible.
     if (isInCanvasSubtree()) {
         const HTMLCanvasElement* canvas = Traversal<HTMLCanvasElement>::firstAncestorOrSelf(*this);
         ASSERT(canvas);
         return canvas->layoutObject() && canvas->layoutObject()->style()->visibility() == VISIBLE;
     }
 
-    // FIXME: These asserts should be in Node::isFocusable, but there are some
-    // callsites like Document::setFocusedElement that would currently fail on
-    // them. See crbug.com/251163
-    if (!layoutObject()) {
-        // We can't just use needsStyleRecalc() because if the node is in a
-        // display:none tree it might say it needs style recalc but the whole
-        // document is actually up to date.
-        // In addition, style cannot be cleared out for non-active documents,
-        // so in that case the childNeedsStyleRecalc check is invalid.
-        ASSERT(!document().isActive() || !document().childNeedsStyleRecalc());
-    }
-
     // FIXME: Even if we are not visible, we might have a child that is visible.
     // Hyatt wants to fix that some day with a "has visible content" flag or the like.
-    if (!layoutObject() || layoutObject()->style()->visibility() != VISIBLE)
-        return false;
-
-    return true;
+    return layoutObject() && layoutObject()->style()->visibility() == VISIBLE;
 }
 
 PassRefPtrWillBeRawPtr<Node> Element::cloneNode(bool deep)
 {
     return deep ? cloneElementWithChildren() : cloneElementWithoutChildren();
 }
 
 PassRefPtrWillBeRawPtr<Element> Element::cloneElementWithChildren()
 {
     RefPtrWillBeRawPtr<Element> clone = cloneElementWithoutChildren();
@@ skipping 2150 matching lines @@
     if (!isSVGElement())
         return false;
     return (hasEventListeners(EventTypeNames::focus)
         || hasEventListeners(EventTypeNames::blur)
         || hasEventListeners(EventTypeNames::focusin)
         || hasEventListeners(EventTypeNames::focusout));
 }
 
 bool Element::isFocusable() const
 {
+    ASSERT(!document().isActive() || !document().childNeedsStyleRecalc());

[falken, 2016/02/05 04:42:40]

Was the comment about using childNeedsStyleRecalc() rather than just
needsStyleRecalc() useful?

[tkent, 2016/02/05 04:57:45]

Ah, the comment is still valid.  I add it again.

     return inDocument() && supportsFocus() && !isInert() && layoutObjectIsFocusable();
 }
 
 bool Element::isKeyboardFocusable() const
 {
     return isFocusable() && tabIndex() >= 0;
 }
 
 bool Element::isMouseFocusable() const
 {
@@ skipping 1164 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink