[wip] simplify -webkit-appearance adjust step

Source/core/css/resolver/CascadedValues.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/resolver/CascadedValues.h"
 
 #include "core/css/CSSValuePool.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/resolver/MatchResult.h"
@@ skipping 226 matching lines @@
         ASSERT(!RuntimeEnabledFeatures::css3TextDecorationsEnabled());
         return CSSPropertyTextDecorationLine;
     // As per css3-text, word-wrap is an alias for overflow-wrap
     case CSSPropertyWordWrap:
         return CSSPropertyOverflowWrap;
     default:
         return property;
     }
 }
 
-CascadedValues::CascadedValues(StyleResolverState& state, const MatchResult& matchResult, bool onlyAddUARules)
+CascadedValues::CascadedValues(StyleResolverState& state, const MatchResult& matchResult)
     : m_state(state)
 {
     memset(m_values, 0, sizeof(m_values));
     memset(m_visitedLinkValues, 0, sizeof(m_visitedLinkValues));
 
     // The MatchResult has rules in UA - User - Author order, although we only
     // use user rules for callback selectors.
     addMatchResult(matchResult, CSSPropertyDirection, CSSPropertyWebkitWritingMode);
     applyValues(CSSPropertyDirection, CSSPropertyWebkitWritingMode);
     m_direction = state.style()->direction();
     m_writingMode = state.style()->writingMode();
 
     COMPILE_ASSERT(CSSPropertyColor == CSSPropertyWebkitWritingMode + 1, CSS_color_is_after_super_high_priority);
-    if (onlyAddUARules) {
-        addMatchResultRange(matchResult, false, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, CSSPropertyColor, convertToCSSPropertyID(lastCSSProperty));
-    } else {
-        addMatchResult(matchResult, CSSPropertyColor, convertToCSSPropertyID(lastCSSProperty));
-    }
+    addMatchResult(matchResult, CSSPropertyColor, convertToCSSPropertyID(lastCSSProperty));
+}
+
+CascadedValues::CascadedValues(StyleResolverState& state, const MatchResult& matchResult, WebkitAppearanceConstructorType)
+    : m_state(state)
+{
+    memset(m_values, 0, sizeof(m_values));
+    memset(m_visitedLinkValues, 0, sizeof(m_visitedLinkValues));
+    m_direction = state.style()->direction();
+    m_writingMode = state.style()->writingMode();
+    addMatchResultRange(matchResult, false, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, CSSPropertyColor, convertToCSSPropertyID(lastCSSProperty));
 }
 
 void CascadedValues::addMatchResult(const MatchResult& matchResult, CSSPropertyID firstId, CSSPropertyID lastId)
 {
     addMatchResultRange(matchResult, false, 0, matchResult.matchedProperties.size() - 1, firstId, lastId);
     addMatchResultRange(matchResult, true, matchResult.ranges.firstAuthorRule, matchResult.ranges.lastAuthorRule, firstId, lastId);
     addMatchResultRange(matchResult, true, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, firstId, lastId);
 }
 
 void CascadedValues::addMatchResultRange(const MatchResult& matchResult, bool isImportant, int firstIndex, int lastIndex, CSSPropertyID firstId, CSSPropertyID lastId)
@@ skipping 105 matching lines @@
         if (cascadedVisitedLinkValue(property)) {
             m_state.setApplyPropertyToRegularStyle(false);
             m_state.setApplyPropertyToVisitedLinkStyle(true);
             StyleBuilder::applyProperty(property, m_state, cascadedVisitedLinkValue(property));
             m_state.setApplyPropertyToRegularStyle(true);
             m_state.setApplyPropertyToVisitedLinkStyle(false);
         }
     }
 }
 
+bool CascadedValues::valuesUnchangedForWebkitAppearance(const MatchResult& matchResult)
+{
+    static const CSSPropertyID propertiesToCompare[] = {
+        CSSPropertyBorderBottomColor, CSSPropertyBorderBottomStyle, CSSPropertyBorderBottomWidth,
+        CSSPropertyBorderLeftColor, CSSPropertyBorderLeftStyle, CSSPropertyBorderLeftWidth,
+        CSSPropertyBorderRightColor, CSSPropertyBorderRightStyle, CSSPropertyBorderRightWidth,
+        CSSPropertyBorderTopColor, CSSPropertyBorderTopStyle, CSSPropertyBorderTopWidth,
+        CSSPropertyBorderBottomLeftRadius, CSSPropertyBorderBottomRightRadius,
+        CSSPropertyBorderTopLeftRadius, CSSPropertyBorderTopRightRadius,
+        CSSPropertyBorderImageOutset, CSSPropertyBorderImageRepeat, CSSPropertyBorderImageSlice,
+        CSSPropertyBorderImageSource, CSSPropertyBorderImageWidth,
+        CSSPropertyBackgroundAttachment, CSSPropertyBackgroundBlendMode, CSSPropertyBackgroundClip,
+        CSSPropertyBackgroundColor, CSSPropertyBackgroundImage, CSSPropertyBackgroundOrigin,
+        CSSPropertyBackgroundPositionX, CSSPropertyBackgroundPositionY, CSSPropertyBackgroundSize,
+    };
+    CascadedValues uaValues(m_state, matchResult, WebkitAppearanceConstructor);
+    for (size_t i = 0; i < WTF_ARRAY_LENGTH(propertiesToCompare); ++i) {
+        CSSPropertyID property = propertiesToCompare[i];
+        if (cascadedValue(property) != uaValues.cascadedValue(property))
+            return false;
+    }
+    return true;
+}
+
 } // namespace blink