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

Unified Diff: Source/core/layout/LayoutObject.cpp

Issue 1155023002: Only notify the flowthread about style changes on actual descendants. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutObject.cpp
diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp
index 600d9b8d40123ecc948d3ef9fb1d0242c5b25479..f668620b095015648d489dd76352b72f812f59c8 100644
--- a/Source/core/layout/LayoutObject.cpp
+++ b/Source/core/layout/LayoutObject.cpp
@@ -1746,7 +1746,8 @@ void LayoutObject::setStyle(PassRefPtr<ComputedStyle> style)
diff = adjustStyleDifference(diff);
if (m_style) {
- if (LayoutFlowThread* flowThread = flowThreadContainingBlock())
+ LayoutFlowThread* flowThread = flowThreadContainingBlock();
+ if (flowThread && flowThread != this)
flowThread->flowThreadDescendantStyleWillChange(this, diff, *style);
}
styleWillChange(diff, *style);
@@ -1766,7 +1767,8 @@ void LayoutObject::setStyle(PassRefPtr<ComputedStyle> style)
styleDidChange(diff, oldStyle.get());
if (oldStyle.get()) {
- if (LayoutFlowThread* flowThread = flowThreadContainingBlock())
+ LayoutFlowThread* flowThread = flowThreadContainingBlock();
+ if (flowThread && flowThread != this)
flowThread->flowThreadDescendantStyleDidChange(this, diff, *oldStyle.get());
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698