Add correct equality testing for ComputedStyle's StyleVariableData

third_party/WebKit/Source/core/css/parser/CSSParserToken.h

 // 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.
 
 #ifndef CSSParserToken_h
 #define CSSParserToken_h
 
 #include "core/CoreExport.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/parser/CSSParserString.h"
@@ skipping 64 matching lines @@
 
     CSSParserToken(CSSParserTokenType, BlockType = NotBlock);
     CSSParserToken(CSSParserTokenType, CSSParserString, BlockType = NotBlock);
 
     CSSParserToken(CSSParserTokenType, UChar); // for DelimiterToken
     CSSParserToken(CSSParserTokenType, double, NumericValueType, NumericSign); // for NumberToken
     CSSParserToken(CSSParserTokenType, UChar32, UChar32); // for UnicodeRangeToken
 
     CSSParserToken(HashTokenType, CSSParserString);
 
+    bool operator==(const CSSParserToken& other) const
+    {
+        if (m_type != other.m_type)
+            return false;
+        switch (m_type) {
+        case DelimiterToken:
+            return delimiter() == other.delimiter();
+        case IdentToken:
+        case FunctionToken:
+        case StringToken:
+        case HashToken:
+            if (m_hashTokenType != other.m_hashTokenType)

[Timothy Loh, 2015/12/17 04:22:56]

This is only really for HashTokens

[shans, 2015/12/17 05:14:14]

my bad - I ordered the cases incorrectly.

+                return false;
+            // fallthrough
+        case UrlToken:
+            return m_valueDataCharRaw == other.m_valueDataCharRaw && m_valueLength == other.m_valueLength && m_valueIs8Bit == other.m_valueIs8Bit;
+        case NumberToken:
+            if (m_numericSign != other.m_numericSign)
+                return false;
+            // fallthrough
+        case DimensionToken:

[Timothy Loh, 2015/12/17 04:22:56]

These also have a dimension (i.e. string) attached.

[shans, 2015/12/17 05:14:14]

that isn't just the numericValueType? Fixed, at any rate.

+        case PercentageToken:
+            return m_numericValue == other.m_numericValue && m_numericValueType == other.m_numericValueType;
+        case UnicodeRangeToken:
+            return m_unicodeRange.start == other.m_unicodeRange.start && m_unicodeRange.end == other.m_unicodeRange.end;
+        default:
+            return true;
+        }
+    }
+
     // Converts NumberToken to DimensionToken.
     void convertToDimensionWithUnit(CSSParserString);
 
     // Converts NumberToken to PercentageToken.
     void convertToPercentage();
 
     CSSParserTokenType type() const { return static_cast<CSSParserTokenType>(m_type); }
     CSSParserString value() const
     {
         CSSParserString ret;
@@ skipping 58 matching lines @@
 
 namespace WTF {
 template <>
 struct IsTriviallyMoveAssignable<blink::CSSParserToken> {
     STATIC_ONLY(IsTriviallyMoveAssignable);
     static const bool value = true;
 };
 }
 
 #endif // CSSSParserToken_h