<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149979] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/149979">149979</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2013-05-12 20:51:12 -0700 (Sun, 12 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomClipboardcpp">trunk/Source/WebCore/dom/Clipboard.cpp</a></li>
<li><a href="#trunkSourceWebCoredomClipboardh">trunk/Source/WebCore/dom/Clipboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacClipboardMach">trunk/Source/WebCore/platform/mac/ClipboardMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacClipboardMacmm">trunk/Source/WebCore/platform/mac/ClipboardMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149978 => 149979)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-05-12  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        [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  &lt;darin@apple.com&gt;
+
</ins><span class="cx">         [Mac] Move clearData from ClipboardMac to PasteboardMac
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=116000
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomClipboardcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Clipboard.cpp (149978 => 149979)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -266,6 +266,14 @@
</span><span class="cx">     m_pasteboard-&gt;clear(type);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void Clipboard::clearAllData()
+{
+    if (!canWriteData())
+        return;
+
+    m_pasteboard-&gt;clear();
+}
+
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomClipboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Clipboard.h (149978 => 149979)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">         void setEffectAllowed(const String&amp;);
</span><span class="cx">     
</span><span class="cx">         LEGACY_VIRTUAL void clearData(const String&amp; type) LEGACY_PURE;
</span><del>-        virtual void clearAllData() = 0;
</del><ins>+        LEGACY_VIRTUAL void clearAllData() LEGACY_PURE;
</ins><span class="cx">         virtual String getData(const String&amp; type) const = 0;
</span><span class="cx">         virtual bool setData(const String&amp; type, const String&amp; data) = 0;
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacClipboardMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.h (149978 => 149979)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> 
</span><span class="cx">     virtual ~ClipboardMac();
</span><span class="cx">     
</span><del>-    void clearAllData();
</del><span class="cx">     String getData(const String&amp; type) const;
</span><span class="cx">     bool setData(const String&amp; type, const String&amp; data);
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacClipboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.mm (149978 => 149979)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -113,17 +113,6 @@
</span><span class="cx">     resultTypes.add(cocoaType);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-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();
-}
-
</del><span class="cx"> static Vector&lt;String&gt; absoluteURLsFromPasteboardFilenames(const String&amp; pasteboardName, bool onlyFirstURL = false)
</span><span class="cx"> {
</span><span class="cx">     Vector&lt;String&gt; fileList;
</span></span></pre>
</div>
</div>

</body>
</html>