Changeset 72495 in webkit

Timestamp:

Nov 20, 2010 10:44:29 PM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-11-20 Andreas Kling <​kling@webkit.org>

Reviewed by Antonio Gomes.

[Qt] Limit the size of image preview "cursor" when dragging
​https://bugs.webkit.org/show_bug.cgi?id=49872

Respect DragController::maxDragImageSize() (currently 400x400.)

• platform/qt/DragImageQt.cpp: (WebCore::dragImageSize): (WebCore::scaleDragImage):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/DragImageQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-20  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Limit the size of image preview "cursor" when dragging
+        https://bugs.webkit.org/show_bug.cgi?id=49872
+
+        Respect DragController::maxDragImageSize() (currently 400x400.)
+
+        * platform/qt/DragImageQt.cpp:
+        (WebCore::dragImageSize):
+        (WebCore::scaleDragImage):
+
 2010-11-20  Andreas Kling  <kling@webkit.org>
 

trunk/WebCore/platform/qt/DragImageQt.cpp

@@ -32 +32 @@
 namespace WebCore {
 
-IntSize dragImageSize(DragImageRef)
+IntSize dragImageSize(DragImageRef image)
 {
-    return IntSize(0, 0);
+    if (!image)
+        return IntSize();
+
+    return image->size();
 }
 
@@ -42 +45 @@
 }
 
-DragImageRef scaleDragImage(DragImageRef image, FloatSize)
+DragImageRef scaleDragImage(DragImageRef image, FloatSize scale)
 {
+    if (!image)
+        return 0;
+
+    int scaledWidth = image->width() * scale.width();
+    int scaledHeight = image->height() * scale.height();
+
+    *image = image->scaled(scaledWidth, scaledHeight);
     return image;
 }