Avoid unnecessary style recalc for subtree of focused element.

Source/core/dom/ContainerNode.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 773 matching lines @@
     if (foundUpperLeft != foundLowerRight) {
         if (foundUpperLeft)
             lowerRight = upperLeft;
         else
             upperLeft = lowerRight;
     }
 
     return enclosingLayoutRect(FloatRect(upperLeft, lowerRight.expandedTo(upperLeft) - upperLeft));
 }
 
+static inline StyleChangeType focusStyleChange(const ContainerNode* node)

[esprehn, 2014/01/22 20:58:52]

This should be a private method, you always pass |this|.

[rune, 2014/01/30 23:24:36]

Done. That is, the method is now gone.

+{
+    // -webkit-user-modify (from contenteditable) needs special propagation (see StyleResolver)
+    // into the shadow dom. Do SubtreeStyleChange even if children are not affected by focus to
+    // cover that.
+    if (node->isElementNode() && (toElement(node)->childrenAffectedByFocus() || toElement(node)->shadow()))

[esprehn, 2014/01/22 20:58:52]

This shadow check doesn't seem right, why do you need to do a subtree recalc if
the thing has a shadow?

[rune, 2014/01/30 17:24:40]

It's about the propagation of -webkit-user-modify for contenteditable into
distributed nodes. I've split out it out as a separate issue[1]/CL with a
different solution[2] and will remove the special casing here.

[1] https://code.google.com/p/chromium/issues/detail?id=339463
[2] https://codereview.chromium.org/144853004/

[rune, 2014/01/30 23:24:36]

Done.

+        return SubtreeStyleChange;
+    if (!node->renderer() || node->renderStyle()->affectedByFocus())
+        return LocalStyleChange;
+    return NoStyleChange;
+}
+
 // This is used by FrameSelection to denote when the active-state of the page has changed
 // independent of the focused element changing.
 void ContainerNode::focusStateChanged()
 {
     // If we're just changing the window's active state and the focused node has no
     // renderer we can just ignore the state change.
     if (!renderer())
         return;
-    // FIXME: This could probably setNeedsStyleRecalc(LocalStyleChange) in the affectedByFocus case
-    // and only setNeedsStyleRecalc(SubtreeStyleChange) in the childrenAffectedByFocus case.
-    if (renderStyle()->affectedByFocus() || (isElementNode() && toElement(this)->childrenAffectedByFocus()))
-        setNeedsStyleRecalc();
+
+    StyleChangeType change = focusStyleChange(this);
+    if (change != NoStyleChange)
+        setNeedsStyleRecalc(change);
     if (renderer() && renderer()->style()->hasAppearance())
         RenderTheme::theme().stateChanged(renderer(), FocusState);
 }
 
 void ContainerNode::setFocus(bool received)
 {
     if (focused() == received)
         return;
 
     Node::setFocus(received);
 
     focusStateChanged();
     // If :focus sets display: none, we lose focus but still need to recalc our style.
-    if (!renderer() && !received)
-        setNeedsStyleRecalc();
+    if (!renderer() && !received) {
+        ASSERT(focusStyleChange(this) != NoStyleChange);
+        setNeedsStyleRecalc(focusStyleChange(this));
+    }
 }
 
 void ContainerNode::setActive(bool down)
 {
     if (down == active())
         return;
 
     Node::setActive(down);
 
     // FIXME: Why does this not need to handle the display: none transition like :hover does?
@@ skipping 146 matching lines @@
         return true;
 
     if (node->isElementNode() && toElement(node)->shadow())
         return true;
 
     return false;
 }
 #endif
 
 } // namespace WebCore