Revert of Call Element::rebuildLayoutTree from Document::updateStyle directly

third_party/WebKit/Source/core/dom/Node.h

 /*
  * 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-2011, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 376 matching lines @@
   // Note: As a shadow host whose root with delegatesFocus=false may become
   // focused state when an inner element gets focused, in that case more than
   // one elements in a document can return true for |isFocused()|.  Use
   // Element::isFocusedElementInDocument() or Document::focusedElement() to
   // check which element is exactly focused.
   bool isFocused() const {
     return isUserActionElement() && isUserActionElementFocused();
   }
 
   bool needsAttach() const {
-    return getStyleChangeType() == NeedsReattachStyleChange ||
-           getFlag(NeedsReattachLayoutTree);
+    return getStyleChangeType() == NeedsReattachStyleChange;
   }
   bool needsStyleRecalc() const {
     return getStyleChangeType() != NoStyleChange;
   }
   StyleChangeType getStyleChangeType() const {
     return static_cast<StyleChangeType>(m_nodeFlags & StyleChangeMask);
   }
   bool childNeedsStyleRecalc() const {
     return getFlag(ChildNeedsStyleRecalcFlag);
   }
@@ skipping 415 matching lines @@
 
     HasNameOrIsEditingTextFlag = 1 << 22,
     HasEventTargetDataFlag = 1 << 23,
 
     V0CustomElementFlag = 1 << 24,
     V0CustomElementUpgradedFlag = 1 << 25,
 
     NeedsReattachLayoutTree = 1 << 26,
     ChildNeedsReattachLayoutTree = 1 << 27,
 
-    DefaultNodeFlags = IsFinishedParsingChildrenFlag |
-                       NeedsReattachStyleChange |
-                       NeedsReattachLayoutTree
+    DefaultNodeFlags = IsFinishedParsingChildrenFlag | NeedsReattachStyleChange
   };
 
   // 4 bits remaining.
 
   bool getFlag(NodeFlags mask) const { return m_nodeFlags & mask; }
   void setFlag(bool f, NodeFlags mask) {
     m_nodeFlags = (m_nodeFlags & ~mask) | (-(int32_t)f & mask);
   }
   void setFlag(NodeFlags mask) { m_nodeFlags |= mask; }
   void clearFlag(NodeFlags mask) { m_nodeFlags &= ~mask; }
 
   // TODO(mustaq): This is a hack to fix sites with flash objects. We should
   // instead route all WebMouseEvents through EventHandler. See
   // crbug.com/665924.
   void createAndDispatchPointerEvent(const AtomicString& mouseEventName,
                                      const WebMouseEvent&,
                                      LocalDOMWindow* view);
 
  protected:
   enum ConstructionType {
     CreateOther = DefaultNodeFlags,
     CreateText = DefaultNodeFlags | IsTextFlag,
-    CreateContainer = DefaultNodeFlags | ChildNeedsStyleRecalcFlag |
-                      ChildNeedsReattachLayoutTree |
-                      IsContainerFlag,
+    CreateContainer =
+        DefaultNodeFlags | ChildNeedsStyleRecalcFlag | IsContainerFlag,
     CreateElement = CreateContainer | IsElementFlag,
     CreateShadowRoot =
         CreateContainer | IsDocumentFragmentFlag | IsInShadowTreeFlag,
     CreateDocumentFragment = CreateContainer | IsDocumentFragmentFlag,
     CreateHTMLElement = CreateElement | IsHTMLFlag,
     CreateSVGElement = CreateElement | IsSVGFlag,
     CreateDocument = CreateContainer | IsConnectedFlag,
     CreateInsertionPoint = CreateHTMLElement | IsInsertionPointFlag,
     CreateEditingText = CreateText | HasNameOrIsEditingTextFlag,
   };
@@ skipping 103 matching lines @@
   if (needsAttach())
     return;
   if (!inActiveDocument())
     return;
 
   AttachContext context;
   context.performingReattach = true;
 
   detachLayoutTree(context);
   markAncestorsWithChildNeedsStyleRecalc();
-  markAncestorsWithChildNeedsReattachLayoutTree();
 }
 
 inline bool Node::shouldCallRecalcStyle(StyleRecalcChange change) {
   return change >= IndependentInherit || needsStyleRecalc() ||
          childNeedsStyleRecalc();
 }
 
 inline bool isTreeScopeRoot(const Node* node) {
   return !node || node->isDocumentNode() || node->isShadowRoot();
 }
@@ skipping 29 matching lines @@
 }  // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showNode(const blink::Node*);
 void showTree(const blink::Node*);
 void showNodePath(const blink::Node*);
 #endif
 
 #endif  // Node_h