Moved pointer-events to be generated in ComputedStyleBase

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 217 matching lines @@
 
   if (oldStyle->hasExplicitlyInheritedProperties())
     return Inherit;
 
   return NoInherit;
 }
 
 void ComputedStyle::propagateIndependentInheritedProperties(
     const ComputedStyle& parentStyle) {
   ComputedStyleBase::propagateIndependentInheritedProperties(parentStyle);
-  if (m_nonInheritedData.m_isPointerEventsInherited)
-    setPointerEvents(parentStyle.pointerEvents());
 }
 
 StyleSelfAlignmentData resolvedSelfAlignment(
     const StyleSelfAlignmentData& value,
     ItemPosition normalValueBehavior) {
   // To avoid needing to copy the RareNonInheritedData, we repurpose the 'auto'
   // flag to not just mean 'auto' prior to running the StyleAdjuster but also
   // mean 'normal' after running it.
   if (value.position() == ItemPositionNormal ||
       value.position() == ItemPositionAuto)
@@ skipping 161 matching lines @@
   // properties here, but the affectedBy flags will be set differently based on
   // the matching order of the :-webkit-any components.
   //
   // m_nonInheritedData.m_emptyState
   // m_nonInheritedData.m_affectedByFocus
   // m_nonInheritedData.m_affectedByHover
   // m_nonInheritedData.m_affectedByActive
   // m_nonInheritedData.m_affectedByDrag
   // m_nonInheritedData.m_isLink
 
-  // Any properties that are inherited on a style are also inherited on elements
-  // that share this style.
-  m_nonInheritedData.m_isPointerEventsInherited =
-      other.m_nonInheritedData.m_isPointerEventsInherited;
-
   if (m_svgStyle != other.m_svgStyle)
     m_svgStyle.access()->copyNonInheritedFromCached(other.m_svgStyle.get());
   DCHECK_EQ(zoom(), initialZoom());
 }
 
 bool ComputedStyle::operator==(const ComputedStyle& o) const {
   return inheritedEqual(o) && nonInheritedEqual(o);
 }
 
 bool ComputedStyle::isStyleAvailable() const {
@@ skipping 58 matching lines @@
   }
 }
 
 bool ComputedStyle::inheritedEqual(const ComputedStyle& other) const {
   return independentInheritedEqual(other) &&
          nonIndependentInheritedEqual(other);
 }
 
 bool ComputedStyle::independentInheritedEqual(
     const ComputedStyle& other) const {
-  return ComputedStyleBase::independentInheritedEqual(other) &&
-         m_inheritedData.compareEqualIndependent(other.m_inheritedData);
+  return ComputedStyleBase::independentInheritedEqual(other);
 }
 
 bool ComputedStyle::nonIndependentInheritedEqual(
     const ComputedStyle& other) const {
   return ComputedStyleBase::nonIndependentInheritedEqual(other) &&
-         m_inheritedData.compareEqualNonIndependent(other.m_inheritedData) &&
+         m_inheritedData == other.m_inheritedData &&
          m_styleInheritedData == other.m_styleInheritedData &&
          m_svgStyle->inheritedEqual(*other.m_svgStyle) &&
          m_rareInheritedData == other.m_rareInheritedData;
 }
 
 bool ComputedStyle::loadingCustomFontsEqual(const ComputedStyle& other) const {
   return font().loadingCustomFonts() == other.font().loadingCustomFonts();
 }
 
 bool ComputedStyle::nonInheritedEqual(const ComputedStyle& other) const {
@@ skipping 1960 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink