| Index: Source/core/rendering/style/ShapeValue.h
|
| diff --git a/Source/core/rendering/style/ShapeValue.h b/Source/core/rendering/style/ShapeValue.h
|
| index 8115046b616dca927b41468686eea84387c7b738..dc12b4f1ff84f6aec00550094f22da389b26560f 100644
|
| --- a/Source/core/rendering/style/ShapeValue.h
|
| +++ b/Source/core/rendering/style/ShapeValue.h
|
| @@ -66,7 +66,14 @@ public:
|
| BasicShape* shape() const { return m_shape.get(); }
|
|
|
| StyleImage* image() const { return m_image.get(); }
|
| - bool isImageValid() const { return image() && image()->cachedImage() && image()->cachedImage()->hasImage(); }
|
| + bool isImageValid() const
|
| + {
|
| + if (!image())
|
| + return false;
|
| + if (image()->isImageResource() || image()->isImageResourceSet())
|
| + return image()->cachedImage() && image()->cachedImage()->hasImage();
|
| + return image()->isGeneratedImage();
|
| + }
|
| void setImage(PassRefPtr<StyleImage> image)
|
| {
|
| ASSERT(type() == Image);
|
|
|