Hook up style invalidation for CSS Paint API.

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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/style/ComputedStyle.h"
 
+#include "core/css/CSSPaintValue.h"
+#include "core/css/CSSPropertyEquality.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/style/AppliedTextDecoration.h"
 #include "core/style/BorderEdge.h"
 #include "core/style/ContentData.h"
 #include "core/style/DataEquivalency.h"
 #include "core/style/ComputedStyleConstants.h"
 #include "core/style/QuotesData.h"
 #include "core/style/ShadowList.h"
@@ skipping 717 matching lines @@
             || (visitedLinkBorderBottomColor() != other.visitedLinkBorderBottomColor() && borderBottomWidth())
             || (visitedLinkBorderTopColor() != other.visitedLinkBorderTopColor() && borderTopWidth())
             || (visitedLinkOutlineColor() != other.visitedLinkOutlineColor() && outlineWidth())
             || (visitedLinkBackgroundColor() != other.visitedLinkBackgroundColor()))
             return true;
     }
 
     if (resize() != other.resize())
         return true;
 
+    if (Vector<Persistent<StyleImage>>* paintImages = rareNonInheritedData->m_paintImages.get()) {

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

you can just write

if (rareNonInheritedData->m_paintImages)

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

Done.

+        for (const auto& image : *paintImages) {
+            if (diffNeedsPaintInvalidationObjectForPaintImage(image, other))
+                return true;
+        }
+    }
+
     return false;
 }
 
+bool ComputedStyle::diffNeedsPaintInvalidationObjectForPaintImage(const StyleImage* image, const ComputedStyle& other) const
+{
+    CSSPaintValue* value = toCSSPaintValue(image->cssValue());
+
+    if (!value->nativeInvalidationProperties() || !value->customInvalidationProperties())
+        return true;

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

I don't understand why this is true instead of false

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

Added note:

This is because at style-diff time the CSSPaintValue may not have a backing
CSSPaintImageGenerator yet, we use null 
(creating a CSSPaintImageGenerator requires a document).

+
+    for (CSSPropertyID propertyID : *value->nativeInvalidationProperties()) {
+        if (!CSSPropertyEquality::propertiesEqual(propertyID, *this, other))

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

For now, I think we should just return true if either isInterpolableProperty or
isShorthandProperty are true, since propertiesEqual handles neither of these yet
(well probably you'll want to handle shorthands here). In particular, I don't
think the checked in code should ever be in a state where we can hit ASSERTs.

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

Please add TODOs

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

Tim, did you mean this check? Don't need isShorthandProperty as they are caught
by isInterpolablePropertyCheck.

Added TODO to remove once we have full coverage in CSSPropertyEquality

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

looks fine

+            return true;
+    }
+
+    for (const AtomicString& property : *value->customInvalidationProperties()) {
+        CSSVariableData* thisVar = variables() ? variables()->getVariable(property) : nullptr;

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

you can early out this before the loop too.

if (static_cast<bool>(variables()) != static_cast<bool>(other.variables()))
  return true;
if (variables()) {
  for (...) {
    ...
  }
}

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

Not strictly correct as you could have:
this->variables = { '--bar': '2' }
other->variables = null;
value->customInvalidationProperties() = [ '--foo' ];

Added check if they are both null.

+        CSSVariableData* otherVar = other.variables() ? other.variables()->getVariable(property) : nullptr;
+
+        if (!dataEquivalent(thisVar, otherVar))
+            return true;
+    }
+
+    return false;
+}
+
 void ComputedStyle::updatePropertySpecificDifferences(const ComputedStyle& other, StyleDifference& diff) const
 {
     // StyleAdjuster has ensured that zIndex is non-auto only if it's applicable.
     if (m_box->zIndex() != other.m_box->zIndex() || m_box->hasAutoZIndex() != other.m_box->hasAutoZIndex())
         diff.setZIndexChanged();
 
     if (rareNonInheritedData.get() != other.rareNonInheritedData.get()) {
         if (!transformDataEquivalent(other))
             diff.setTransformChanged();
 
@@ skipping 34 matching lines @@
                 || rareInheritedData->visitedLinkTextFillColor() != other.rareInheritedData->visitedLinkTextFillColor()
                 || rareInheritedData->visitedLinkTextStrokeColor() != other.rareInheritedData->visitedLinkTextStrokeColor()
                 || rareInheritedData->visitedLinkTextEmphasisColor() != other.rareInheritedData->visitedLinkTextEmphasisColor()
                 || rareInheritedData->textEmphasisFill != other.rareInheritedData->textEmphasisFill
                 || rareInheritedData->appliedTextDecorations != other.rareInheritedData->appliedTextDecorations)) {
                 diff.setTextDecorationOrColorChanged();
         }
     }
 }
 
+void ComputedStyle::addPaintImage(StyleImage* image)
+{
+    if (!rareNonInheritedData.access()->m_paintImages)
+        rareNonInheritedData.access()->m_paintImages = adoptPtr(new Vector<Persistent<StyleImage>>());
+    rareNonInheritedData.access()->m_paintImages->append(image);
+}
+
 void ComputedStyle::addCursor(StyleImage* image, bool hotSpotSpecified, const IntPoint& hotSpot)
 {
     if (!rareInheritedData.access()->cursorData)
         rareInheritedData.access()->cursorData = new CursorList;
     rareInheritedData.access()->cursorData->append(CursorData(image, hotSpotSpecified, hotSpot));
 }
 
 void ComputedStyle::setCursorList(CursorList* other)
 {
     rareInheritedData.access()->cursorData = other;
@@ skipping 974 matching lines @@
     if (!shadowList)
         return false;
     for (size_t i = shadowList->shadows().size(); i--; ) {
         if (shadowList->shadows()[i].color().isCurrentColor())
             return true;
     }
     return false;
 }
 
 } // namespace blink