Automatically generate EBreakBetween & EBreakInside

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 209 matching lines @@
   struct NonInheritedData {
     // Compare computed styles, differences in inherited bits or other flags
     // should not cause an inequality.
     bool operator==(const NonInheritedData& other) const {
       // Generated properties are compared in ComputedStyleBase
       return m_effectiveDisplay == other.m_effectiveDisplay &&
              m_originalDisplay == other.m_originalDisplay &&
              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 // hasViewportUnits.
To be honest I don't know what these comments are.

[sashab, 2017/02/08 02:32:15]

Haha, good question... Get rid of them all. They probably used to refer to
fields that are now generated.

[shend, 2017/02/08 03:32:26]

I think the comments were used to explicitly indicate that these fields do not
participate in == comparisons, so it doesn't just look like we forgot those
fields (there's a comment above that says "differences in inherited bits or
other flags should not cause an inequality").

       // styleType
       // pseudoBits
       // explicitInheritance
       // unique
       // emptyState
       // affectedByFocus
       // affectedByHover
       // affectedByActive
       // affectedByDrag
       // isLink
@@ skipping 11 matching lines @@
     unsigned m_verticalAlign : 4;     // EVerticalAlign
     unsigned m_position : 3;          // EPosition
 
     // This is set if we used viewport units when resolving a length.
     // It is mutable so we can pass around const ComputedStyles to resolve
     // lengths.
     mutable unsigned m_hasViewportUnits : 1;
 
     // 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
                                          // property
     unsigned m_variableReference : 1;  // A non-inherited property references a
                                        // variable or @apply is used.
     unsigned m_unique : 1;             // Style can not be shared.
 
     unsigned m_emptyState : 1;
 
@@ skipping 23 matching lines @@
         static_cast<unsigned>(EInsideLink::kNotInsideLink);
 
     m_nonInheritedData.m_effectiveDisplay =
         m_nonInheritedData.m_originalDisplay =
             static_cast<unsigned>(initialDisplay());
     m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX());
     m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
     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;
     m_nonInheritedData.m_variableReference = false;
     m_nonInheritedData.m_unique = false;
     m_nonInheritedData.m_emptyState = false;
     m_nonInheritedData.m_hasViewportUnits = false;
     m_nonInheritedData.m_affectedByFocus = false;
     m_nonInheritedData.m_affectedByHover = false;
     m_nonInheritedData.m_affectedByActive = false;
@@ skipping 426 matching lines @@
   }
   void setBoxShadow(PassRefPtr<ShadowList>);
 
   // box-sizing (aka -webkit-box-sizing)
   static EBoxSizing initialBoxSizing() { return EBoxSizing::kContentBox; }
   EBoxSizing boxSizing() const { return m_box->boxSizing(); }
   void setBoxSizing(EBoxSizing s) {
     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 if we should allow the
generator to generate comments. Particularly if we consider moving the generated
files from out/ into the checked-in files.

[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; }
   void setClip(const LengthBox& box) {
     SET_VAR(m_visual, hasAutoClip, false);
     SET_VAR(m_visual, clip, box);
   }
   bool hasAutoClip() const { return m_visual->hasAutoClip; }
   void setHasAutoClip() {
     SET_VAR(m_visual, hasAutoClip, true);
@@ skipping 3111 matching lines @@
   m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {
   return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h