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

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

Issue 2376453004: Stash ComputedStyles on new HeapHashMap on Document. (Closed)
Patch Set: Post Elliott's review Created 4 years, 2 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/Element.cpp
diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index 933ae095265de2f12f0e572a266351581ee60336..2cbc3ae101fce968a33d9aec1a501747b5faf1a3 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp
@@ -1946,10 +1946,8 @@ StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change) {
}
if (localChange == Reattach) {
- // TODO(nainar): Remove the style parameter being passed into
- // buildLayoutTree(). ComputedStyle will now be stored on Node and accessed
- // in buildLayoutTree() using mutableComputedStyle().
- return rebuildLayoutTree(*newStyle);
+ document().addNonAttachedStyle(this, std::move(newStyle));
nainar 2016/10/05 03:32:37 Changed to -> *this
+ return rebuildLayoutTree();
}
DCHECK(oldStyle);
@@ -1991,9 +1989,9 @@ StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change) {
return localChange;
}
-StyleRecalcChange Element::rebuildLayoutTree(ComputedStyle& newStyle) {
+StyleRecalcChange Element::rebuildLayoutTree() {
AttachContext reattachContext;
- reattachContext.resolvedStyle = &newStyle;
+ reattachContext.resolvedStyle = document().getNonAttachedStyle(this).get();
nainar 2016/10/05 03:32:37 Changed to -> *this
bool layoutObjectWillChange = needsAttach() || layoutObject();
reattachLayoutTree(reattachContext);
if (layoutObjectWillChange || layoutObject())

Powered by Google App Engine
This is Rietveld 408576698