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

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

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.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSImageValue.cpp b/third_party/WebKit/Source/core/css/CSSImageValue.cpp
index 20d20f3f12c83a5bece4079609f71d142c70db37..e3ba7dcfbac33ae5b46996cc880823b2b560c593 100644
--- a/third_party/WebKit/Source/core/css/CSSImageValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSImageValue.cpp
@@ -28,13 +28,14 @@
#include "core/fetch/ResourceFetcher.h"
#include "core/loader/MixedContentChecker.h"
#include "core/style/StyleFetchedImage.h"
+#include "core/style/StyleInvalidImage.h"
#include "platform/CrossOriginAttributeValue.h"
#include "platform/weborigin/KURL.h"
#include "platform/weborigin/SecurityPolicy.h"
namespace blink {
-CSSImageValue::CSSImageValue(const AtomicString& rawValue, const KURL& url, StyleFetchedImage* image)
+CSSImageValue::CSSImageValue(const AtomicString& rawValue, const KURL& url, StyleImage* image)
: CSSValue(ImageClass)
, m_relativeURL(rawValue)
, m_absoluteURL(url.getString())
@@ -55,7 +56,7 @@ CSSImageValue::~CSSImageValue()
{
}
-StyleFetchedImage* CSSImageValue::cacheImage(Document* document, CrossOriginAttributeValue crossOrigin)
+StyleImage* CSSImageValue::cacheImage(Document* document, CrossOriginAttributeValue crossOrigin)
{
ASSERT(document);
@@ -70,6 +71,8 @@ StyleFetchedImage* CSSImageValue::cacheImage(Document* document, CrossOriginAttr
if (RawPtr<ImageResource> cachedImage = ImageResource::fetch(request, document->fetcher()))
m_cachedImage = StyleFetchedImage::create(cachedImage.get(), document, request.url());
+ else
+ m_cachedImage = StyleInvalidImage::create(url());
}
return m_cachedImage.get();

Powered by Google App Engine
This is Rietveld 408576698