Changeset 195925 in webkit
- Timestamp:
- Jan 31, 2016 3:41:44 AM (8 years ago)
- Location:
- trunk/Source
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r195919 r195925 1 2016-01-31 Gyuyoung Kim <gyuyoung.kim@webkit.org> 2 3 Use std::make_unique<> when creating an unique_ptr object. 4 https://bugs.webkit.org/show_bug.cgi?id=153705 5 6 Reviewed by Darin Adler. 7 8 Some factory functions have used std::unique_ptr<> for creating an unique_ptr object. 9 It is wrong. We have to use std::make_unique<>. 10 11 * Modules/mediasession/WebMediaSessionManager.cpp: 12 (WebCore::WebMediaSessionManager::mockPicker): 13 * inspector/InspectorTimelineAgent.cpp: 14 (WebCore::InspectorTimelineAgent::internalStart): 15 * platform/cf/RunLoopObserver.cpp: 16 (WebCore::RunLoopObserver::create): Deleted. 17 * platform/cf/RunLoopObserver.h: 18 (WebCore::RunLoopObserver::RunLoopObserver): 19 * platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp: 20 (WebCore::WebMediaSessionManagerMac::platformPicker): 21 * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h: 22 * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm: 23 (WebCore::MediaPlaybackTargetPickerMac::create): Deleted. 24 * platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp: 25 (WebCore::LayerFlushScheduler::LayerFlushScheduler): 26 * platform/mock/MediaPlaybackTargetPickerMock.cpp: 27 (WebCore::MediaPlaybackTargetPickerMock::create): Deleted. 28 * platform/mock/MediaPlaybackTargetPickerMock.h: 29 * rendering/FloatingObjects.cpp: 30 (WebCore::FloatingObject::copyToNewContainer): 31 1 32 2016-01-30 Michael Catanzaro <mcatanzaro@igalia.com> 2 33 -
trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp
r195592 r195925 114 114 { 115 115 if (!m_pickerOverride) 116 m_pickerOverride = MediaPlaybackTargetPickerMock::create(*this);116 m_pickerOverride = std::make_unique<MediaPlaybackTargetPickerMock>(*this); 117 117 118 118 return *m_pickerOverride.get(); -
trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp
r195916 r195925 135 135 136 136 #if PLATFORM(COCOA) 137 m_frameStartObserver = RunLoopObserver::create(0, [this]() {137 m_frameStartObserver = std::make_unique<RunLoopObserver>(0, [this]() { 138 138 if (!m_enabled || m_environment.scriptDebugServer().isPaused()) 139 139 return; … … 144 144 }); 145 145 146 m_frameStopObserver = RunLoopObserver::create(frameStopRunLoopOrder, [this]() {146 m_frameStopObserver = std::make_unique<RunLoopObserver>(frameStopRunLoopOrder, [this]() { 147 147 if (!m_enabled || m_environment.scriptDebugServer().isPaused()) 148 148 return; -
trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp
r181625 r195925 28 28 29 29 namespace WebCore { 30 31 std::unique_ptr<RunLoopObserver> RunLoopObserver::create(CFIndex order, RunLoopObserver::RunLoopObserverCallback callback)32 {33 return std::unique_ptr<RunLoopObserver>(new RunLoopObserver(order, callback));34 }35 30 36 31 RunLoopObserver::~RunLoopObserver() -
trunk/Source/WebCore/platform/cf/RunLoopObserver.h
r181625 r195925 39 39 typedef std::function<void ()> RunLoopObserverCallback; 40 40 41 WEBCORE_EXPORT static std::unique_ptr<RunLoopObserver> create(CFIndex order, RunLoopObserverCallback callback); 41 RunLoopObserver(CFIndex order, RunLoopObserverCallback callback) 42 : m_order(order) 43 , m_callback(callback) 44 { } 42 45 43 46 WEBCORE_EXPORT ~RunLoopObserver(); … … 53 56 54 57 protected: 55 RunLoopObserver(CFIndex order, RunLoopObserverCallback callback)56 : m_order(order)57 , m_callback(callback)58 { }59 60 58 void runLoopObserverFired(); 61 59 -
trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp
r192200 r195925 52 52 { 53 53 if (!m_targetPicker) 54 m_targetPicker = MediaPlaybackTargetPickerMac::create(*this);54 m_targetPicker = std::make_unique<MediaPlaybackTargetPickerMac>(*this); 55 55 56 56 return *m_targetPicker.get(); -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h
r192200 r195925 40 40 WTF_MAKE_NONCOPYABLE(MediaPlaybackTargetPickerMac); 41 41 public: 42 explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&); 43 42 44 virtual ~MediaPlaybackTargetPickerMac(); 43 44 WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMac> create(MediaPlaybackTargetPicker::Client&);45 45 46 46 void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override; … … 50 50 51 51 private: 52 explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&);53 54 52 bool externalOutputDeviceAvailable() override; 55 53 Ref<MediaPlaybackTarget> playbackTarget() override; -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm
r192200 r195925 68 68 namespace WebCore { 69 69 70 std::unique_ptr<MediaPlaybackTargetPickerMac> MediaPlaybackTargetPickerMac::create(MediaPlaybackTargetPicker::Client& client)71 {72 return std::unique_ptr<MediaPlaybackTargetPickerMac>(new MediaPlaybackTargetPickerMac(client));73 }74 75 70 MediaPlaybackTargetPickerMac::MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client& client) 76 71 : MediaPlaybackTargetPicker(client) -
trunk/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp
r185856 r195925 59 59 ASSERT_ARG(client, client); 60 60 61 m_runLoopObserver = RunLoopObserver::create(layerFlushRunLoopOrder, [this]() {61 m_runLoopObserver = std::make_unique<RunLoopObserver>(layerFlushRunLoopOrder, [this]() { 62 62 if (this->isSuspended()) 63 63 return; -
trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp
r194672 r195925 39 39 40 40 static const double timerInterval = 1.0 / 10.0; 41 42 std::unique_ptr<MediaPlaybackTargetPickerMock> MediaPlaybackTargetPickerMock::create(MediaPlaybackTargetPicker::Client& client)43 {44 return std::unique_ptr<MediaPlaybackTargetPickerMock>(new MediaPlaybackTargetPickerMock(client));45 }46 41 47 42 MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client& client) -
trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h
r194672 r195925 38 38 WTF_MAKE_NONCOPYABLE(MediaPlaybackTargetPickerMock); 39 39 public: 40 explicit MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client&); 41 40 42 virtual ~MediaPlaybackTargetPickerMock(); 41 42 WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMock> create(MediaPlaybackTargetPicker::Client&);43 43 44 44 void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override; … … 50 50 51 51 private: 52 explicit MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client&);53 54 52 bool externalOutputDeviceAvailable() override; 55 53 Ref<MediaPlaybackTarget> playbackTarget() override; -
trunk/Source/WebCore/rendering/FloatingObjects.cpp
r194496 r195925 86 86 std::unique_ptr<FloatingObject> FloatingObject::copyToNewContainer(LayoutSize offset, bool shouldPaint, bool isDescendant) const 87 87 { 88 // FIXME: Use make_unique here, once we can get it to compile on all platforms we support. 89 return std::unique_ptr<FloatingObject>(new FloatingObject(renderer(), type(), LayoutRect(frameRect().location() - offset, frameRect().size()), shouldPaint, isDescendant)); 88 return std::make_unique<FloatingObject>(renderer(), type(), LayoutRect(frameRect().location() - offset, frameRect().size()), shouldPaint, isDescendant); 90 89 } 91 90 -
trunk/Source/WebKit2/ChangeLog
r195922 r195925 1 2016-01-31 Gyuyoung Kim <gyuyoung.kim@webkit.org> 2 3 Use std::make_unique<> when creating an unique_ptr object. 4 https://bugs.webkit.org/show_bug.cgi?id=153705 5 6 Reviewed by Darin Adler. 7 8 * UIProcess/WebPageProxy.cpp: 9 (WebKit::WebPageProxy::WebPageProxy): Use std::make_unique<> instead of RunLoopObserver::create(). 10 1 11 2016-01-30 Dan Bernstein <mitz@apple.com> 2 12 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r195755 r195925 486 486 #if PLATFORM(COCOA) 487 487 const CFIndex viewStateChangeRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit - 1; 488 m_viewStateChangeDispatcher = RunLoopObserver::create(viewStateChangeRunLoopOrder, [this] {488 m_viewStateChangeDispatcher = std::make_unique<RunLoopObserver>(viewStateChangeRunLoopOrder, [this] { 489 489 this->dispatchViewStateChange(); 490 490 });
Note: See TracChangeset
for help on using the changeset viewer.