Title: [167403] trunk/Source/WebKit/mac
Revision
167403
Author
timothy_hor...@apple.com
Date
2014-04-16 16:59:13 -0700 (Wed, 16 Apr 2014)

Log Message

Images dragged from WebKit1 on 2x displays are too big
https://bugs.webkit.org/show_bug.cgi?id=131775
<rdar://problem/15933525>

Reviewed by Simon Fraser.

* WebCoreSupport/WebDragClient.mm:
(WebDragClient::startDrag):
Scale the drag image's logical size down by the device scale factor
in WebKit1 just like we do in WebKit2.

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (167402 => 167403)


--- trunk/Source/WebKit/mac/ChangeLog	2014-04-16 23:55:36 UTC (rev 167402)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-04-16 23:59:13 UTC (rev 167403)
@@ -1,3 +1,16 @@
+2014-04-16  Tim Horton  <timothy_hor...@apple.com>
+
+        Images dragged from WebKit1 on 2x displays are too big
+        https://bugs.webkit.org/show_bug.cgi?id=131775
+        <rdar://problem/15933525>
+
+        Reviewed by Simon Fraser.
+
+        * WebCoreSupport/WebDragClient.mm:
+        (WebDragClient::startDrag):
+        Scale the drag image's logical size down by the device scale factor
+        in WebKit1 just like we do in WebKit2.
+
 2014-04-13  Andy Estes  <aes...@apple.com>
 
         [QuickLook] Move file system-related code into WebKit

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm (167402 => 167403)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm	2014-04-16 23:55:36 UTC (rev 167402)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm	2014-04-16 23:59:13 UTC (rev 167403)
@@ -105,6 +105,10 @@
     NSImage *dragNSImage = dragImage.get();
     WebHTMLView *sourceHTMLView = htmlView.get();
 
+    IntSize size([dragNSImage size]);
+    size.scale(1 / frame.page()->deviceScaleFactor());
+    [dragNSImage setSize:size];
+
     id delegate = [m_webView UIDelegate];
     SEL selector = @selector(webView:dragImage:at:offset:event:pasteboard:source:slideBack:forView:);
     if ([delegate respondsToSelector:selector]) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to