Moved pointer-events to be generated in ComputedStyleBase

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

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 225dcbb2fea09328939f16314bf69bca5c2337fd..6c34a9258b3c4a8c68f96d3f2e2a927479599189 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -198,23 +198,13 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
   // inherit
   struct InheritedData {
     bool operator==(const InheritedData& other) const {
-      return compareEqualIndependent(other) &&
-             compareEqualNonIndependent(other);
+      return compareEqualNonIndependent(other);

[sashab, 2016/12/12 01:52:56]

Move all checks into here, delete compareEqualNonIndependent() function too

[napper, 2016/12/12 05:31:41]

Done.

     }
 
     bool operator!=(const InheritedData& other) const {
       return !(*this == other);
     }
 
-    inline bool compareEqualIndependent(const InheritedData& other) const {
-      // These must match the properties tagged 'independent' in
-      // CSSProperties.in.

[sashab, 2016/12/12 01:52:56]

Move this comment to the generated compareEqualIndependent() method

[napper, 2016/12/12 05:31:41]

Not sure what you mean here. The compareEqualIndependent() method doesn't exist
anymore.

-      // TODO(napper): Remove this once all independent properties are
-      // generated and replace with a private function used only in
-      // stylePropagationDiff().
-      return (m_pointerEvents == other.m_pointerEvents);
-    }
-
     inline bool compareEqualNonIndependent(const InheritedData& other) const {
       return (m_listStyleType == other.m_listStyleType) &&
              (m_textAlign == other.m_textAlign) &&
@@ -241,7 +231,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
     // non CSS2 inherited
     unsigned m_rtlOrdering : 1;       // EOrder
     unsigned m_printColorAdjust : 1;  // PrintColorAdjust
-    unsigned m_pointerEvents : 4;  // EPointerEvents
     unsigned m_insideLink : 2;     // EInsideLink
 
     // CSS Text Layout Module Level 3: Vertical writing support
@@ -327,25 +316,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
 
     mutable unsigned m_hasRemUnits : 1;
 
-    // For each independent inherited property, store a 1 if the stored
-    // value was inherited from its parent, or 0 if it is explicitly set on
-    // this element.
-    // Eventually, all properties will have a bit in here to store whether
-    // they were inherited from their parent or not.
-    // Although two ComputedStyles are equal if their nonInheritedData is
-    // equal regardless of the isInherited flags, this struct is stored next
-    // to the existing flags to take advantage of packing as much as possible.

[sashab, 2016/12/12 01:52:56]

Move this comment somewhere... Maybe into make_computed_style_base.py

[napper, 2016/12/12 05:31:41]

As discussed offline, I have reviewed the relevance of this comment.

1. The first 2 sentences are already documented in make_computed_style_base.py
2. The remainder is not required now there are no independent but not generated
properties.

-    // TODO(sashab): Move these flags closer to inheritedData so that it's
-    // clear which inherited properties have a flag stored and which don't.
-    // Keep this list of fields in sync with:
-    // - setBitDefaults()
-    // - The ComputedStyle setter, which must take an extra boolean parameter
-    //   and set this - propagateIndependentInheritedProperties() in
-    //   ComputedStyle.cpp
-    // - The compareEqual() methods in the corresponding class
-    // InheritedFlags
-    unsigned m_isPointerEventsInherited : 1;
-
     // If you add more style bits here, you will also need to update
     // ComputedStyle::copyNonInheritedFromCached() 68 bits
   } m_nonInheritedData;
@@ -365,8 +335,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
         static_cast<unsigned>(initialBoxDirection());
     m_inheritedData.m_printColorAdjust =
         static_cast<unsigned>(initialPrintColorAdjust());
-    m_inheritedData.m_pointerEvents =
-        static_cast<unsigned>(initialPointerEvents());
     m_inheritedData.m_insideLink = NotInsideLink;
     m_inheritedData.m_writingMode = initialWritingMode();
 
@@ -397,9 +365,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
     m_nonInheritedData.m_affectedByDrag = false;
     m_nonInheritedData.m_isLink = false;
     m_nonInheritedData.m_hasRemUnits = false;
-
-    // All independently inherited properties default to being inherited.
-    m_nonInheritedData.m_isPointerEventsInherited = true;
   }
 
  private:
@@ -2132,18 +2097,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
     SET_VAR(m_rareInheritedData, overflowWrap, b);
   }
 
-  // pointer-events
-  static EPointerEvents initialPointerEvents() { return EPointerEvents::Auto; }
-  EPointerEvents pointerEvents() const {
-    return static_cast<EPointerEvents>(m_inheritedData.m_pointerEvents);
-  }
-  void setPointerEvents(EPointerEvents p) {
-    m_inheritedData.m_pointerEvents = static_cast<unsigned>(p);
-  }
-  void setPointerEventsIsInherited(bool isInherited) {
-    m_nonInheritedData.m_isPointerEventsInherited = isInherited;
-  }
-
   // quotes
   static QuotesData* initialQuotes() { return 0; }
   QuotesData* quotes() const { return m_rareInheritedData->quotes.get(); }