Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: third_party/WebKit/Source/core/dom/Text.cpp

Issue 2729453002: Revert of Call Element::rebuildLayoutTree from Document::updateStyle directly (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 05c92685e2afdf82ae68fcd03ad6ad3d583f8201..7ab8e0701db4a629bac56af380740335743a2f07 100644
--- a/third_party/WebKit/Source/core/dom/Text.cpp
+++ b/third_party/WebKit/Source/core/dom/Text.cpp
@@ -393,23 +393,14 @@
layoutItem.setText(dataImpl());
clearNeedsStyleRecalc();
} else if (needsStyleRecalc() || needsWhitespaceLayoutObject()) {
- StyleReattachData styleReattachData;
- styleReattachData.nextTextSibling = nextTextSibling;
- document().addStyleReattachData(*this, styleReattachData);
- setNeedsReattachLayoutTree();
- }
-}
-
-void Text::rebuildTextLayoutTree() {
- DCHECK(!childNeedsStyleRecalc());
- DCHECK(needsReattachLayoutTree());
- DCHECK(parentNode());
-
+ rebuildTextLayoutTree(nextTextSibling);
+ }
+}
+
+void Text::rebuildTextLayoutTree(Text* nextTextSibling) {
reattachLayoutTree();
- if (layoutObject()) {
- reattachWhitespaceSiblingsIfNeeded(
- document().getStyleReattachData(*this).nextTextSibling);
- }
+ if (layoutObject())
+ reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
clearNeedsReattachLayoutTree();
}
« no previous file with comments | « third_party/WebKit/Source/core/dom/Text.h ('k') | third_party/WebKit/Source/core/dom/shadow/ElementShadow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698