Title: [102070] branches/safari-534.53-branch/Source/WebCore
Diff
Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102069 => 102070)
--- branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-06 00:40:58 UTC (rev 102069)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-06 00:43:12 UTC (rev 102070)
@@ -1,5 +1,16 @@
2011-12-05 Lucas Forschler <[email protected]>
+ Merge 95053
+
+ 2011-09-13 Beth Dakin <[email protected]>
+
+ Adding a comment I forgot to add before.
+
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::imageSizeForError):
+
+2011-12-05 Lucas Forschler <[email protected]>
+
Merge 95051.
This restored a broken Changelog, which isn't necessary for the branch anyway.
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp (102069 => 102070)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp 2011-12-06 00:40:58 UTC (rev 102069)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp 2011-12-06 00:43:12 UTC (rev 102070)
@@ -89,8 +89,15 @@
if (newImage->willPaintBrokenImage()) {
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();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
