Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(789)

Unified Diff: third_party/WebKit/Source/core/css/CSSImageSetValue.h

Issue 1607733004: Fix crash when using disallowed URLs in image sets for content CSS property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/CSSImageSetValue.h
diff --git a/third_party/WebKit/Source/core/css/CSSImageSetValue.h b/third_party/WebKit/Source/core/css/CSSImageSetValue.h
index 6e339ea426c082bec2a40411943fadb748f42de7..d9c433695455c88ad4be9b57ba3848bddb333bc7 100644
--- a/third_party/WebKit/Source/core/css/CSSImageSetValue.h
+++ b/third_party/WebKit/Source/core/css/CSSImageSetValue.h
@@ -34,7 +34,7 @@
namespace blink {
class Document;
-class StyleFetchedImageSet;
+class StyleImage;
class CSSImageSetValue : public CSSValueList {
public:
@@ -46,8 +46,8 @@ public:
~CSSImageSetValue();
bool isCachePending(float deviceScaleFactor) const;
- StyleFetchedImageSet* cachedImageSet(float deviceScaleFactor) const;
- StyleFetchedImageSet* cacheImageSet(Document*, float deviceScaleFactor, CrossOriginAttributeValue = CrossOriginAttributeNotSet);
+ StyleImage* cachedImage(float deviceScaleFactor) const;
+ StyleImage* cacheImage(Document*, float deviceScaleFactor, CrossOriginAttributeValue = CrossOriginAttributeNotSet);
String customCSSText() const;
@@ -73,9 +73,8 @@ private:
void fillImageSet();
static inline bool compareByScaleFactor(ImageWithScale first, ImageWithScale second) { return first.scaleFactor < second.scaleFactor; }
- bool m_isCachePending;
float m_cachedScaleFactor;
- RefPtrWillBeMember<StyleFetchedImageSet> m_cachedImageSet;
+ RefPtrWillBeMember<StyleImage> m_cachedImage;
Vector<ImageWithScale> m_imagesInSet;
};
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp ('k') | third_party/WebKit/Source/core/css/CSSImageSetValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698