Hook up style invalidation for CSS Paint API.

third_party/WebKit/Source/core/css/parser/CSSParserToken.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 "core/css/parser/CSSParserToken.h"
 
 #include "core/css/CSSMarkup.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "wtf/HashMap.h"
 #include "wtf/text/StringBuilder.h"
@@ skipping 129 matching lines @@
         || tokenType == StringToken;
 }
 
 CSSParserToken CSSParserToken::copyWithUpdatedString(const CSSParserString& parserString) const
 {
     CSSParserToken copy(*this);
     copy.initValueFromCSSParserString(parserString);
     return copy;
 }
 
+bool CSSParserToken::valueDataCharRawEqual(const CSSParserToken& other) const
+{
+    if (m_valueLength != other.m_valueLength)

[Timothy Loh, 2016/05/09 07:07:07]

I don't think this change should be part of this patch, since currently it
already mostly works. A custom property value should compare equal to itself
currently, so I think this only fixes the case where you explicitly set a custom
property value to the same as what it currently is.

[ikilpatrick, 2016/05/10 20:39:37]

I think that case is pretty important, at least at first. While we do allow this
in the spec, I'd like to make this rational for folks who are playing with this
initially.

[Timothy Loh, 2016/05/11 06:20:37]

I don't get why this case is important, but regardless I think we should pull
this out into a separate change.

[ikilpatrick, 2016/05/11 23:59:12]

Done.

+        return false;
+
+    if (m_valueIs8Bit) {
+        return other.m_valueIs8Bit ?
+            equal((const LChar*) m_valueDataCharRaw, (const LChar*) other.m_valueDataCharRaw, m_valueLength) :

[esprehn, 2016/05/09 21:59:54]

static_cast, don't do C style casts in blink.

[ikilpatrick, 2016/05/10 20:39:37]

Done.

+            equal((const LChar*) m_valueDataCharRaw, (const UChar*) other.m_valueDataCharRaw, m_valueLength);
+    } else {
+        return other.m_valueIs8Bit ?
+            equal((const UChar*) m_valueDataCharRaw, (const LChar*) other.m_valueDataCharRaw, m_valueLength) :
+            equal((const UChar*) m_valueDataCharRaw, (const UChar*) other.m_valueDataCharRaw, m_valueLength);
+    }
+}
+
 bool CSSParserToken::operator==(const CSSParserToken& other) const
 {
     if (m_type != other.m_type)
         return false;
     switch (m_type) {
     case DelimiterToken:
         return delimiter() == other.delimiter();
     case HashToken:
         if (m_hashTokenType != other.m_hashTokenType)
             return false;
         // fallthrough
     case IdentToken:
     case FunctionToken:
     case StringToken:
     case UrlToken:
-        return m_valueDataCharRaw == other.m_valueDataCharRaw && m_valueLength == other.m_valueLength && m_valueIs8Bit == other.m_valueIs8Bit;
+        return valueDataCharRawEqual(other);
     case DimensionToken:
-        if (m_valueDataCharRaw != other.m_valueDataCharRaw || m_valueLength != other.m_valueLength || m_valueIs8Bit != other.m_valueIs8Bit)
+        if (!valueDataCharRawEqual(other))
             return false;
         // fallthrough
     case NumberToken:
     case PercentageToken:
         return m_numericSign == other.m_numericSign && 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;
     }
@@ skipping 86 matching lines @@
         return builder.append('}');
 
     case EOFToken:
     case CommentToken:
         ASSERT_NOT_REACHED();
         return;
     }
 }
 
 } // namespace blink