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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h

Issue 2479873002: Descendants may become or cease to be spanners when an ancestor changes style. (Closed)
Patch Set: Created 4 years, 1 month 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/layout/LayoutMultiColumnFlowThread.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h
index e2ada2f52cf5a56b8e8fb2bcf2360c3d7d5fcb47..b2c3757210cf53a6fd14f12ed08e37703f21e0ee 100644
--- a/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h
+++ b/third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h
@@ -310,6 +310,7 @@ class CORE_EXPORT LayoutMultiColumnFlowThread : public LayoutFlowThread,
LayoutBox*,
StyleDifference,
const ComputedStyle& oldStyle) override;
+ void toggleSpannersInSubtree(LayoutBox*);
void computePreferredLogicalWidths() override;
void computeLogicalHeight(LayoutUnit logicalHeight,
LayoutUnit logicalTop,
@@ -327,6 +328,13 @@ class CORE_EXPORT LayoutMultiColumnFlowThread : public LayoutFlowThread,
// collapsing), and possibly for other reasons.
LayoutMultiColumnSet* m_lastSetWorkedOn;
+#if DCHECK_IS_ON()
+ // Used to check consistency between calls to
+ // flowThreadDescendantStyleWillChange() and
+ // flowThreadDescendantStyleDidChange().
+ static const LayoutBox* s_styleChangedBox;
+#endif
+
// The used value of column-count
unsigned m_columnCount;
// Total height available to columns, or 0 if auto.
@@ -339,9 +347,19 @@ class CORE_EXPORT LayoutMultiColumnFlowThread : public LayoutFlowThread,
// Set when column heights are out of sync with actual layout.
bool m_columnHeightsChanged;
+
// Always true for regular multicol. False for paged-y overflow.
bool m_progressionIsInline;
+
bool m_isBeingEvacuated;
+
+ // Specifies whether the the descendant whose style is about to change could
+ // contain spanners or not. The flag is set in
+ // flowThreadDescendantStyleWillChange(), and then checked in
+ // flowThreadDescendantStyleDidChange().
+ static bool s_couldContainSpanners;
+
+ static bool s_toggleSpannersIfNeeded;
};
// Cannot use DEFINE_LAYOUT_OBJECT_TYPE_CASTS here, because

Powered by Google App Engine
This is Rietveld 408576698