Title: [150125] trunk/Source/WebCore
- Revision
- 150125
- Author
- [email protected]
- Date
- 2013-05-15 10:02:25 -0700 (Wed, 15 May 2013)
Log Message
[Mac] Remove call to ClipboardMac::create from Editor::newGeneralClipboard
https://bugs.webkit.org/show_bug.cgi?id=116162
Reviewed by Andreas Kling.
* dom/Clipboard.h: Add createForCopyAndPaste function.
* editing/mac/EditorMac.mm:
(WebCore::Editor::newGeneralClipboard): Call createForCopyAndPaste.
* platform/mac/ClipboardMac.mm:
(WebCore::Clipboard::createForCopyAndPaste): Added. Moved code here from
Editor::newGeneralClipboard.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (150124 => 150125)
--- trunk/Source/WebCore/ChangeLog 2013-05-15 16:53:42 UTC (rev 150124)
+++ trunk/Source/WebCore/ChangeLog 2013-05-15 17:02:25 UTC (rev 150125)
@@ -1,5 +1,21 @@
2013-05-15 Darin Adler <[email protected]>
+ [Mac] Remove call to ClipboardMac::create from Editor::newGeneralClipboard
+ https://bugs.webkit.org/show_bug.cgi?id=116162
+
+ Reviewed by Andreas Kling.
+
+ * dom/Clipboard.h: Add createForCopyAndPaste function.
+
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::newGeneralClipboard): Call createForCopyAndPaste.
+
+ * platform/mac/ClipboardMac.mm:
+ (WebCore::Clipboard::createForCopyAndPaste): Added. Moved code here from
+ Editor::newGeneralClipboard.
+
+2013-05-15 Darin Adler <[email protected]>
+
[Mac] Remove call to ClipboardMac::create from EventHandler::createDraggingClipboard
https://bugs.webkit.org/show_bug.cgi?id=116161
Modified: trunk/Source/WebCore/dom/Clipboard.h (150124 => 150125)
--- trunk/Source/WebCore/dom/Clipboard.h 2013-05-15 16:53:42 UTC (rev 150124)
+++ trunk/Source/WebCore/dom/Clipboard.h 2013-05-15 17:02:25 UTC (rev 150125)
@@ -128,6 +128,8 @@
#endif
#if !USE(LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS)
+ static PassRefPtr<Clipboard> createForCopyAndPaste(ClipboardAccessPolicy);
+
const Pasteboard& pasteboard() { return *m_pasteboard; }
#endif
Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (150124 => 150125)
--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2013-05-15 16:53:42 UTC (rev 150124)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2013-05-15 17:02:25 UTC (rev 150125)
@@ -57,10 +57,9 @@
using namespace HTMLNames;
-PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame* frame)
+PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame*)
{
- return ClipboardMac::create(Clipboard::CopyAndPaste,
- policy == ClipboardWritable ? platformStrategies()->pasteboardStrategy()->uniqueName() : String(NSGeneralPboard), policy, ClipboardMac::CopyAndPasteGeneric, frame);
+ return Clipboard::createForCopyAndPaste(policy);
}
void Editor::showFontPanel()
Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.mm (150124 => 150125)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-05-15 16:53:42 UTC (rev 150124)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-05-15 17:02:25 UTC (rev 150125)
@@ -36,6 +36,8 @@
#import "FrameSnapshottingMac.h"
#import "Page.h"
#import "Pasteboard.h"
+#import "PasteboardStrategy.h"
+#import "PlatformStrategies.h"
namespace WebCore {
@@ -51,6 +53,12 @@
return ClipboardMac::create(Clipboard::DragAndDrop, NSDragPboard, ClipboardWritable, ClipboardMac::DragAndDropData, 0);
}
+PassRefPtr<Clipboard> Clipboard::createForCopyAndPaste(ClipboardAccessPolicy policy)
+{
+ return ClipboardMac::create(Clipboard::CopyAndPaste,
+ policy == ClipboardWritable ? platformStrategies()->pasteboardStrategy()->uniqueName() : String(NSGeneralPboard), policy, ClipboardMac::CopyAndPasteGeneric, 0);
+}
+
ClipboardMac::ClipboardMac(ClipboardType clipboardType, const String& pasteboardName, ClipboardAccessPolicy policy, ClipboardContents clipboardContents)
: Clipboard(policy, clipboardType, Pasteboard::create(pasteboardName), clipboardContents == DragAndDropFiles)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
