Merge 142765

Source/WebCore/loader/cache/CachedImage.cpp

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);
 }