Hook up style invalidation for CSS Paint API.

third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. 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 114 matching lines @@
             DocumentResource* resource = value->load(m_document);
             if (!resource)
                 continue;
 
             // Stash the DocumentResource on the reference filter.
             ReferenceFilterBuilder::setDocumentResourceReference(referenceFilter, adoptPtr(new DocumentResourceReference(resource)));
         }
     }
 }
 
-StyleImage* ElementStyleResources::loadPendingImage(StylePendingImage* pendingImage, CrossOriginAttributeValue crossOrigin)
+StyleImage* ElementStyleResources::loadPendingImage(ComputedStyle* style, StylePendingImage* pendingImage, CrossOriginAttributeValue crossOrigin)
 {
     if (CSSImageValue* imageValue = pendingImage->cssImageValue())
         return imageValue->cacheImage(m_document, crossOrigin);
 
+    if (CSSPaintValue* paintValue = pendingImage->cssPaintValue()) {
+        StyleGeneratedImage* image = StyleGeneratedImage::create(*paintValue);
+        style->addPaintImage(image);
+        return image;
+    }
+
     if (CSSImageGeneratorValue* imageGeneratorValue = pendingImage->cssImageGeneratorValue()) {
         imageGeneratorValue->loadSubimages(m_document);
         return StyleGeneratedImage::create(*imageGeneratorValue);
     }
 
     if (CSSCursorImageValue* cursorImageValue = pendingImage->cssCursorImageValue())
         return cursorImageValue->cacheImage(m_document, m_deviceScaleFactor);
 
     if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
         return imageSetValue->cacheImage(m_document, m_deviceScaleFactor, crossOrigin);
@@ skipping 20 matching lines @@
     //
     // If we eagerly loaded the images we'd fetch a.png, even though it's not
     // used. If we didn't null check below we'd crash since the none actually
     // removed all background images.
 
     for (CSSPropertyID property : m_pendingImageProperties) {
         switch (property) {
         case CSSPropertyBackgroundImage: {
             for (FillLayer* backgroundLayer = &style->accessBackgroundLayers(); backgroundLayer; backgroundLayer = backgroundLayer->next()) {
                 if (backgroundLayer->image() && backgroundLayer->image()->isPendingImage())
-                    backgroundLayer->setImage(loadPendingImage(toStylePendingImage(backgroundLayer->image())));
+                    backgroundLayer->setImage(loadPendingImage(style, toStylePendingImage(backgroundLayer->image())));
             }
             break;
         }
         case CSSPropertyContent: {
             for (ContentData* contentData = const_cast<ContentData*>(style->contentData()); contentData; contentData = contentData->next()) {
                 if (contentData->isImage()) {
                     StyleImage* image = toImageContentData(contentData)->image();
                     if (image->isPendingImage())
-                        toImageContentData(contentData)->setImage(loadPendingImage(toStylePendingImage(image)));
+                        toImageContentData(contentData)->setImage(loadPendingImage(style, toStylePendingImage(image)));
                 }
             }
             break;
         }
         case CSSPropertyCursor: {
             if (CursorList* cursorList = style->cursors()) {
                 for (size_t i = 0; i < cursorList->size(); ++i) {
                     CursorData& currentCursor = cursorList->at(i);
                     if (StyleImage* image = currentCursor.image()) {
                         if (image->isPendingImage())
-                            currentCursor.setImage(loadPendingImage(toStylePendingImage(image)));
+                            currentCursor.setImage(loadPendingImage(style, toStylePendingImage(image)));
                     }
                 }
             }
             break;
         }
         case CSSPropertyListStyleImage: {
             if (style->listStyleImage() && style->listStyleImage()->isPendingImage())
-                style->setListStyleImage(loadPendingImage(toStylePendingImage(style->listStyleImage())));
+                style->setListStyleImage(loadPendingImage(style, toStylePendingImage(style->listStyleImage())));
             break;
         }
         case CSSPropertyBorderImageSource: {
             if (style->borderImageSource() && style->borderImageSource()->isPendingImage())
-                style->setBorderImageSource(loadPendingImage(toStylePendingImage(style->borderImageSource())));
+                style->setBorderImageSource(loadPendingImage(style, toStylePendingImage(style->borderImageSource())));
             break;
         }
         case CSSPropertyWebkitBoxReflect: {
             if (StyleReflection* reflection = style->boxReflect()) {
                 const NinePieceImage& maskImage = reflection->mask();
                 if (maskImage.image() && maskImage.image()->isPendingImage()) {
-                    StyleImage* loadedImage = loadPendingImage(toStylePendingImage(maskImage.image()));
+                    StyleImage* loadedImage = loadPendingImage(style, toStylePendingImage(maskImage.image()));
                     reflection->setMask(NinePieceImage(loadedImage, maskImage.imageSlices(), maskImage.fill(), maskImage.borderSlices(), maskImage.outset(), maskImage.horizontalRule(), maskImage.verticalRule()));
                 }
             }
             break;
         }
         case CSSPropertyWebkitMaskBoxImageSource: {
             if (style->maskBoxImageSource() && style->maskBoxImageSource()->isPendingImage())
-                style->setMaskBoxImageSource(loadPendingImage(toStylePendingImage(style->maskBoxImageSource())));
+                style->setMaskBoxImageSource(loadPendingImage(style, toStylePendingImage(style->maskBoxImageSource())));
             break;
         }
         case CSSPropertyWebkitMaskImage: {
             for (FillLayer* maskLayer = &style->accessMaskLayers(); maskLayer; maskLayer = maskLayer->next()) {
                 if (maskLayer->image() && maskLayer->image()->isPendingImage())
-                    maskLayer->setImage(loadPendingImage(toStylePendingImage(maskLayer->image())));
+                    maskLayer->setImage(loadPendingImage(style, toStylePendingImage(maskLayer->image())));
             }
             break;
         }
         case CSSPropertyShapeOutside:
             if (style->shapeOutside() && style->shapeOutside()->image() && style->shapeOutside()->image()->isPendingImage())
-                style->shapeOutside()->setImage(loadPendingImage(toStylePendingImage(style->shapeOutside()->image()), CrossOriginAttributeAnonymous));
+                style->shapeOutside()->setImage(loadPendingImage(style, toStylePendingImage(style->shapeOutside()->image()), CrossOriginAttributeAnonymous));
             break;
         default:
             ASSERT_NOT_REACHED();
         }
     }
 }
 
 void ElementStyleResources::loadPendingResources(ComputedStyle* computedStyle)
 {
     loadPendingImages(computedStyle);
     loadPendingSVGDocuments(computedStyle);
 }
 
 } // namespace blink