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 325cfb89ccaee816c99dae94a775edcd4f68b27c..a91d203ef44d8614c8a0de5a36943083c4687d10 100644 |
--- a/third_party/WebKit/Source/core/dom/Text.cpp |
+++ b/third_party/WebKit/Source/core/dom/Text.cpp |
@@ -394,16 +394,29 @@ void Text::recalcTextStyle(StyleRecalcChange change, Text* nextTextSibling) { |
layoutItem.setStyle(document().ensureStyleResolver().styleForText(this)); |
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(); |
} |
+ clearNeedsStyleRecalc(); |
} |
-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); |
+ } |
clearNeedsReattachLayoutTree(); |
} |