Changeset 150107 in webkit

Timestamp:

May 15, 2013, 2:43:18 AM (13 years ago)

Author:

Darin Adler

Message:

[Mac] Make Clipboard::createDragImage non-virtual
​https://bugs.webkit.org/show_bug.cgi?id=116136

Reviewed by Benjamin Poulain.

• dom/Clipboard.h: Made createDragImage non-virtual for non-legacy.

• platform/mac/ClipboardMac.h: Removed frame argument from create function

and constructor. Removed createDragImage and dragNSImage. Removed m_frame
data member.

• platform/mac/ClipboardMac.mm:

(WebCore::ClipboardMac::ClipboardMac): Removed frame argument and code
to initialize m_frame.
(WebCore::Clipboard::createDragImage): Merged the createDragImage and
dragNSImage functions, since they were the same thing. Changed code to get
the frame from the drag image element. Made the createDragImage function
a Clipboard member instead of ClipboardMac.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Clipboard.h (modified) (1 diff)
• platform/mac/ClipboardMac.h (modified) (2 diffs)
• platform/mac/ClipboardMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-15  Darin Adler  <darin@apple.com>
+
+        [Mac] Make Clipboard::createDragImage non-virtual
+        https://bugs.webkit.org/show_bug.cgi?id=116136
+
+        Reviewed by Benjamin Poulain.
+
+        * dom/Clipboard.h: Made createDragImage non-virtual for non-legacy.
+
+        * platform/mac/ClipboardMac.h: Removed frame argument from create function
+        and constructor. Removed createDragImage and dragNSImage. Removed m_frame
+        data member.
+
+        * platform/mac/ClipboardMac.mm:
+        (WebCore::ClipboardMac::ClipboardMac): Removed frame argument and code
+        to initialize m_frame.
+        (WebCore::Clipboard::createDragImage): Merged the createDragImage and
+        dragNSImage functions, since they were the same thing. Changed code to get
+        the frame from the drag image element. Made the createDragImage function
+        a Clipboard member instead of ClipboardMac.
+
 2013-05-15  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/dom/Clipboard.h

@@ -95 +95 @@
         LEGACY_VIRTUAL void setDragImageElement(Node*, const IntPoint&) LEGACY_PURE;
         
-        virtual DragImageRef createDragImage(IntPoint& dragLocation) const = 0;
+        LEGACY_VIRTUAL DragImageRef createDragImage(IntPoint& dragLocation) const LEGACY_PURE;
 #if ENABLE(DRAG_SUPPORT)
         virtual void declareAndWriteDragImage(Element*, const KURL&, const String& title, Frame*) = 0;

trunk/Source/WebCore/platform/mac/ClipboardMac.h

@@ -47 +47 @@
     };
 
-    static PassRefPtr<ClipboardMac> create(ClipboardType clipboardType, const String& pasteboardName, ClipboardAccessPolicy policy, ClipboardContents clipboardContents, Frame* frame)
+    static PassRefPtr<ClipboardMac> create(ClipboardType clipboardType, const String& pasteboardName, ClipboardAccessPolicy policy, ClipboardContents clipboardContents, Frame*)
     {
-        return adoptRef(new ClipboardMac(clipboardType, pasteboardName, policy, clipboardContents, frame));
+        return adoptRef(new ClipboardMac(clipboardType, pasteboardName, policy, clipboardContents));
     }
 
     virtual ~ClipboardMac();
 
-    virtual DragImageRef createDragImage(IntPoint& dragLoc) const;
 #if ENABLE(DRAG_SUPPORT)
     virtual void declareAndWriteDragImage(Element*, const KURL&, const String& title, Frame*);
@@ -60 +59 @@
     
     // Methods for getting info in Cocoa's type system
-    NSImage *dragNSImage(NSPoint&) const; // loc converted from dragLoc, based on whole image size
     const String& pasteboardName() { return m_pasteboardName; }
 
 private:
-    ClipboardMac(ClipboardType, const String& pasteboardName, ClipboardAccessPolicy, ClipboardContents, Frame*);
+    ClipboardMac(ClipboardType, const String& pasteboardName, ClipboardAccessPolicy, ClipboardContents);
 
     String m_pasteboardName;
     int m_changeCount;
-    Frame* m_frame; // used on the source side to generate dragging images
 };
 

trunk/Source/WebCore/platform/mac/ClipboardMac.mm

@@ -56 +56 @@
 #endif
 
-ClipboardMac::ClipboardMac(ClipboardType clipboardType, const String& pasteboardName, ClipboardAccessPolicy policy, ClipboardContents clipboardContents, Frame *frame)
+ClipboardMac::ClipboardMac(ClipboardType clipboardType, const String& pasteboardName, ClipboardAccessPolicy policy, ClipboardContents clipboardContents)
     : Clipboard(policy, clipboardType, Pasteboard::create(pasteboardName), clipboardContents == DragAndDropFiles)
     , m_pasteboardName(pasteboardName)
-    , m_frame(frame)
 {
     m_changeCount = platformStrategies()->pasteboardStrategy()->changeCount(m_pasteboardName);
@@ -77 +76 @@
 #endif // ENABLE(DRAG_SUPPORT)
     
-DragImageRef ClipboardMac::createDragImage(IntPoint& loc) const
-{
-    NSPoint nsloc = NSMakePoint(loc.x(), loc.y());
-    DragImageRef result = dragNSImage(nsloc);
-    loc = (IntPoint)nsloc;
-    return result;
-}
-    
-NSImage *ClipboardMac::dragNSImage(NSPoint& loc) const
+DragImageRef Clipboard::createDragImage(IntPoint& location) const
 {
     NSImage *result = nil;
     if (m_dragImageElement) {
-        if (m_frame) {
+        Document* document = m_dragImageElement->document();
+        if (Frame* frame = document->frame()) {
             NSRect imageRect;
             NSRect elementRect;
-            result = snapshotDragImage(m_frame, m_dragImageElement.get(), &imageRect, &elementRect);
+            result = snapshotDragImage(frame, m_dragImageElement.get(), &imageRect, &elementRect);
             // Client specifies point relative to element, not the whole image, which may include child
             // layers spread out all over the place.
-            loc.x = elementRect.origin.x - imageRect.origin.x + m_dragLoc.x();
-            loc.y = elementRect.origin.y - imageRect.origin.y + m_dragLoc.y();
-            loc.y = imageRect.size.height - loc.y;
+            location.setX(elementRect.origin.x - imageRect.origin.x + m_dragLoc.x());
+            location.setY(imageRect.size.height - (elementRect.origin.y - imageRect.origin.y + m_dragLoc.y()));
         }
     } else if (m_dragImage) {
         result = m_dragImage->image()->getNSImage();
         
-        loc = m_dragLoc;
-        loc.y = [result size].height - loc.y;
+        location = m_dragLoc;
+        location.setY([result size].height - location.y());
     }
     return result;