Merge 142765

Source/WebCore/loader/cache/CachedImage.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 146 matching lines @@
     return errorOccurred() && m_shouldPaintBrokenImage;
 }
 
 #if ENABLE(SVG)
 inline Image* CachedImage::lookupOrCreateImageForRenderer(const RenderObject* renderer)
 {
     if (!m_image)
         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;
 }
 #else
 inline Image* CachedImage::lookupOrCreateImageForRenderer(const RenderObject*)
 {
     return m_image.get();
 }
 #endif
@@ skipping 30 matching lines @@
         return lookupOrCreateImageForRenderer(renderer);
 
     return Image::nullImage();
 }
 
 void CachedImage::setContainerSizeForRenderer(const CachedImageClient* renderer, const IntSize& containerSize, float containerZoom)
 {
     if (containerSize.isEmpty())
         return;
     ASSERT(renderer);
+    ASSERT(containerZoom);
     if (!m_image) {
         m_pendingContainerSizeRequests.set(renderer, SizeAndZoom(containerSize, containerZoom));
         return;
     }
 #if ENABLE(SVG)
     if (!m_image->isSVGImage()) {
         m_image->setContainerSize(containerSize);
         return;
     }
 
@@ skipping 77 matching lines @@
 {
     if (!m_loader || m_loader->reachedTerminalState())
         return;
 
     m_shouldPaintBrokenImage = m_loader->frameLoader()->client()->shouldPaintBrokenImage(m_resourceRequest.url());
 }
 
 void CachedImage::clear()
 {
     destroyDecodedData();
-#if ENABLE(SVG)
-    m_svgImageCache.clear();
-#endif
     clearImage();
     m_pendingContainerSizeRequests.clear();
     setEncodedSize(0);
 }
 
 inline void CachedImage::createImage()
 {
     // Create the image if it doesn't yet exist.
     if (m_image)
         return;
@@ skipping 149 matching lines @@
 {
     if (!image || image != m_image)
         return;
     notifyObservers();
 }
 
 void CachedImage::changedInRect(const Image* image, const IntRect& rect)
 {
     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);
 }
 
 void CachedImage::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResourceImage);
     memoryObjectInfo->setClassName("CachedImage");
     CachedResource::reportMemoryUsage(memoryObjectInfo);
     info.addMember(m_pendingContainerSizeRequests, "pendingContainerSizeRequests");
     info.addMember(m_image, "m_image");
 #if ENABLE(SVG)
     info.addMember(m_svgImageCache, "svgImageCache");
 #endif
 }
 
 bool CachedImage::currentFrameKnownToBeOpaque(const RenderObject* renderer)
 {
     Image* image = imageForRenderer(renderer);
     if (image->isBitmapImage())
         image->nativeImageForCurrentFrame(); // force decode
     return image->currentFrameKnownToBeOpaque();
 }
 
 } // namespace WebCore