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

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

Issue 2262973002: Switch override containing block sizes to use LayoutRareData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
Index: third_party/WebKit/Source/core/layout/LayoutBox.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h
index 716f653d181f5abc3f10378c8bdccb57ff69cccd..d6076b8da37d85dc2daecb1285809fd9fb98ce8f 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.h
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
@@ -61,8 +61,10 @@ struct LayoutBoxRareData {
public:
LayoutBoxRareData()
: m_spannerPlaceholder(nullptr)
- , m_overrideLogicalContentHeight(-1)
, m_overrideLogicalContentWidth(-1)
+ , m_overrideLogicalContentHeight(-1)
+ , m_overrideContainingBlockContentLogicalWidth(-2)
+ , m_overrideContainingBlockContentLogicalHeight(-2)
, m_percentHeightContainer(nullptr)
, m_snapContainer(nullptr)
, m_snapAreas(nullptr)
@@ -72,8 +74,13 @@ public:
// For spanners, the spanner placeholder that lays us out within the multicol container.
LayoutMultiColumnSpannerPlaceholder* m_spannerPlaceholder;
- LayoutUnit m_overrideLogicalContentHeight;
LayoutUnit m_overrideLogicalContentWidth;
+ LayoutUnit m_overrideLogicalContentHeight;
+
+ // These two can be set to -1 to override the containing block size to be
+ // undefined, so we use -2 to indicate that no override has been set.
jfernandez 2016/08/22 14:56:03 I'm not sure whether we need such a difference bet
+ LayoutUnit m_overrideContainingBlockContentLogicalWidth;
+ LayoutUnit m_overrideContainingBlockContentLogicalHeight;
LayoutUnit m_pageLogicalOffset;
LayoutUnit m_paginationStrut;

Powered by Google App Engine
This is Rietveld 408576698