Changeset 102066 in webkit

Timestamp:

Dec 5, 2011, 4:32:23 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r94980.

Location:

branches/safari-534.53-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedImage.cpp (modified) (1 diff)
• loader/cache/CachedImage.h (modified) (1 diff)
• rendering/RenderImage.cpp (modified) (1 diff)

branches/safari-534.53-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-05  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 94980
+
+    2011-09-12  Beth Dakin  <bdakin@apple.com>
+
+            https://bugs.webkit.org/show_bug.cgi?id=67898
+            REGRESSION(r94900): fast/images/support-broken-image-delegate.html fails on Mac
+
+            Reviewed by Simon Fraser.
+
+            New function willPaintBrokenImage() returns true when there has been an error 
+            loading the image and the broken image icon will be used in its place. This is 
+            necessary since it is possible to have an error loading an image and to NOT use 
+            the broken image icon. 
+            * loader/cache/CachedImage.cpp:
+            (WebCore::CachedImage::willPaintBrokenImage):
+            * loader/cache/CachedImage.h:
+            * rendering/RenderImage.cpp:
+            (WebCore::RenderImage::imageSizeForError):
+
 2011-12-05  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-534.53-branch/Source/WebCore/loader/cache/CachedImage.cpp

@@ -123 +123 @@
     DEFINE_STATIC_LOCAL(Image*, brokenImageLoRes, (Image::loadPlatformResource("missingImage").leakRef()));
     return brokenImageLoRes;
+}
+
+bool CachedImage::willPaintBrokenImage() const
+{
+    return errorOccurred() && m_shouldPaintBrokenImage;
 }
 

branches/safari-534.53-branch/Source/WebCore/loader/cache/CachedImage.h

@@ -49 +49 @@
 
     Image* brokenImage(float deviceScaleFactor) const;
+    bool willPaintBrokenImage() const; 
 
     bool canRender(float multiplier) const { return !errorOccurred() && !imageSize(multiplier).isEmpty(); }

branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp

@@ -86 +86 @@
     ASSERT_ARG(newImage, newImage->image());
 
-    Image* brokenImage = newImage->brokenImage(Page::deviceScaleFactor(frame())); 
+    Image* brokenImage;
+    if (newImage->willPaintBrokenImage())
+        brokenImage = newImage->brokenImage(Page::deviceScaleFactor(frame()));
+    else
+        brokenImage = newImage->image();
 
     // imageSize() returns 0 for the error image. We need the true size of the