Call Element::rebuildLayoutTree from Document::updateStyle directly

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

Index: third_party/WebKit/Source/core/dom/Text.cpp
diff --git a/third_party/WebKit/Source/core/dom/Text.cpp b/third_party/WebKit/Source/core/dom/Text.cpp
index 1e87792813ed10ae22ece3343ba8fafb276c9143..e13dffeb6a844bf150cc1d1bda059409d2b2014d 100644
--- a/third_party/WebKit/Source/core/dom/Text.cpp
+++ b/third_party/WebKit/Source/core/dom/Text.cpp
@@ -392,15 +392,30 @@ void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling) {
     if (needsStyleRecalc())
       layoutItem.setText(dataImpl());
     clearNeedsStyleRecalc();
+    // 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.
+    clearNeedsReattachLayoutTree();
   } else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) {
-    rebuildTextLayoutTree(nextTextSibling);
+    StyleReattachData styleReattachData;
+    styleReattachData.nextTextSibling = nextTextSibling;
+    document().addStyleReattachData(*this, styleReattachData);
+    setNeedsReattachLayoutTree();
   }
 }
 
-void Text::rebuildTextLayoutTree(Text* nextTextSibling) {
+void Text::rebuildTextLayoutTree() {
+  DCHECK(!childNeedsStyleRecalc());
+  DCHECK(needsReattachLayoutTree());
+  DCHECK(parentNode());
+
   reattachLayoutTree();
-  if (layoutObject())
-    reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
+  if (layoutObject()) {
+    reattachWhitespaceSiblingsIfNeeded(
+        document().getStyleReattachData(*this).nextTextSibling);
+  } else {
+    clearNeedsStyleRecalc();
+  }
   clearNeedsReattachLayoutTree();
 }