Changeset 150119 in webkit

Timestamp:

May 15, 2013, 9:27:43 AM (13 years ago)

Author:

Darin Adler

Message:

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

Reviewed by Anders Carlsson.

• dom/Clipboard.h: Make declareAndWriteDragImage non-virtual for non-legacy.

• platform/Pasteboard.h:

(WebCore::Pasteboard::name): Added. Can be used in Mac platform code to do
pasteboard operations directly instead of through the Pasteboard class
functions. Not sure if we'll need it long term or not.

• platform/mac/ClipboardMac.h: Removed declareAndWriteDragImage function.

• platform/mac/ClipboardMac.mm:

(WebCore::Clipboard::declareAndWriteDragImage): Made this function a Clipboard
member instead of ClipboardMac.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-15  Darin Adler  <darin@apple.com>
+
+        [Mac] Make Clipboard::declareAndWriteDragImage non-virtual
+        https://bugs.webkit.org/show_bug.cgi?id=116156
+
+        Reviewed by Anders Carlsson.
+
+        * dom/Clipboard.h: Make declareAndWriteDragImage non-virtual for non-legacy.
+
+        * platform/Pasteboard.h:
+        (WebCore::Pasteboard::name): Added. Can be used in Mac platform code to do
+        pasteboard operations directly instead of through the Pasteboard class
+        functions. Not sure if we'll need it long term or not.
+
+        * platform/mac/ClipboardMac.h: Removed declareAndWriteDragImage function.
+
+        * platform/mac/ClipboardMac.mm:
+        (WebCore::Clipboard::declareAndWriteDragImage): Made this function a Clipboard
+        member instead of ClipboardMac.
+
 2013-05-15  Peter Gal  <galpeter@inf.u-szeged.hu>
 

trunk/Source/WebCore/dom/Clipboard.h

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

trunk/Source/WebCore/platform/Pasteboard.h

@@ -83 +83 @@
 #if PLATFORM(MAC)
     static PassOwnPtr<Pasteboard> create(const String& pasteboardName);
+    String name() { return m_pasteboardName; }
 
     // This is required to support OS X services.

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

@@ -54 +54 @@
     virtual ~ClipboardMac();
 
-#if ENABLE(DRAG_SUPPORT)
-    virtual void declareAndWriteDragImage(Element*, const KURL&, const String& title, Frame*);
-#endif
-    
     // Methods for getting info in Cocoa's type system
     const String& pasteboardName() { return m_pasteboardName; }

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

@@ -68 +68 @@
 
 #if ENABLE(DRAG_SUPPORT)
-void ClipboardMac::declareAndWriteDragImage(Element* element, const KURL& url, const String& title, Frame* frame)
+void Clipboard::declareAndWriteDragImage(Element* element, const KURL& url, const String& title, Frame* frame)
 {
     ASSERT(frame);
     if (Page* page = frame->page())
-        page->dragController()->client()->declareAndWriteDragImage(m_pasteboardName, kit(element), url, title, frame);
+        page->dragController()->client()->declareAndWriteDragImage(m_pasteboard->name(), kit(element), url, title, frame);
 }
 #endif // ENABLE(DRAG_SUPPORT)