Changeset 102068 in webkit

Timestamp:

Dec 5, 2011, 4:37:11 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r95048.

Location:

branches/safari-534.53-branch/Source/WebCore

Files:

• ChangeLog (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 95048
+
+    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-12-05  Lucas Forschler  <lforschler@apple.com>
 

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

@@ -86 +86 @@
     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());
 }