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

Unified Diff: Source/WebCore/loader/cache/CachedImage.cpp

Issue 12319101: Merge 142765 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « Source/WebCore/WebCore.xcodeproj/project.pbxproj ('k') | Source/WebCore/svg/graphics/SVGImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/cache/CachedImage.cpp
===================================================================
--- Source/WebCore/loader/cache/CachedImage.cpp (revision 143954)
+++ Source/WebCore/loader/cache/CachedImage.cpp (working copy)
@@ -164,7 +164,7 @@
return 0;
if (!m_image->isSVGImage())
return m_image.get();
- Image* useImage = m_svgImageCache->lookupOrCreateBitmapImageForRenderer(renderer);
+ Image* useImage = m_svgImageCache->imageForRenderer(renderer);
if (useImage == Image::nullImage())
return m_image.get();
return useImage;
@@ -215,6 +215,7 @@
if (containerSize.isEmpty())
return;
ASSERT(renderer);
+ ASSERT(containerZoom);
if (!m_image) {
m_pendingContainerSizeRequests.set(renderer, SizeAndZoom(containerSize, containerZoom));
return;
@@ -312,9 +313,6 @@
void CachedImage::clear()
{
destroyDecodedData();
-#if ENABLE(SVG)
- m_svgImageCache.clear();
-#endif
clearImage();
m_pendingContainerSizeRequests.clear();
setEncodedSize(0);
@@ -484,13 +482,6 @@
{
if (!image || image != m_image)
return;
-#if ENABLE(SVG)
- // We have to update the cached ImageBuffers if the underlying content changed.
- if (image->isSVGImage()) {
- m_svgImageCache->imageContentChanged();
- return;
- }
-#endif
notifyObservers(&rect);
}
« no previous file with comments | « Source/WebCore/WebCore.xcodeproj/project.pbxproj ('k') | Source/WebCore/svg/graphics/SVGImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698