<!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>[195925] trunk/Source</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/195925">195925</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-31 03:41:44 -0800 (Sun, 31 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use std::make_unique<> when creating an unique_ptr object.
https://bugs.webkit.org/show_bug.cgi?id=153705
Reviewed by Darin Adler.
Source/WebCore:
Some factory functions have used std::unique_ptr<> for creating an unique_ptr object.
It is wrong. We have to use std::make_unique<>.
* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::WebMediaSessionManager::mockPicker):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::internalStart):
* platform/cf/RunLoopObserver.cpp:
(WebCore::RunLoopObserver::create): Deleted.
* platform/cf/RunLoopObserver.h:
(WebCore::RunLoopObserver::RunLoopObserver):
* platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp:
(WebCore::WebMediaSessionManagerMac::platformPicker):
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
(WebCore::MediaPlaybackTargetPickerMac::create): Deleted.
* platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp:
(WebCore::LayerFlushScheduler::LayerFlushScheduler):
* platform/mock/MediaPlaybackTargetPickerMock.cpp:
(WebCore::MediaPlaybackTargetPickerMock::create): Deleted.
* platform/mock/MediaPlaybackTargetPickerMock.h:
* rendering/FloatingObjects.cpp:
(WebCore::FloatingObject::copyToNewContainer):
Source/WebKit2:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy): Use std::make_unique<> instead of RunLoopObserver::create().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcfRunLoopObservercpp">trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcfRunLoopObserverh">trunk/Source/WebCore/platform/cf/RunLoopObserver.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMaccpp">trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMach">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaLayerFlushSchedulerMaccpp">trunk/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMediaPlaybackTargetPickerMockcpp">trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMediaPlaybackTargetPickerMockh">trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingFloatingObjectscpp">trunk/Source/WebCore/rendering/FloatingObjects.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/ChangeLog 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-01-31 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Use std::make_unique<> when creating an unique_ptr object.
+ https://bugs.webkit.org/show_bug.cgi?id=153705
+
+ Reviewed by Darin Adler.
+
+ Some factory functions have used std::unique_ptr<> for creating an unique_ptr object.
+ It is wrong. We have to use std::make_unique<>.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::mockPicker):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::internalStart):
+ * platform/cf/RunLoopObserver.cpp:
+ (WebCore::RunLoopObserver::create): Deleted.
+ * platform/cf/RunLoopObserver.h:
+ (WebCore::RunLoopObserver::RunLoopObserver):
+ * platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp:
+ (WebCore::WebMediaSessionManagerMac::platformPicker):
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::create): Deleted.
+ * platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp:
+ (WebCore::LayerFlushScheduler::LayerFlushScheduler):
+ * platform/mock/MediaPlaybackTargetPickerMock.cpp:
+ (WebCore::MediaPlaybackTargetPickerMock::create): Deleted.
+ * platform/mock/MediaPlaybackTargetPickerMock.h:
+ * rendering/FloatingObjects.cpp:
+ (WebCore::FloatingObject::copyToNewContainer):
+
</ins><span class="cx"> 2016-01-30 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix GTK debug build after r195899
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> MediaPlaybackTargetPickerMock& WebMediaSessionManager::mockPicker()
</span><span class="cx"> {
</span><span class="cx"> if (!m_pickerOverride)
</span><del>- m_pickerOverride = MediaPlaybackTargetPickerMock::create(*this);
</del><ins>+ m_pickerOverride = std::make_unique<MediaPlaybackTargetPickerMock>(*this);
</ins><span class="cx">
</span><span class="cx"> return *m_pickerOverride.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> // FIXME: Abstract away platform-specific code once https://bugs.webkit.org/show_bug.cgi?id=142748 is fixed.
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- m_frameStartObserver = RunLoopObserver::create(0, [this]() {
</del><ins>+ m_frameStartObserver = std::make_unique<RunLoopObserver>(0, [this]() {
</ins><span class="cx"> if (!m_enabled || m_environment.scriptDebugServer().isPaused())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> m_runLoopNestingLevel++;
</span><span class="cx"> });
</span><span class="cx">
</span><del>- m_frameStopObserver = RunLoopObserver::create(frameStopRunLoopOrder, [this]() {
</del><ins>+ m_frameStopObserver = std::make_unique<RunLoopObserver>(frameStopRunLoopOrder, [this]() {
</ins><span class="cx"> if (!m_enabled || m_environment.scriptDebugServer().isPaused())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfRunLoopObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -28,11 +28,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-std::unique_ptr<RunLoopObserver> RunLoopObserver::create(CFIndex order, RunLoopObserver::RunLoopObserverCallback callback)
-{
- return std::unique_ptr<RunLoopObserver>(new RunLoopObserver(order, callback));
-}
-
</del><span class="cx"> RunLoopObserver::~RunLoopObserver()
</span><span class="cx"> {
</span><span class="cx"> invalidate();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfRunLoopObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/RunLoopObserver.h (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/RunLoopObserver.h 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/platform/cf/RunLoopObserver.h 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -38,7 +38,10 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef std::function<void ()> RunLoopObserverCallback;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static std::unique_ptr<RunLoopObserver> create(CFIndex order, RunLoopObserverCallback callback);
</del><ins>+ RunLoopObserver(CFIndex order, RunLoopObserverCallback callback)
+ : m_order(order)
+ , m_callback(callback)
+ { }
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ~RunLoopObserver();
</span><span class="cx">
</span><span class="lines">@@ -52,11 +55,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- RunLoopObserver(CFIndex order, RunLoopObserverCallback callback)
- : m_order(order)
- , m_callback(callback)
- { }
-
</del><span class="cx"> void runLoopObserverFired();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationWebMediaSessionManagerMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> WebCore::MediaPlaybackTargetPicker& WebMediaSessionManagerMac::platformPicker()
</span><span class="cx"> {
</span><span class="cx"> if (!m_targetPicker)
</span><del>- m_targetPicker = MediaPlaybackTargetPickerMac::create(*this);
</del><ins>+ m_targetPicker = std::make_unique<MediaPlaybackTargetPickerMac>(*this);
</ins><span class="cx">
</span><span class="cx"> return *m_targetPicker.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -39,18 +39,16 @@
</span><span class="cx"> class MediaPlaybackTargetPickerMac final : public MediaPlaybackTargetPicker {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(MediaPlaybackTargetPickerMac);
</span><span class="cx"> public:
</span><ins>+ explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&);
+
</ins><span class="cx"> virtual ~MediaPlaybackTargetPickerMac();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMac> create(MediaPlaybackTargetPicker::Client&);
-
</del><span class="cx"> void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
</span><span class="cx"> void startingMonitoringPlaybackTargets() override;
</span><span class="cx"> void stopMonitoringPlaybackTargets() override;
</span><span class="cx"> void invalidatePlaybackTargets() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&);
-
</del><span class="cx"> bool externalOutputDeviceAvailable() override;
</span><span class="cx"> Ref<MediaPlaybackTarget> playbackTarget() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -67,11 +67,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-std::unique_ptr<MediaPlaybackTargetPickerMac> MediaPlaybackTargetPickerMac::create(MediaPlaybackTargetPicker::Client& client)
-{
- return std::unique_ptr<MediaPlaybackTargetPickerMac>(new MediaPlaybackTargetPickerMac(client));
-}
-
</del><span class="cx"> MediaPlaybackTargetPickerMac::MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client& client)
</span><span class="cx"> : MediaPlaybackTargetPicker(client)
</span><span class="cx"> , m_outputDeviceMenuControllerDelegate(adoptNS([[WebAVOutputDeviceMenuControllerHelper alloc] initWithCallback:this]))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaLayerFlushSchedulerMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(client, client);
</span><span class="cx">
</span><del>- m_runLoopObserver = RunLoopObserver::create(layerFlushRunLoopOrder, [this]() {
</del><ins>+ m_runLoopObserver = std::make_unique<RunLoopObserver>(layerFlushRunLoopOrder, [this]() {
</ins><span class="cx"> if (this->isSuspended())
</span><span class="cx"> return;
</span><span class="cx"> this->layerFlushCallback();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMediaPlaybackTargetPickerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -39,11 +39,6 @@
</span><span class="cx">
</span><span class="cx"> static const double timerInterval = 1.0 / 10.0;
</span><span class="cx">
</span><del>-std::unique_ptr<MediaPlaybackTargetPickerMock> MediaPlaybackTargetPickerMock::create(MediaPlaybackTargetPicker::Client& client)
-{
- return std::unique_ptr<MediaPlaybackTargetPickerMock>(new MediaPlaybackTargetPickerMock(client));
-}
-
</del><span class="cx"> MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client& client)
</span><span class="cx"> : MediaPlaybackTargetPicker(client)
</span><span class="cx"> , m_timer(RunLoop::main(), this, &MediaPlaybackTargetPickerMock::timerFired)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMediaPlaybackTargetPickerMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx"> class MediaPlaybackTargetPickerMock final : public MediaPlaybackTargetPicker {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(MediaPlaybackTargetPickerMock);
</span><span class="cx"> public:
</span><ins>+ explicit MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client&);
+
</ins><span class="cx"> virtual ~MediaPlaybackTargetPickerMock();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMock> create(MediaPlaybackTargetPicker::Client&);
-
</del><span class="cx"> void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
</span><span class="cx"> void startingMonitoringPlaybackTargets() override;
</span><span class="cx"> void stopMonitoringPlaybackTargets() override;
</span><span class="lines">@@ -49,8 +49,6 @@
</span><span class="cx"> void setState(const String&, MediaPlaybackTargetContext::State);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client&);
-
</del><span class="cx"> bool externalOutputDeviceAvailable() override;
</span><span class="cx"> Ref<MediaPlaybackTarget> playbackTarget() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFloatingObjectscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FloatingObjects.cpp (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FloatingObjects.cpp 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebCore/rendering/FloatingObjects.cpp 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -85,8 +85,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FloatingObject> FloatingObject::copyToNewContainer(LayoutSize offset, bool shouldPaint, bool isDescendant) const
</span><span class="cx"> {
</span><del>- // FIXME: Use make_unique here, once we can get it to compile on all platforms we support.
- return std::unique_ptr<FloatingObject>(new FloatingObject(renderer(), type(), LayoutRect(frameRect().location() - offset, frameRect().size()), shouldPaint, isDescendant));
</del><ins>+ return std::make_unique<FloatingObject>(renderer(), type(), LayoutRect(frameRect().location() - offset, frameRect().size()), shouldPaint, isDescendant);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FloatingObject> FloatingObject::unsafeClone() const
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-31 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ Use std::make_unique<> when creating an unique_ptr object.
+ https://bugs.webkit.org/show_bug.cgi?id=153705
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy): Use std::make_unique<> instead of RunLoopObserver::create().
+
</ins><span class="cx"> 2016-01-30 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Get rid of many WK_ macros for nullability
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (195924 => 195925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-01-31 09:20:05 UTC (rev 195924)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-01-31 11:41:44 UTC (rev 195925)
</span><span class="lines">@@ -485,7 +485,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> const CFIndex viewStateChangeRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit - 1;
</span><del>- m_viewStateChangeDispatcher = RunLoopObserver::create(viewStateChangeRunLoopOrder, [this] {
</del><ins>+ m_viewStateChangeDispatcher = std::make_unique<RunLoopObserver>(viewStateChangeRunLoopOrder, [this] {
</ins><span class="cx"> this->dispatchViewStateChange();
</span><span class="cx"> });
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>