Changeset 150351 in webkit

Timestamp:

May 19, 2013 8:40:16 AM (11 years ago)

Author:

Darin Adler

Message:

Eliminate the Editor::newGeneralClipboard function
​https://bugs.webkit.org/show_bug.cgi?id=116410

Reviewed by Andreas Kling.

This is one of the clean-ups made possible by the changes to the DOM clipboard class.
I had been waiting until all the platforms were moved over to it, but it turns out to be
easy to do this now, just with #ifdefs.

• PlatformBlackBerry.cmake: Deleted EditorBlackBerry.cpp.

• editing/Editor.cpp:

(WebCore::Editor::dispatchCPPEvent): Call Clipboard::createForCopyAndPaste directly when
using the new version of the Clipboard class. Also some small style cleanup nearby.

• editing/blackberry/EditorBlackBerry.cpp: Removed. The only function in this file was

newGeneralClipboard.

• editing/mac/EditorMac.mm: Deleted newGeneralClipboard.
• platform/efl/ClipboardEfl.cpp: Ditto.
• platform/gtk/ClipboardGtk.cpp: Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformBlackBerry.cmake (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/blackberry/EditorBlackBerry.cpp (deleted)
• editing/mac/EditorMac.mm (modified) (1 diff)
• platform/efl/ClipboardEfl.cpp (modified) (1 diff)
• platform/gtk/ClipboardGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-19  Darin Adler  <darin@apple.com>
+
+        Eliminate the Editor::newGeneralClipboard function
+        https://bugs.webkit.org/show_bug.cgi?id=116410
+
+        Reviewed by Andreas Kling.
+
+        This is one of the clean-ups made possible by the changes to the DOM clipboard class.
+        I had been waiting until all the platforms were moved over to it, but it turns out to be
+        easy to do this now, just with #ifdefs.
+
+        * PlatformBlackBerry.cmake: Deleted EditorBlackBerry.cpp.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::dispatchCPPEvent): Call Clipboard::createForCopyAndPaste directly when
+        using the new version of the Clipboard class. Also some small style cleanup nearby.
+
+        * editing/blackberry/EditorBlackBerry.cpp: Removed. The only function in this file was
+        newGeneralClipboard.
+
+        * editing/mac/EditorMac.mm: Deleted newGeneralClipboard.
+        * platform/efl/ClipboardEfl.cpp: Ditto.
+        * platform/gtk/ClipboardGtk.cpp: Ditto.
+
 2013-05-19  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/PlatformBlackBerry.cmake

@@ -94 +94 @@
 # BlackBerry sources
 list(APPEND WebCore_SOURCES
-    editing/blackberry/EditorBlackBerry.cpp
     editing/blackberry/SmartReplaceBlackBerry.cpp
     html/shadow/MediaControlsBlackBerry.cpp

trunk/Source/WebCore/editing/Editor.cpp

@@ -698 +698 @@
 // Returns whether caller should continue with "the default processing", which is the same as 
 // the event handler NOT setting the return value to false
-bool Editor::dispatchCPPEvent(const AtomicString &eventType, ClipboardAccessPolicy policy)
+bool Editor::dispatchCPPEvent(const AtomicString& eventType, ClipboardAccessPolicy policy)
 {
     Node* target = findEventTargetFromSelection();
     if (!target)
         return true;
-    
+
+#if !USE(LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS)
+    RefPtr<Clipboard> clipboard = Clipboard::createForCopyAndPaste(policy);
+#else
+    // FIXME: Remove declaration of newGeneralClipboard when removing LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS.
     RefPtr<Clipboard> clipboard = newGeneralClipboard(policy, m_frame);
-
-    RefPtr<Event> evt = ClipboardEvent::create(eventType, true, true, clipboard);
-    target->dispatchEvent(evt, IGNORE_EXCEPTION);
-    bool noDefaultProcessing = evt->defaultPrevented();
+#endif
+
+    RefPtr<Event> event = ClipboardEvent::create(eventType, true, true, clipboard);
+    target->dispatchEvent(event, IGNORE_EXCEPTION);
+    bool noDefaultProcessing = event->defaultPrevented();
     if (noDefaultProcessing && policy == ClipboardWritable) {
         Pasteboard* pasteboard = Pasteboard::generalPasteboard();

trunk/Source/WebCore/editing/mac/EditorMac.mm

@@ -58 +58 @@
 using namespace HTMLNames;
 
-PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame*)
-{
-    return Clipboard::createForCopyAndPaste(policy);
-}
-
 void Editor::showFontPanel()
 {

trunk/Source/WebCore/platform/efl/ClipboardEfl.cpp

@@ -28 +28 @@
 namespace WebCore {
 
-PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame*)
-{
-    return Clipboard::createForCopyAndPaste(policy);
-}
-
 DragImageRef Clipboard::createDragImage(IntPoint&) const
 {

trunk/Source/WebCore/platform/gtk/ClipboardGtk.cpp

@@ -27 +27 @@
 namespace WebCore {
 
-// FIXME: this should be moved to editing/gtk/EditorGtk.cpp.
-PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame* frame)
-{
-    return Clipboard::createForCopyAndPaste(policy);
-}
-
 DragImageRef Clipboard::createDragImage(IntPoint& location) const
 {