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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2681833004: Automatically generate EBreakBetween & EBreakInside (Closed)
Patch Set: Created 3 years, 10 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/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index 2942825c258f540c594652497f39aaf94dda38ad..fe88213edc202be6be828a666395888d1610cac9 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -227,11 +227,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
m_overflowX == other.m_overflowX &&
m_overflowY == other.m_overflowY &&
m_verticalAlign == other.m_verticalAlign &&
- m_position == other.m_position &&
- // hasViewportUnits
- m_breakBefore == other.m_breakBefore &&
- m_breakAfter == other.m_breakAfter &&
- m_breakInside == other.m_breakInside;
+ m_position == other.m_position;
+ // hasViewportUnits
amoylan 2017/02/08 02:29:45 Formatter was pretty eager to de-indent this // ha
sashab 2017/02/08 02:32:15 Haha, good question... Get rid of them all. They p
shend 2017/02/08 03:32:26 I think the comments were used to explicitly indic
// styleType
// pseudoBits
// explicitInheritance
@@ -263,10 +260,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// 32 bits
- unsigned m_breakBefore : 4; // EBreakBetween
- unsigned m_breakAfter : 4; // EBreakBetween
- unsigned m_breakInside : 2; // EBreakInside
-
unsigned m_styleType : 6; // PseudoId
unsigned m_pseudoBits : 8;
unsigned m_explicitInheritance : 1; // Explicitly inherits a non-inherited
@@ -310,12 +303,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
m_nonInheritedData.m_verticalAlign =
static_cast<unsigned>(initialVerticalAlign());
m_nonInheritedData.m_position = initialPosition();
- m_nonInheritedData.m_breakBefore =
- static_cast<unsigned>(initialBreakBefore());
- m_nonInheritedData.m_breakAfter =
- static_cast<unsigned>(initialBreakAfter());
- m_nonInheritedData.m_breakInside =
- static_cast<unsigned>(initialBreakInside());
m_nonInheritedData.m_styleType = PseudoIdNone;
m_nonInheritedData.m_pseudoBits = 0;
m_nonInheritedData.m_explicitInheritance = false;
@@ -762,36 +749,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
SET_VAR(m_box, m_boxSizing, static_cast<unsigned>(s));
}
- // Page break properties.
- // break-after (shorthand for page-break-after and -webkit-column-break-after)
amoylan 2017/02/08 02:29:45 This is quite interesting. Lost comments. I wonder
sashab 2017/02/08 02:32:15 Move the comments to the CSSProperties json5 file.
amoylan 2017/02/08 02:48:46 Good idea. Done. PTAL.
- static EBreakBetween initialBreakAfter() { return EBreakBetween::kAuto; }
- EBreakBetween breakAfter() const {
- return static_cast<EBreakBetween>(m_nonInheritedData.m_breakAfter);
- }
- void setBreakAfter(EBreakBetween b) {
- m_nonInheritedData.m_breakAfter = static_cast<unsigned>(b);
- }
-
- // break-before (shorthand for page-break-before and
- // -webkit-column-break-before)
- static EBreakBetween initialBreakBefore() { return EBreakBetween::kAuto; }
- EBreakBetween breakBefore() const {
- return static_cast<EBreakBetween>(m_nonInheritedData.m_breakBefore);
- }
- void setBreakBefore(EBreakBetween b) {
- m_nonInheritedData.m_breakBefore = static_cast<unsigned>(b);
- }
-
- // break-inside (shorthand for page-break-inside and
- // -webkit-column-break-inside)
- static EBreakInside initialBreakInside() { return EBreakInside::kAuto; }
- EBreakInside breakInside() const {
- return static_cast<EBreakInside>(m_nonInheritedData.m_breakInside);
- }
- void setBreakInside(EBreakInside b) {
- m_nonInheritedData.m_breakInside = static_cast<unsigned>(b);
- }
-
// clip
static LengthBox initialClip() { return LengthBox(); }
const LengthBox& clip() const { return m_visual->clip; }

Powered by Google App Engine
This is Rietveld 408576698