From 2860c3438c91210e3532b2bbd7b378e24574538c Mon Sep 17 00:00:00 2001 From: "timothy_horton@apple.com" Date: Thu, 31 Jul 2014 22:06:10 +0000 Subject: [PATCH] DOM::renderedImageForcingBlackText returns an image with the wrong logical size on 2x displays https://bugs.webkit.org/show_bug.cgi?id=135442 Reviewed by Simon Fraser. * bindings/objc/DOM.mm: (-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]): Scale the NSImage size by the device scale factor, similar to what we did for drag images in r167403. Ideally this scaling would happen in the code that generates the images, but this is a much larger change with much more regression potential. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171889 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 16 ++++++++++++++++ Source/WebCore/bindings/objc/DOM.mm | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 4a0d50d5e3b3..c691e35ba145 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,19 @@ +2014-07-31 Tim Horton + + DOM::renderedImageForcingBlackText returns an image with the wrong logical size on 2x displays + https://bugs.webkit.org/show_bug.cgi?id=135442 + + + Reviewed by Simon Fraser. + + * bindings/objc/DOM.mm: + (-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]): + Scale the NSImage size by the device scale factor, + similar to what we did for drag images in r167403. + Ideally this scaling would happen in the code that + generates the images, but this is a much larger change + with much more regression potential. + 2014-07-31 Bear Travis [CSS Font Loading] Rename document.fontloader to document.fonts diff --git a/Source/WebCore/bindings/objc/DOM.mm b/Source/WebCore/bindings/objc/DOM.mm index df6c0f1796c9..12b187f9701e 100644 --- a/Source/WebCore/bindings/objc/DOM.mm +++ b/Source/WebCore/bindings/objc/DOM.mm @@ -46,6 +46,7 @@ #import "Image.h" #import "JSNode.h" #import "NodeFilter.h" +#import "Page.h" #import "Range.h" #import "RenderImage.h" #import "ScriptController.h" @@ -609,7 +610,13 @@ id kit(WebCore::EventTarget* eventTarget) if (!frame) return nil; - return createDragImageForRange(*frame, *range, forceBlackText).autorelease(); + RetainPtr renderedImage = createDragImageForRange(*frame, *range, forceBlackText); + + IntSize size([renderedImage size]); + size.scale(1 / frame->page()->deviceScaleFactor()); + [renderedImage setSize:size]; + + return renderedImage.autorelease(); } - (NSArray *)textRects -- 2.36.0