Title: [102068] branches/safari-534.53-branch/Source/WebCore
Diff
Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102067 => 102068)
--- branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-06 00:33:28 UTC (rev 102067)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-06 00:37:11 UTC (rev 102068)
@@ -1,5 +1,22 @@
2011-12-05 Lucas Forschler <[email protected]>
+ Merge 95048
+
+ 2011-09-13 Beth Dakin <[email protected]>
+
+ 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 <[email protected]>
+
Merge 94980
2011-09-12 Beth Dakin <[email protected]>
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp (102067 => 102068)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp 2011-12-06 00:33:28 UTC (rev 102067)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp 2011-12-06 00:37:11 UTC (rev 102068)
@@ -85,15 +85,18 @@
ASSERT_ARG(newImage, newImage);
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());
}
// Sets the image height and width to fit the alt text. Returns true if the
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
