Diff
Modified: trunk/Source/WebCore/ChangeLog (195924 => 195925)
--- 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)
@@ -1,3 +1,34 @@
+2016-01-31 Gyuyoung Kim <[email protected]>
+
+ 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):
+
2016-01-30 Michael Catanzaro <[email protected]>
Unreviewed, fix GTK debug build after r195899
Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (195924 => 195925)
--- 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)
@@ -113,7 +113,7 @@
MediaPlaybackTargetPickerMock& WebMediaSessionManager::mockPicker()
{
if (!m_pickerOverride)
- m_pickerOverride = MediaPlaybackTargetPickerMock::create(*this);
+ m_pickerOverride = std::make_unique<MediaPlaybackTargetPickerMock>(*this);
return *m_pickerOverride.get();
}
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (195924 => 195925)
--- 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)
@@ -134,7 +134,7 @@
// FIXME: Abstract away platform-specific code once https://bugs.webkit.org/show_bug.cgi?id=142748 is fixed.
#if PLATFORM(COCOA)
- m_frameStartObserver = RunLoopObserver::create(0, [this]() {
+ m_frameStartObserver = std::make_unique<RunLoopObserver>(0, [this]() {
if (!m_enabled || m_environment.scriptDebugServer().isPaused())
return;
@@ -143,7 +143,7 @@
m_runLoopNestingLevel++;
});
- m_frameStopObserver = RunLoopObserver::create(frameStopRunLoopOrder, [this]() {
+ m_frameStopObserver = std::make_unique<RunLoopObserver>(frameStopRunLoopOrder, [this]() {
if (!m_enabled || m_environment.scriptDebugServer().isPaused())
return;
Modified: trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp (195924 => 195925)
--- 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)
@@ -28,11 +28,6 @@
namespace WebCore {
-std::unique_ptr<RunLoopObserver> RunLoopObserver::create(CFIndex order, RunLoopObserver::RunLoopObserverCallback callback)
-{
- return std::unique_ptr<RunLoopObserver>(new RunLoopObserver(order, callback));
-}
-
RunLoopObserver::~RunLoopObserver()
{
invalidate();
Modified: trunk/Source/WebCore/platform/cf/RunLoopObserver.h (195924 => 195925)
--- 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)
@@ -38,7 +38,10 @@
public:
typedef std::function<void ()> RunLoopObserverCallback;
- WEBCORE_EXPORT static std::unique_ptr<RunLoopObserver> create(CFIndex order, RunLoopObserverCallback callback);
+ RunLoopObserver(CFIndex order, RunLoopObserverCallback callback)
+ : m_order(order)
+ , m_callback(callback)
+ { }
WEBCORE_EXPORT ~RunLoopObserver();
@@ -52,11 +55,6 @@
};
protected:
- RunLoopObserver(CFIndex order, RunLoopObserverCallback callback)
- : m_order(order)
- , m_callback(callback)
- { }
-
void runLoopObserverFired();
private:
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp (195924 => 195925)
--- 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)
@@ -51,7 +51,7 @@
WebCore::MediaPlaybackTargetPicker& WebMediaSessionManagerMac::platformPicker()
{
if (!m_targetPicker)
- m_targetPicker = MediaPlaybackTargetPickerMac::create(*this);
+ m_targetPicker = std::make_unique<MediaPlaybackTargetPickerMac>(*this);
return *m_targetPicker.get();
}
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h (195924 => 195925)
--- 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)
@@ -39,18 +39,16 @@
class MediaPlaybackTargetPickerMac final : public MediaPlaybackTargetPicker {
WTF_MAKE_NONCOPYABLE(MediaPlaybackTargetPickerMac);
public:
+ explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&);
+
virtual ~MediaPlaybackTargetPickerMac();
- WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMac> create(MediaPlaybackTargetPicker::Client&);
-
void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
void startingMonitoringPlaybackTargets() override;
void stopMonitoringPlaybackTargets() override;
void invalidatePlaybackTargets() override;
private:
- explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&);
-
bool externalOutputDeviceAvailable() override;
Ref<MediaPlaybackTarget> playbackTarget() override;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (195924 => 195925)
--- 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)
@@ -67,11 +67,6 @@
namespace WebCore {
-std::unique_ptr<MediaPlaybackTargetPickerMac> MediaPlaybackTargetPickerMac::create(MediaPlaybackTargetPicker::Client& client)
-{
- return std::unique_ptr<MediaPlaybackTargetPickerMac>(new MediaPlaybackTargetPickerMac(client));
-}
-
MediaPlaybackTargetPickerMac::MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client& client)
: MediaPlaybackTargetPicker(client)
, m_outputDeviceMenuControllerDelegate(adoptNS([[WebAVOutputDeviceMenuControllerHelper alloc] initWithCallback:this]))
Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp (195924 => 195925)
--- 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)
@@ -58,7 +58,7 @@
{
ASSERT_ARG(client, client);
- m_runLoopObserver = RunLoopObserver::create(layerFlushRunLoopOrder, [this]() {
+ m_runLoopObserver = std::make_unique<RunLoopObserver>(layerFlushRunLoopOrder, [this]() {
if (this->isSuspended())
return;
this->layerFlushCallback();
Modified: trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (195924 => 195925)
--- 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)
@@ -39,11 +39,6 @@
static const double timerInterval = 1.0 / 10.0;
-std::unique_ptr<MediaPlaybackTargetPickerMock> MediaPlaybackTargetPickerMock::create(MediaPlaybackTargetPicker::Client& client)
-{
- return std::unique_ptr<MediaPlaybackTargetPickerMock>(new MediaPlaybackTargetPickerMock(client));
-}
-
MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client& client)
: MediaPlaybackTargetPicker(client)
, m_timer(RunLoop::main(), this, &MediaPlaybackTargetPickerMock::timerFired)
Modified: trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h (195924 => 195925)
--- 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)
@@ -37,10 +37,10 @@
class MediaPlaybackTargetPickerMock final : public MediaPlaybackTargetPicker {
WTF_MAKE_NONCOPYABLE(MediaPlaybackTargetPickerMock);
public:
+ explicit MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client&);
+
virtual ~MediaPlaybackTargetPickerMock();
- WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMock> create(MediaPlaybackTargetPicker::Client&);
-
void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
void startingMonitoringPlaybackTargets() override;
void stopMonitoringPlaybackTargets() override;
@@ -49,8 +49,6 @@
void setState(const String&, MediaPlaybackTargetContext::State);
private:
- explicit MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client&);
-
bool externalOutputDeviceAvailable() override;
Ref<MediaPlaybackTarget> playbackTarget() override;
Modified: trunk/Source/WebCore/rendering/FloatingObjects.cpp (195924 => 195925)
--- 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)
@@ -85,8 +85,7 @@
std::unique_ptr<FloatingObject> FloatingObject::copyToNewContainer(LayoutSize offset, bool shouldPaint, bool isDescendant) const
{
- // 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));
+ return std::make_unique<FloatingObject>(renderer(), type(), LayoutRect(frameRect().location() - offset, frameRect().size()), shouldPaint, isDescendant);
}
std::unique_ptr<FloatingObject> FloatingObject::unsafeClone() const
Modified: trunk/Source/WebKit2/ChangeLog (195924 => 195925)
--- 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)
@@ -1,3 +1,13 @@
+2016-01-31 Gyuyoung Kim <[email protected]>
+
+ 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().
+
2016-01-30 Dan Bernstein <[email protected]>
[Cocoa] Get rid of many WK_ macros for nullability
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (195924 => 195925)
--- 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)
@@ -485,7 +485,7 @@
#if PLATFORM(COCOA)
const CFIndex viewStateChangeRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit - 1;
- m_viewStateChangeDispatcher = RunLoopObserver::create(viewStateChangeRunLoopOrder, [this] {
+ m_viewStateChangeDispatcher = std::make_unique<RunLoopObserver>(viewStateChangeRunLoopOrder, [this] {
this->dispatchViewStateChange();
});
#endif
