Changeset 102070 in webkit

Timestamp:

Dec 5, 2011, 4:43:12 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r95053.

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 95053
+
+    2011-09-13  Beth Dakin  <bdakin@apple.com>
+
+            Adding a comment I forgot to add before.
+
+            * rendering/RenderImage.cpp:
+            (WebCore::RenderImage::imageSizeForError):
+
 2011-12-05  Lucas Forschler  <lforschler@apple.com>
 

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

@@ -90 +90 @@
         float deviceScaleFactor = Page::deviceScaleFactor(frame());
         imageSize = newImage->brokenImage(deviceScaleFactor)->size();
-        if (deviceScaleFactor >= 2)
-            imageSize.scale(0.5f);        
+        if (deviceScaleFactor >= 2) {
+            // It is important to scale by 0.5 instead of the deviceScaleFactor because the
+            // high resolution broken image artwork is actually a 2x image. We should 
+            // consider adding functionality to Image to ask about the image's resolution,
+            // and then we could scale by 1 / resolution. This is a solution that would
+            // scale better since this hardcoded number will have to change if we ever get
+            // artwork at other, higher resolutions. 
+            imageSize.scale(0.5f);
+        }
     } else
         imageSize = newImage->image()->size();