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

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

Issue 1320843005: Update outer flow thread membership before changing multicolness. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | « Source/core/layout/LayoutMultiColumnFlowThread.cpp ('k') | 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 fb0062c7711f8310c7700117e88d6e360ffe14e5..5821745f9ef884bfe2419989ea5508eb42914be4 100644
--- a/Source/core/layout/LayoutObject.cpp
+++ b/Source/core/layout/LayoutObject.cpp
@@ -1790,11 +1790,6 @@ void LayoutObject::setStyle(PassRefPtr<ComputedStyle> style)
diff = adjustStyleDifference(diff);
- if (m_style) {
- LayoutFlowThread* flowThread = flowThreadContainingBlock();
- if (flowThread && flowThread != this)
- flowThread->flowThreadDescendantStyleWillChange(this, diff, *style);
- }
styleWillChange(diff, *style);
RefPtr<ComputedStyle> oldStyle = m_style.release();
@@ -1811,11 +1806,6 @@ void LayoutObject::setStyle(PassRefPtr<ComputedStyle> style)
bool doesNotNeedLayoutOrPaintInvalidation = !m_parent;
styleDidChange(diff, oldStyle.get());
- if (oldStyle.get()) {
- LayoutFlowThread* flowThread = flowThreadContainingBlock();
- if (flowThread && flowThread != this)
- flowThread->flowThreadDescendantStyleDidChange(this, diff, *oldStyle.get());
- }
// FIXME: |this| might be destroyed here. This can currently happen for a LayoutTextFragment when
// its first-letter block gets an update in LayoutTextFragment::styleDidChange. For LayoutTextFragment(s),
« no previous file with comments | « Source/core/layout/LayoutMultiColumnFlowThread.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698