<!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>[176780] 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/176780">176780</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-03 19:02:57 -0800 (Wed, 03 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use std::unique_ptr instead of PassOwnPtr|OwnPtr for Pasteboard
https://bugs.webkit.org/show_bug.cgi?id=139019
Patch by Joonghun Park <jh718.park@samsung.com> on 2014-12-03
Reviewed by Darin Adler.
No new tests, no behavior changes.
* dom/DataTransfer.cpp:
(WebCore::DataTransfer::DataTransfer):
* dom/DataTransfer.h:
* editing/Editor.cpp:
(WebCore::Editor::dispatchCPPEvent):
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::createDraggingDataTransfer):
* platform/Pasteboard.h:
* platform/efl/PasteboardEfl.cpp:
(WebCore::Pasteboard::createForCopyAndPaste):
(WebCore::Pasteboard::createPrivate):
(WebCore::Pasteboard::createForDragAndDrop):
* platform/gtk/PasteboardGtk.cpp:
(WebCore::Pasteboard::createForCopyAndPaste):
(WebCore::Pasteboard::createForGlobalSelection):
(WebCore::Pasteboard::createPrivate):
(WebCore::Pasteboard::createForDragAndDrop):
(WebCore::Pasteboard::create): Deleted.
* platform/ios/PasteboardIOS.mm:
(WebCore::Pasteboard::createForCopyAndPaste):
(WebCore::Pasteboard::createPrivate):
* platform/mac/PasteboardMac.mm:
(WebCore::Pasteboard::createForCopyAndPaste):
(WebCore::Pasteboard::createPrivate):
(WebCore::Pasteboard::createForDragAndDrop):
(WebCore::Pasteboard::create): Deleted.
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::createForCopyAndPaste):
(WebCore::Pasteboard::createPrivate):
(WebCore::Pasteboard::createForDragAndDrop):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDataTransfercpp">trunk/Source/WebCore/dom/DataTransfer.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferh">trunk/Source/WebCore/dom/DataTransfer.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardh">trunk/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflPasteboardEflcpp">trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPasteboardGtkcpp">trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPasteboardMacmm">trunk/Source/WebCore/platform/mac/PasteboardMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPasteboardWincpp">trunk/Source/WebCore/platform/win/PasteboardWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/ChangeLog 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2014-12-03 Joonghun Park <jh718.park@samsung.com>
+
+ Use std::unique_ptr instead of PassOwnPtr|OwnPtr for Pasteboard
+ https://bugs.webkit.org/show_bug.cgi?id=139019
+
+ Reviewed by Darin Adler.
+
+ No new tests, no behavior changes.
+
+ * dom/DataTransfer.cpp:
+ (WebCore::DataTransfer::DataTransfer):
+ * dom/DataTransfer.h:
+ * editing/Editor.cpp:
+ (WebCore::Editor::dispatchCPPEvent):
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::createDraggingDataTransfer):
+ * platform/Pasteboard.h:
+ * platform/efl/PasteboardEfl.cpp:
+ (WebCore::Pasteboard::createForCopyAndPaste):
+ (WebCore::Pasteboard::createPrivate):
+ (WebCore::Pasteboard::createForDragAndDrop):
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::createForCopyAndPaste):
+ (WebCore::Pasteboard::createForGlobalSelection):
+ (WebCore::Pasteboard::createPrivate):
+ (WebCore::Pasteboard::createForDragAndDrop):
+ (WebCore::Pasteboard::create): Deleted.
+ * platform/ios/PasteboardIOS.mm:
+ (WebCore::Pasteboard::createForCopyAndPaste):
+ (WebCore::Pasteboard::createPrivate):
+ * platform/mac/PasteboardMac.mm:
+ (WebCore::Pasteboard::createForCopyAndPaste):
+ (WebCore::Pasteboard::createPrivate):
+ (WebCore::Pasteboard::createForDragAndDrop):
+ (WebCore::Pasteboard::create): Deleted.
+ * platform/win/PasteboardWin.cpp:
+ (WebCore::Pasteboard::createForCopyAndPaste):
+ (WebCore::Pasteboard::createPrivate):
+ (WebCore::Pasteboard::createForDragAndDrop):
+
</ins><span class="cx"> 2014-12-03 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of FrameLoaderClient::dispatchWillRequestResource
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransfercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransfer.cpp (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.cpp 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-DataTransfer::DataTransfer(DataTransferAccessPolicy policy, PassOwnPtr<Pasteboard> pasteboard, Type type, bool forFileDrag)
</del><ins>+DataTransfer::DataTransfer(DataTransferAccessPolicy policy, std::unique_ptr<Pasteboard> pasteboard, Type type, bool forFileDrag)
</ins><span class="cx"> : m_policy(policy)
</span><del>- , m_pasteboard(pasteboard)
</del><ins>+ , m_pasteboard(WTF::move(pasteboard))
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> , m_forDrag(type != CopyAndPaste)
</span><span class="cx"> , m_forFileDrag(forFileDrag)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransfer.h (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.h 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/dom/DataTransfer.h 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -99,14 +99,14 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum Type { CopyAndPaste, DragAndDrop };
</span><del>- DataTransfer(DataTransferAccessPolicy, PassOwnPtr<Pasteboard>, Type = CopyAndPaste, bool forFileDrag = false);
</del><ins>+ DataTransfer(DataTransferAccessPolicy, std::unique_ptr<Pasteboard>, Type = CopyAndPaste, bool forFileDrag = false);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> bool canSetDragImage() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> DataTransferAccessPolicy m_policy;
</span><del>- OwnPtr<Pasteboard> m_pasteboard;
</del><ins>+ std::unique_ptr<Pasteboard> m_pasteboard;
</ins><span class="cx">
</span><span class="cx"> mutable RefPtr<FileList> m_fileList;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -857,7 +857,7 @@
</span><span class="cx"> target->dispatchEvent(event, IGNORE_EXCEPTION);
</span><span class="cx"> bool noDefaultProcessing = event->defaultPrevented();
</span><span class="cx"> if (noDefaultProcessing && policy == DataTransferAccessPolicy::Writable) {
</span><del>- OwnPtr<Pasteboard> pasteboard = Pasteboard::createForCopyAndPaste();
</del><ins>+ auto pasteboard = Pasteboard::createForCopyAndPaste();
</ins><span class="cx"> pasteboard->clear();
</span><span class="cx"> pasteboard->writePasteboard(dataTransfer->pasteboard());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -681,7 +681,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Must be done before ondragstart adds types and data to the pboard,
</span><span class="cx"> // also done for security, as it erases data from the last drag.
</span><del>- OwnPtr<Pasteboard> pasteboard = Pasteboard::create(NSDragPboard);
</del><ins>+ auto pasteboard = std::make_unique<Pasteboard>(NSDragPboard);
</ins><span class="cx"> pasteboard->clear();
</span><span class="cx"> return DataTransfer::createForDragAndDrop();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Pasteboard.h (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Pasteboard.h 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -139,11 +139,23 @@
</span><span class="cx"> class Pasteboard {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Pasteboard); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><ins>+ Pasteboard();
</ins><span class="cx"> ~Pasteboard();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static PassOwnPtr<Pasteboard> createForCopyAndPaste();
- static PassOwnPtr<Pasteboard> createPrivate(); // Temporary pasteboard. Can put data on this and then write to another pasteboard with writePasteboard.
</del><ins>+#if PLATFORM(GTK)
+ explicit Pasteboard(PassRefPtr<DataObjectGtk>);
+ explicit Pasteboard(GtkClipboard*);
+#endif
</ins><span class="cx">
</span><ins>+#if PLATFORM(WIN)
+ explicit Pasteboard(IDataObject*);
+ explicit Pasteboard(WCDataObject*);
+ explicit Pasteboard(const DragDataMap&);
+#endif
+
+ WEBCORE_EXPORT static std::unique_ptr<Pasteboard> createForCopyAndPaste();
+ static std::unique_ptr<Pasteboard> createPrivate(); // Temporary pasteboard. Can put data on this and then write to another pasteboard with writePasteboard.
+
</ins><span class="cx"> bool hasData();
</span><span class="cx"> Vector<String> types();
</span><span class="cx"> String readString(const String& type);
</span><span class="lines">@@ -168,8 +180,8 @@
</span><span class="cx"> void writePasteboard(const Pasteboard& sourcePasteboard);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- static PassOwnPtr<Pasteboard> createForDragAndDrop();
- static PassOwnPtr<Pasteboard> createForDragAndDrop(const DragData&);
</del><ins>+ static std::unique_ptr<Pasteboard> createForDragAndDrop();
+ static std::unique_ptr<Pasteboard> createForDragAndDrop(const DragData&);
</ins><span class="cx">
</span><span class="cx"> void setDragImage(DragImageRef, const IntPoint& hotSpot);
</span><span class="cx"> #endif
</span><span class="lines">@@ -181,10 +193,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- static PassOwnPtr<Pasteboard> create(PassRefPtr<DataObjectGtk>);
- static PassOwnPtr<Pasteboard> create(GtkClipboard*);
</del><span class="cx"> PassRefPtr<DataObjectGtk> dataObject() const;
</span><del>- static PassOwnPtr<Pasteboard> createForGlobalSelection();
</del><ins>+ static std::unique_ptr<Pasteboard> createForGlobalSelection();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -194,7 +204,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> explicit Pasteboard(const String& pasteboardName);
</span><del>- static PassOwnPtr<Pasteboard> create(const String& pasteboardName);
</del><span class="cx">
</span><span class="cx"> const String& name() const { return m_pasteboardName; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -209,18 +218,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Pasteboard();
-
-#if PLATFORM(GTK)
- Pasteboard(PassRefPtr<DataObjectGtk>);
- Pasteboard(GtkClipboard*);
-#endif
-
</del><span class="cx"> #if PLATFORM(WIN)
</span><del>- explicit Pasteboard(IDataObject*);
- explicit Pasteboard(WCDataObject*);
- explicit Pasteboard(const DragDataMap&);
-
</del><span class="cx"> void finishCreatingPasteboard();
</span><span class="cx"> void writeRangeToDataObject(Range&, Frame&); // FIXME: Layering violation.
</span><span class="cx"> void writeURLToDataObject(const URL&, const String&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflPasteboardEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #include "Pasteboard.h"
</span><span class="cx">
</span><span class="cx"> #include "NotImplemented.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -48,25 +47,25 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForCopyAndPaste()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste()
</ins><span class="cx"> {
</span><del>- return adoptPtr(new Pasteboard);
</del><ins>+ return std::make_unique<Pasteboard>();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createPrivate()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createPrivate()
</ins><span class="cx"> {
</span><del>- return createForCopyAndPaste();
</del><ins>+ return std::make_unique<Pasteboard>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop()
</ins><span class="cx"> {
</span><del>- return createForCopyAndPaste();
</del><ins>+ return std::make_unique<Pasteboard>();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData&)
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData&)
</ins><span class="cx"> {
</span><del>- return createForCopyAndPaste();
</del><ins>+ return std::make_unique<Pasteboard>();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "PasteboardHelper.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -39,40 +38,30 @@
</span><span class="cx"> ClipboardDataTypeUnknown
</span><span class="cx"> };
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::create(GtkClipboard* gtkClipboard)
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste()
</ins><span class="cx"> {
</span><del>- return adoptPtr(new Pasteboard(gtkClipboard));
</del><ins>+ return std::make_unique<Pasteboard>(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::create(PassRefPtr<DataObjectGtk> dataObject)
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForGlobalSelection()
</ins><span class="cx"> {
</span><del>- return adoptPtr(new Pasteboard(dataObject));
</del><ins>+ return std::make_unique<Pasteboard>(gtk_clipboard_get(GDK_SELECTION_PRIMARY));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForCopyAndPaste()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createPrivate()
</ins><span class="cx"> {
</span><del>- return create(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
</del><ins>+ return std::make_unique<Pasteboard>(DataObjectGtk::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForGlobalSelection()
-{
- return create(gtk_clipboard_get(GDK_SELECTION_PRIMARY));
-}
-
-PassOwnPtr<Pasteboard> Pasteboard::createPrivate()
-{
- return create(DataObjectGtk::create());
-}
-
</del><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop()
</ins><span class="cx"> {
</span><del>- return create(DataObjectGtk::create());
</del><ins>+ return std::make_unique<Pasteboard>(DataObjectGtk::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
</ins><span class="cx"> {
</span><del>- return create(dragData.platformData());
</del><ins>+ return std::make_unique<Pasteboard>(dragData.platformData());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -121,14 +121,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForCopyAndPaste()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste()
</ins><span class="cx"> {
</span><del>- return adoptPtr(new Pasteboard);
</del><ins>+ return std::make_unique<Pasteboard>();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createPrivate()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createPrivate()
</ins><span class="cx"> {
</span><del>- return adoptPtr(new Pasteboard);
</del><ins>+ return std::make_unique<Pasteboard>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Pasteboard::write(const PasteboardWebContent& content)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -123,30 +123,25 @@
</span><span class="cx"> ASSERT(pasteboardName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::create(const String& pasteboardName)
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste()
</ins><span class="cx"> {
</span><del>- return adoptPtr(new Pasteboard(pasteboardName));
</del><ins>+ return std::make_unique<Pasteboard>(NSGeneralPboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForCopyAndPaste()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createPrivate()
</ins><span class="cx"> {
</span><del>- return create(NSGeneralPboard);
</del><ins>+ return std::make_unique<Pasteboard>(platformStrategies()->pasteboardStrategy()->uniqueName());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createPrivate()
-{
- return create(platformStrategies()->pasteboardStrategy()->uniqueName());
-}
-
</del><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop()
</ins><span class="cx"> {
</span><del>- return create(NSDragPboard);
</del><ins>+ return std::make_unique<Pasteboard>(NSDragPboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
</ins><span class="cx"> {
</span><del>- return create(dragData.pasteboardName());
</del><ins>+ return std::make_unique<Pasteboard>(dragData.pasteboardName());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPasteboardWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (176779 => 176780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-12-04 02:52:51 UTC (rev 176779)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-12-04 03:02:57 UTC (rev 176780)
</span><span class="lines">@@ -90,37 +90,37 @@
</span><span class="cx"> return lresult;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForCopyAndPaste()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste()
</ins><span class="cx"> {
</span><del>- OwnPtr<Pasteboard> pasteboard = adoptPtr(new Pasteboard);
</del><ins>+ auto pasteboard = std::make_unique<Pasteboard>();
</ins><span class="cx"> COMPtr<IDataObject> clipboardData;
</span><span class="cx"> if (!SUCCEEDED(OleGetClipboard(&clipboardData)))
</span><span class="cx"> clipboardData = 0;
</span><span class="cx"> pasteboard->setExternalDataObject(clipboardData.get());
</span><del>- return pasteboard.release();
</del><ins>+ return pasteboard;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createPrivate()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createPrivate()
</ins><span class="cx"> {
</span><span class="cx"> // Windows has no "Private pasteboard" concept.
</span><span class="cx"> return createForCopyAndPaste();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop()
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop()
</ins><span class="cx"> {
</span><span class="cx"> COMPtr<WCDataObject> dataObject;
</span><span class="cx"> WCDataObject::createInstance(&dataObject);
</span><del>- return adoptPtr(new Pasteboard(dataObject.get()));
</del><ins>+ return std::make_unique<Pasteboard>(dataObject.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // static
</span><del>-PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
</del><ins>+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData)
</ins><span class="cx"> {
</span><span class="cx"> if (dragData.platformData())
</span><del>- return adoptPtr(new Pasteboard(dragData.platformData()));
</del><ins>+ return std::make_unique<Pasteboard>(dragData.platformData());
</ins><span class="cx"> // FIXME: Should add a const overload of dragDataMap so we don't need a const_cast here.
</span><del>- return adoptPtr(new Pasteboard(const_cast<DragData&>(dragData).dragDataMap()));
</del><ins>+ return std::make_unique<Pasteboard>(const_cast<DragData&>(dragData).dragDataMap());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>