Changeset 94980 in webkit

Timestamp:

Sep 12, 2011, 2:52:01 PM (15 years ago)

Author:

Beth Dakin

Message:

​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.

Source/WebCore:

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):

LayoutTests:

• platform/mac/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedImage.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedImage.h (modified) (1 diff)
• Source/WebCore/rendering/RenderImage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
+        * platform/mac/Skipped:
+
 2011-09-12  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/platform/mac/Skipped

@@ -421 +421 @@
 # https://bugs.webkit.org/show_bug.cgi?id=67716
 media/media-controls-invalid-url.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=67898
-fast/images/support-broken-image-delegate.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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-09-12  James Robinson  <jamesr@chromium.org>
 

trunk/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;
 }
 

trunk/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(); }

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -85 +85 @@
     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