Changeset 95048 in webkit

Timestamp:

Sep 13, 2011, 3:17:09 PM (15 years ago)

Author:

Beth Dakin

Message:

​https://bugs.webkit.org/show_bug.cgi?id=67885
Outline for the high-resolution broken image icon draws at 2x
-and corresponding-
<rdar://problem/10104637>

Reviewed by Dan Bernstein.

Scaled the image size to account for the deviceScaleFactor.

• rendering/RenderImage.cpp:

(WebCore::RenderImage::imageSizeForError):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderImage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ -1 @@
-2011-09-13  Tim Horton  <timothy_horton@apple.com>
-
-        REGRESSION (64275): Shape pattern-image fill turns black
-        https://bugs.webkit.org/show_bug.cgi?id=51061
-        <rdar://problem/8504705>
-
-        Reviewed by Simon Fraser.
-
-        When destroying a resource, register clients who are losing their
-        resource as having pending resources, so they can be resolved in the case a
-        resource with that id is re-registered.
-
-        Test: svg/custom/pending-resource-after-removal.xhtml
-
-        * rendering/svg/SVGResourcesCache.cpp:
-        (WebCore::SVGResourcesCache::resourceDestroyed):
-        * svg/SVGStyledElement.h:
-        (WebCore::toSVGStyledElement): Added.
+2011-09-13  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=67885
+        Outline for the high-resolution broken image icon draws at 2x
+        -and corresponding-
+        <rdar://problem/10104637>
+
+        Reviewed by Dan Bernstein.
+
+        Scaled the image size to account for the deviceScaleFactor. 
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::imageSizeForError):
 
 2011-09-13  Eric Seidel  <eric@webkit.org>

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -85 +85 @@
     ASSERT_ARG(newImage, newImage->image());
 
-    Image* brokenImage;
-    if (newImage->willPaintBrokenImage())
-        brokenImage = newImage->brokenImage(Page::deviceScaleFactor(frame()));
-    else
-        brokenImage = newImage->image();
+    IntSize imageSize;
+    if (newImage->willPaintBrokenImage()) {
+        float deviceScaleFactor = Page::deviceScaleFactor(frame());
+        imageSize = newImage->brokenImage(deviceScaleFactor)->size();
+        if (deviceScaleFactor >= 2)
+            imageSize.scale(0.5f);        
+    } else
+        imageSize = newImage->image()->size();
 
     // imageSize() returns 0 for the error image. We need the true size of the
     // error image, so we have to get it by grabbing image() directly.
-    return IntSize(paddingWidth + brokenImage->width() * style()->effectiveZoom(), paddingHeight + brokenImage->height() * style()->effectiveZoom());
+    return IntSize(paddingWidth + imageSize.width() * style()->effectiveZoom(), paddingHeight + imageSize.height() * style()->effectiveZoom());
 }