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 66 matching lines @@
 class StyleChangeReasonForTracing;
 class Text;
 class TouchEvent;
 
 const int nodeStyleChangeShift = 18;
 const int nodeCustomElementShift = 20;
 
 enum StyleChangeType {
   NoStyleChange = 0,
   LocalStyleChange = 1 << nodeStyleChangeShift,
-  SubtreeStyleChange = 2 << nodeStyleChangeShift,
-  NeedsReattachStyleChange = 3 << nodeStyleChangeShift,
+  SubtreeStyleChange = 2 << nodeStyleChangeShift

[nainar, 2016/11/29 06:13:39]

Redundant information this is encapsulated in NeedsReattachLayoutTree flag.

 };
 
 enum class CustomElementState {
   // https://dom.spec.whatwg.org/#concept-element-custom-element-state
   Uncustomized = 0,
   Custom = 1 << nodeCustomElementShift,
   Undefined = 2 << nodeCustomElementShift,
   Failed = 3 << nodeCustomElementShift,
 
   NotDefinedFlag = 2 << nodeCustomElementShift,
@@ skipping 290 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 {

[nainar, 2016/11/29 06:13:39]

Redundant information this is encapsulated in needsReattachLayoutTree() check
now. 

-    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);
   }
   bool isLink() const { return getFlag(IsLinkFlag); }
@@ skipping 11 matching lines @@
 
   void setNeedsStyleRecalc(StyleChangeType, const StyleChangeReasonForTracing&);
   void clearNeedsStyleRecalc();
 
   bool needsReattachLayoutTree() { return getFlag(NeedsReattachLayoutTree); }
   bool childNeedsReattachLayoutTree() {
     return getFlag(ChildNeedsReattachLayoutTree);
   }
 
   void setNeedsReattachLayoutTree();
+  void setLocalNeedsReattachLayoutTree() { setFlag(NeedsReattachLayoutTree); }
   void setChildNeedsReattachLayoutTree() {
     setFlag(ChildNeedsReattachLayoutTree);
   }
 
   void clearNeedsReattachLayoutTree() { clearFlag(NeedsReattachLayoutTree); }
   void clearChildNeedsReattachLayoutTree() {
     clearFlag(ChildNeedsReattachLayoutTree);
   }
 
   void markAncestorsWithChildNeedsReattachLayoutTree();
@@ skipping 382 matching lines @@
 
     HasNameOrIsEditingTextFlag = 1 << 22,
     HasEventTargetDataFlag = 1 << 23,
 
     V0CustomElementFlag = 1 << 24,
     V0CustomElementUpgradedFlag = 1 << 25,
 
     NeedsReattachLayoutTree = 1 << 26,
     ChildNeedsReattachLayoutTree = 1 << 27,
 
-    DefaultNodeFlags = IsFinishedParsingChildrenFlag | NeedsReattachStyleChange
+    DefaultNodeFlags = IsFinishedParsingChildrenFlag
   };
 
   // 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; }
@@ skipping 115 matching lines @@
 inline ContainerNode* Node::parentOrShadowHostNode() const {
   DCHECK(isMainThread());
   return m_parentOrShadowHostNode;
 }
 
 inline ContainerNode* Node::parentNode() const {
   return isShadowRoot() ? nullptr : parentOrShadowHostNode();
 }
 
 inline void Node::lazyReattachIfAttached() {
-  if (getStyleChangeType() == NeedsReattachStyleChange)
+  if (needsReattachLayoutTree())
     return;
   if (!inActiveDocument())
     return;
 
   AttachContext context;
   context.performingReattach = true;
 
   detachLayoutTree(context);
-  markAncestorsWithChildNeedsStyleRecalc();
+  markAncestorsWithChildNeedsReattachLayoutTree();

[nainar, 2016/11/29 06:13:39]

Changed to the equivalent reattachLayoutTree function.  

 }
 
 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