<!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>[150127] 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/150127">150127</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2013-05-15 10:14:19 -0700 (Wed, 15 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Mac] Change Clipboard::create functions so they don't use ClipboardMac::create any more
https://bugs.webkit.org/show_bug.cgi?id=116163

Reviewed by Anders Carlsson.

* dom/Clipboard.h: Made the file drag boolean default to false, better for most callers.

* platform/mac/ClipboardMac.mm: Remove #if ENABLE(DRAG_SUPPORT); that's always on for Mac
and it's not helpful to have the conditionals in here. It's helpful in cross-platform
source files.
(WebCore::Clipboard::create): Create a Pasteboard and then create a Clipboard with new.
Later could refactor to have the Pasteboard creation be platform-specific, and make these
functions platform-independent.
(WebCore::Clipboard::createForDragAndDrop): Ditto.
(WebCore::Clipboard::createForCopyAndPaste): Ditto.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomClipboardh">trunk/Source/WebCore/dom/Clipboard.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 (150126 => 150127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-15 17:04:13 UTC (rev 150126)
+++ trunk/Source/WebCore/ChangeLog        2013-05-15 17:14:19 UTC (rev 150127)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2013-05-15  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        [Mac] Change Clipboard::create functions so they don't use ClipboardMac::create any more
+        https://bugs.webkit.org/show_bug.cgi?id=116163
+
+        Reviewed by Anders Carlsson.
+
+        * dom/Clipboard.h: Made the file drag boolean default to false, better for most callers.
+
+        * platform/mac/ClipboardMac.mm: Remove #if ENABLE(DRAG_SUPPORT); that's always on for Mac
+        and it's not helpful to have the conditionals in here. It's helpful in cross-platform
+        source files.
+        (WebCore::Clipboard::create): Create a Pasteboard and then create a Clipboard with new.
+        Later could refactor to have the Pasteboard creation be platform-specific, and make these
+        functions platform-independent.
+        (WebCore::Clipboard::createForDragAndDrop): Ditto.
+        (WebCore::Clipboard::createForCopyAndPaste): Ditto.
+
+2013-05-15  Darin Adler  &lt;darin@apple.com&gt;
+
</ins><span class="cx">         [Mac] Remove call to ClipboardMac::create from Editor::newGeneralClipboard
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=116162
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomClipboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Clipboard.h (150126 => 150127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Clipboard.h        2013-05-15 17:04:13 UTC (rev 150126)
+++ trunk/Source/WebCore/dom/Clipboard.h        2013-05-15 17:14:19 UTC (rev 150127)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> 
</span><span class="cx">     protected:
</span><span class="cx"> #if !USE(LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS)
</span><del>-        Clipboard(ClipboardAccessPolicy, ClipboardType, PassOwnPtr&lt;Pasteboard&gt;, bool forFileDrag);
</del><ins>+        Clipboard(ClipboardAccessPolicy, ClipboardType, PassOwnPtr&lt;Pasteboard&gt;, bool forFileDrag = false);
</ins><span class="cx"> #else
</span><span class="cx">         Clipboard(ClipboardAccessPolicy, ClipboardType);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacClipboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.mm (150126 => 150127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ClipboardMac.mm        2013-05-15 17:04:13 UTC (rev 150126)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.mm        2013-05-15 17:14:19 UTC (rev 150127)
</span><span class="lines">@@ -41,22 +41,20 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-#if ENABLE(DRAG_SUPPORT)
-PassRefPtr&lt;Clipboard&gt; Clipboard::create(ClipboardAccessPolicy policy, DragData* dragData, Frame* frame)
</del><ins>+PassRefPtr&lt;Clipboard&gt; Clipboard::create(ClipboardAccessPolicy policy, DragData* dragData, Frame*)
</ins><span class="cx"> {
</span><del>-    return ClipboardMac::create(DragAndDrop, dragData-&gt;pasteboardName(), policy, dragData-&gt;containsFiles() ? ClipboardMac::DragAndDropFiles : ClipboardMac::DragAndDropData, frame);
</del><ins>+    return adoptRef(new Clipboard(policy, DragAndDrop, Pasteboard::create(dragData-&gt;pasteboardName()), dragData-&gt;containsFiles()));
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> PassRefPtr&lt;Clipboard&gt; Clipboard::createForDragAndDrop()
</span><span class="cx"> {
</span><del>-    return ClipboardMac::create(Clipboard::DragAndDrop, NSDragPboard, ClipboardWritable, ClipboardMac::DragAndDropData, 0);
</del><ins>+    return adoptRef(new Clipboard(ClipboardWritable, DragAndDrop, Pasteboard::create(NSDragPboard)));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> PassRefPtr&lt;Clipboard&gt; Clipboard::createForCopyAndPaste(ClipboardAccessPolicy policy)
</span><span class="cx"> {
</span><del>-    return ClipboardMac::create(Clipboard::CopyAndPaste,
-        policy == ClipboardWritable ? platformStrategies()-&gt;pasteboardStrategy()-&gt;uniqueName() : String(NSGeneralPboard), policy, ClipboardMac::CopyAndPasteGeneric, 0);
</del><ins>+    String pasteboardName = policy == ClipboardWritable ? platformStrategies()-&gt;pasteboardStrategy()-&gt;uniqueName() : String(NSGeneralPboard);
+    return adoptRef(new Clipboard(policy, CopyAndPaste, Pasteboard::create(pasteboardName)));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ClipboardMac::ClipboardMac(ClipboardType clipboardType, const String&amp; pasteboardName, ClipboardAccessPolicy policy, ClipboardContents clipboardContents)
</span><span class="lines">@@ -64,14 +62,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(DRAG_SUPPORT)
</del><span class="cx"> void Clipboard::declareAndWriteDragImage(Element* element, const KURL&amp; url, const String&amp; title, Frame* frame)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(frame);
</span><span class="cx">     if (Page* page = frame-&gt;page())
</span><span class="cx">         page-&gt;dragController()-&gt;client()-&gt;declareAndWriteDragImage(m_pasteboard-&gt;name(), kit(element), url, title, frame);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">     
</span><span class="cx"> DragImageRef Clipboard::createDragImage(IntPoint&amp; location) const
</span><span class="cx"> {
</span></span></pre>
</div>
</div>

</body>
</html>