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

Unified Diff: third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp

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/resolver/ElementStyleResources.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
index 9d1dbb98ba2b08a2e3f7e61875ccb7171b96d2a9..1b1a8dfbcb090bb3dc5799dfa5c324015df1ce36 100644
--- a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
@@ -81,7 +81,7 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(
m_pendingImageProperties.add(property);
return StylePendingImage::create(value);
}
- return value.cachedImageSet(m_deviceScaleFactor);
+ return value.cachedImage(m_deviceScaleFactor);
}
PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cachedOrPendingFromValue(CSSPropertyID property, const CSSImageValue& value)
@@ -149,7 +149,7 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::loadPendingImage(Style
return cursorImageValue->cacheImage(m_document, m_deviceScaleFactor);
if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
- return imageSetValue->cacheImageSet(m_document, m_deviceScaleFactor, crossOrigin);
+ return imageSetValue->cacheImage(m_document, m_deviceScaleFactor, crossOrigin);
ASSERT_NOT_REACHED();
return nullptr;
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSImageSetValue.cpp ('k') | third_party/WebKit/Source/core/style/ContentData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698