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

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

Issue 1865603004: Fix crash when setting invalid URL on content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pants Created 4 years, 8 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/CSSImageValue.h
diff --git a/third_party/WebKit/Source/core/css/CSSImageValue.h b/third_party/WebKit/Source/core/css/CSSImageValue.h
index 513421b3a57274343502db72445dc63054c240c8..0082a0eb61e6a0198864e53c36861cf363684558 100644
--- a/third_party/WebKit/Source/core/css/CSSImageValue.h
+++ b/third_party/WebKit/Source/core/css/CSSImageValue.h
@@ -31,21 +31,20 @@ namespace blink {
class Document;
class KURL;
-class StyleFetchedImage;
class StyleImage;
class LayoutObject;
class CORE_EXPORT CSSImageValue : public CSSValue {
public:
- static RawPtr<CSSImageValue> create(const KURL& url, StyleFetchedImage* image = 0)
+ static RawPtr<CSSImageValue> create(const KURL& url, StyleImage* image = 0)
{
return create(url.getString(), url, image);
}
- static RawPtr<CSSImageValue> create(const String& rawValue, const KURL& url, StyleFetchedImage* image = 0)
+ static RawPtr<CSSImageValue> create(const String& rawValue, const KURL& url, StyleImage* image = 0)
{
return create(AtomicString(rawValue), url, image);
}
- static RawPtr<CSSImageValue> create(const AtomicString& rawValue, const KURL& url, StyleFetchedImage* image = 0)
+ static RawPtr<CSSImageValue> create(const AtomicString& rawValue, const KURL& url, StyleImage* image = 0)
{
return new CSSImageValue(rawValue, url, image);
}
@@ -56,8 +55,8 @@ public:
~CSSImageValue();
bool isCachePending() const { return m_isCachePending; }
- StyleFetchedImage* cachedImage() const { ASSERT(!isCachePending()); return m_cachedImage.get(); }
- StyleFetchedImage* cacheImage(Document*, CrossOriginAttributeValue = CrossOriginAttributeNotSet);
+ StyleImage* cachedImage() const { ASSERT(!isCachePending()); return m_cachedImage.get(); }
+ StyleImage* cacheImage(Document*, CrossOriginAttributeValue = CrossOriginAttributeNotSet);
const String& url() const { return m_absoluteURL; }
@@ -85,14 +84,14 @@ public:
void restoreCachedResourceIfNeeded(Document&) const;
private:
- CSSImageValue(const AtomicString& rawValue, const KURL&, StyleFetchedImage*);
+ CSSImageValue(const AtomicString& rawValue, const KURL&, StyleImage*);
CSSImageValue(const AtomicString& absoluteURL);
AtomicString m_relativeURL;
AtomicString m_absoluteURL;
Referrer m_referrer;
bool m_isCachePending;
- Member<StyleFetchedImage> m_cachedImage;
+ Member<StyleImage> m_cachedImage;
AtomicString m_initiatorName;
};
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp ('k') | third_party/WebKit/Source/core/css/CSSImageValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698