Changeset 195925 in webkit


Ignore:
Timestamp:
Jan 31, 2016 3:41:44 AM (8 years ago)
Author:
Gyuyoung Kim
Message:

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().

Location:
trunk/Source
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r195919 r195925  
     12016-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
    1322016-01-30  Michael Catanzaro  <mcatanzaro@igalia.com>
    233

  • trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp

    r195592 r195925  
    114114{
    115115    if (!m_pickerOverride)
    116         m_pickerOverride = MediaPlaybackTargetPickerMock::create(*this);
     116        m_pickerOverride = std::make_unique<MediaPlaybackTargetPickerMock>(*this);
    117117
    118118    return *m_pickerOverride.get();

  • trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

    r195916 r195925  
    135135
    136136#if PLATFORM(COCOA)
    137     m_frameStartObserver = RunLoopObserver::create(0, [this]() {
     137    m_frameStartObserver = std::make_unique<RunLoopObserver>(0, [this]() {
    138138        if (!m_enabled || m_environment.scriptDebugServer().isPaused())
    139139            return;
    … …  
    144144    });
    145145
    146     m_frameStopObserver = RunLoopObserver::create(frameStopRunLoopOrder, [this]() {
     146    m_frameStopObserver = std::make_unique<RunLoopObserver>(frameStopRunLoopOrder, [this]() {
    147147        if (!m_enabled || m_environment.scriptDebugServer().isPaused())
    148148            return;

  • trunk/Source/WebCore/platform/cf/RunLoopObserver.cpp

    r181625 r195925  
    2828
    2929namespace 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 }
    3530
    3631RunLoopObserver::~RunLoopObserver()

  • trunk/Source/WebCore/platform/cf/RunLoopObserver.h

    r181625 r195925  
    3939    typedef std::function<void ()> RunLoopObserverCallback;
    4040
    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    { }
    4245
    4346    WEBCORE_EXPORT ~RunLoopObserver();
    … …  
    5356
    5457protected:
    55     RunLoopObserver(CFIndex order, RunLoopObserverCallback callback)
    56         : m_order(order)
    57         , m_callback(callback)
    58     { }
    59 
    6058    void runLoopObserverFired();
    6159

  • trunk/Source/WebCore/platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp

    r192200 r195925  
    5252{
    5353    if (!m_targetPicker)
    54         m_targetPicker = MediaPlaybackTargetPickerMac::create(*this);
     54        m_targetPicker = std::make_unique<MediaPlaybackTargetPickerMac>(*this);
    5555
    5656    return *m_targetPicker.get();

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h

    r192200 r195925  
    4040    WTF_MAKE_NONCOPYABLE(MediaPlaybackTargetPickerMac);
    4141public:
     42    explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&);
     43
    4244    virtual ~MediaPlaybackTargetPickerMac();
    43 
    44     WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMac> create(MediaPlaybackTargetPicker::Client&);
    4545
    4646    void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
    … …  
    5050
    5151private:
    52     explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&);
    53 
    5452    bool externalOutputDeviceAvailable() override;
    5553    Ref<MediaPlaybackTarget> playbackTarget() override;

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm

    r192200 r195925  
    6868namespace WebCore {
    6969
    70 std::unique_ptr<MediaPlaybackTargetPickerMac> MediaPlaybackTargetPickerMac::create(MediaPlaybackTargetPicker::Client& client)
    71 {
    72     return std::unique_ptr<MediaPlaybackTargetPickerMac>(new MediaPlaybackTargetPickerMac(client));
    73 }
    74 
    7570MediaPlaybackTargetPickerMac::MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client& client)
    7671    : MediaPlaybackTargetPicker(client)

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp

    r185856 r195925  
    5959    ASSERT_ARG(client, client);
    6060
    61     m_runLoopObserver = RunLoopObserver::create(layerFlushRunLoopOrder, [this]() {
     61    m_runLoopObserver = std::make_unique<RunLoopObserver>(layerFlushRunLoopOrder, [this]() {
    6262        if (this->isSuspended())
    6363            return;

  • trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp

    r194672 r195925  
    3939
    4040static 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 }
    4641
    4742MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client& client)

  • trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h

    r194672 r195925  
    3838    WTF_MAKE_NONCOPYABLE(MediaPlaybackTargetPickerMock);
    3939public:
     40    explicit MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client&);
     41
    4042    virtual ~MediaPlaybackTargetPickerMock();
    41 
    42     WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMock> create(MediaPlaybackTargetPicker::Client&);
    4343
    4444    void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
    … …  
    5050
    5151private:
    52     explicit MediaPlaybackTargetPickerMock(MediaPlaybackTargetPicker::Client&);
    53 
    5452    bool externalOutputDeviceAvailable() override;
    5553    Ref<MediaPlaybackTarget> playbackTarget() override;

  • trunk/Source/WebCore/rendering/FloatingObjects.cpp

    r194496 r195925  
    8686std::unique_ptr<FloatingObject> FloatingObject::copyToNewContainer(LayoutSize offset, bool shouldPaint, bool isDescendant) const
    8787{
    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);
    9089}
    9190

  • trunk/Source/WebKit2/ChangeLog

    r195922 r195925  
     12016-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
    1112016-01-30  Dan Bernstein  <mitz@apple.com>
    212

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r195755 r195925  
    486486#if PLATFORM(COCOA)
    487487    const CFIndex viewStateChangeRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit - 1;
    488     m_viewStateChangeDispatcher = RunLoopObserver::create(viewStateChangeRunLoopOrder, [this] {
     488    m_viewStateChangeDispatcher = std::make_unique<RunLoopObserver>(viewStateChangeRunLoopOrder, [this] {
    489489        this->dispatchViewStateChange();
    490490    });
Note: See TracChangeset for help on using the changeset viewer.