Title: [149979] trunk/Source/WebCore
- Revision
- 149979
- Author
- [email protected]
- Date
- 2013-05-12 20:51:12 -0700 (Sun, 12 May 2013)
Log Message
[Mac] Move clearAllData from ClipboardMac to PasteboardMac
https://bugs.webkit.org/show_bug.cgi?id=116001
Reviewed by Andreas Kling.
* dom/Clipboard.cpp:
(WebCore::Clipboard::clearAllData): Added. Calls through to Pasteboard after
doing the canWriteData check, which is part of DOM rules, not the platform.
* dom/Clipboard.h: Made clearAllData non-virtual in non-legacy case.
* platform/mac/ClipboardMac.h: Removed clearAllData.
* platform/mac/ClipboardMac.mm: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149978 => 149979)
--- trunk/Source/WebCore/ChangeLog 2013-05-13 02:56:24 UTC (rev 149978)
+++ trunk/Source/WebCore/ChangeLog 2013-05-13 03:51:12 UTC (rev 149979)
@@ -1,5 +1,21 @@
2013-05-12 Darin Adler <[email protected]>
+ [Mac] Move clearAllData from ClipboardMac to PasteboardMac
+ https://bugs.webkit.org/show_bug.cgi?id=116001
+
+ Reviewed by Andreas Kling.
+
+ * dom/Clipboard.cpp:
+ (WebCore::Clipboard::clearAllData): Added. Calls through to Pasteboard after
+ doing the canWriteData check, which is part of DOM rules, not the platform.
+
+ * dom/Clipboard.h: Made clearAllData non-virtual in non-legacy case.
+
+ * platform/mac/ClipboardMac.h: Removed clearAllData.
+ * platform/mac/ClipboardMac.mm: Ditto.
+
+2013-05-12 Darin Adler <[email protected]>
+
[Mac] Move clearData from ClipboardMac to PasteboardMac
https://bugs.webkit.org/show_bug.cgi?id=116000
Modified: trunk/Source/WebCore/dom/Clipboard.cpp (149978 => 149979)
--- trunk/Source/WebCore/dom/Clipboard.cpp 2013-05-13 02:56:24 UTC (rev 149978)
+++ trunk/Source/WebCore/dom/Clipboard.cpp 2013-05-13 03:51:12 UTC (rev 149979)
@@ -266,6 +266,14 @@
m_pasteboard->clear(type);
}
+void Clipboard::clearAllData()
+{
+ if (!canWriteData())
+ return;
+
+ m_pasteboard->clear();
+}
+
#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/dom/Clipboard.h (149978 => 149979)
--- trunk/Source/WebCore/dom/Clipboard.h 2013-05-13 02:56:24 UTC (rev 149978)
+++ trunk/Source/WebCore/dom/Clipboard.h 2013-05-13 03:51:12 UTC (rev 149979)
@@ -80,7 +80,7 @@
void setEffectAllowed(const String&);
LEGACY_VIRTUAL void clearData(const String& type) LEGACY_PURE;
- virtual void clearAllData() = 0;
+ LEGACY_VIRTUAL void clearAllData() LEGACY_PURE;
virtual String getData(const String& type) const = 0;
virtual bool setData(const String& type, const String& data) = 0;
Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.h (149978 => 149979)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.h 2013-05-13 02:56:24 UTC (rev 149978)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.h 2013-05-13 03:51:12 UTC (rev 149979)
@@ -53,7 +53,6 @@
virtual ~ClipboardMac();
- void clearAllData();
String getData(const String& type) const;
bool setData(const String& type, const String& data);
Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.mm (149978 => 149979)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-05-13 02:56:24 UTC (rev 149978)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-05-13 03:51:12 UTC (rev 149979)
@@ -113,17 +113,6 @@
resultTypes.add(cocoaType);
}
-void ClipboardMac::clearAllData()
-{
- if (!canWriteData())
- return;
-
- // note NSPasteboard enforces changeCount itself on writing - can't write if not the owner
-
- Pasteboard pasteboard(m_pasteboardName);
- pasteboard.clear();
-}
-
static Vector<String> absoluteURLsFromPasteboardFilenames(const String& pasteboardName, bool _onlyFirstURL_ = false)
{
Vector<String> fileList;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
