Call Element::rebuildLayoutTree from Document::updateStyle directly

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 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 377 matching lines @@
         .createLayoutObject();
   CharacterData::attachLayoutTree(reattachContext);
 }
 
 void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling) {
   if (LayoutTextItem layoutItem = LayoutTextItem(this->layoutObject())) {
     if (change != NoChange || needsStyleRecalc())
       layoutItem.setStyle(document().ensureStyleResolver().styleForText(this));
     if (needsStyleRecalc())
       layoutItem.setText(dataImpl());
-    clearNeedsStyleRecalc();
+    clearNeedsReattachLayoutTree();

[nainar, 2016/12/07 14:48:21]

In case we don't perform rebuildTextLayoutTree we will never clear the
NeedsReattachLayoutTree flag which is set on the creation of each Node. Clear
that here.

[Bugs Nash, 2016/12/07 23:21:44]

as above, if there is a need to explain the code in the review, the explanation
would be useful in the code itself

[nainar, 2016/12/07 23:49:10]

Done locally.

   } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) {
-    rebuildTextLayoutTree(nextTextSibling);
+    StyleReattachData styleReattachData;
+    styleReattachData.computedStyle = nullptr;
+    styleReattachData.nextTextSibling = nextTextSibling;
+    document().addStyleReattachData(*this, styleReattachData);
+    setNeedsReattachLayoutTree();
   }
+  clearNeedsStyleRecalc();
 }
 
-void Text::rebuildTextLayoutTree(Text* nextTextSibling) {
+void Text::rebuildTextLayoutTree() {
+  DCHECK(!needsStyleRecalc());
+  DCHECK(!childNeedsStyleRecalc());
+  DCHECK(needsReattachLayoutTree());
+  DCHECK(parentNode());
+
   reattachLayoutTree();
-  if (layoutObject())
-    reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
+  if (layoutObject()) {
+    reattachWhitespaceSiblingsIfNeeded(
+        document().getStyleReattachData(*this).nextTextSibling);
+  }
   clearNeedsReattachLayoutTree();
 }
 
 // If a whitespace node had no layoutObject and goes through a recalcStyle it
 // may need to create one if the parent style now has white-space: pre.
 bool Text::needsWhitespaceLayoutObject() {
   DCHECK(!layoutObject());
   if (const ComputedStyle* style = parentComputedStyle())
     return style->preserveNewline();
   return false;
@@ skipping 32 matching lines @@
 
 Text* Text::cloneWithData(const String& data) {
   return create(document(), data);
 }
 
 DEFINE_TRACE(Text) {
   CharacterData::trace(visitor);
 }
 
 }  // namespace blink