Title: [95048] trunk/Source/WebCore
- Revision
- 95048
- Author
- bda...@apple.com
- Date
- 2011-09-13 15:17:09 -0700 (Tue, 13 Sep 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95047 => 95048)
--- trunk/Source/WebCore/ChangeLog 2011-09-13 21:54:02 UTC (rev 95047)
+++ trunk/Source/WebCore/ChangeLog 2011-09-13 22:17:09 UTC (rev 95048)
@@ -1,22 +1,16 @@
-2011-09-13 Tim Horton <timothy_hor...@apple.com>
+2011-09-13 Beth Dakin <bda...@apple.com>
- REGRESSION (64275): Shape pattern-image fill turns black
- https://bugs.webkit.org/show_bug.cgi?id=51061
- <rdar://problem/8504705>
+ 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 Simon Fraser.
+ Reviewed by Dan Bernstein.
- 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.
+ Scaled the image size to account for the deviceScaleFactor.
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::imageSizeForError):
- Test: svg/custom/pending-resource-after-removal.xhtml
-
- * rendering/svg/SVGResourcesCache.cpp:
- (WebCore::SVGResourcesCache::resourceDestroyed):
- * svg/SVGStyledElement.h:
- (WebCore::toSVGStyledElement): Added.
-
2011-09-13 Eric Seidel <e...@webkit.org>
Remove ENABLE_SVG_FOREIGN_OBJECT as it is a required part of HTML5
Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (95047 => 95048)
--- trunk/Source/WebCore/rendering/RenderImage.cpp 2011-09-13 21:54:02 UTC (rev 95047)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2011-09-13 22:17:09 UTC (rev 95048)
@@ -84,15 +84,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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
