Changeset 248958 in webkit


Ignore:
Timestamp:
Aug 21, 2019 12:50:58 PM (5 years ago)
Author:
Chris Dumez
Message:

Get rid of m_weakThis data members now that we have a safe way to call makeWeakPtr() from various threads
https://bugs.webkit.org/show_bug.cgi?id=200981

Reviewed by Alex Christensen.

  • platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:

(WebCore::MediaPlayerPrivateAVFoundation::MediaPlayerPrivateAVFoundation):
(WebCore::MediaPlayerPrivateAVFoundation::scheduleMainThreadNotification):
(WebCore::MediaPlayerPrivateAVFoundation::dispatchNotification):

  • platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
  • platform/mediastream/libwebrtc/LibWebRTCDTMFSenderBackend.cpp:

(WebCore::LibWebRTCDTMFSenderBackend::LibWebRTCDTMFSenderBackend):
(WebCore::LibWebRTCDTMFSenderBackend::OnToneChange):

  • platform/mediastream/libwebrtc/LibWebRTCDTMFSenderBackend.h:
  • platform/network/cocoa/CookieStorageObserver.h:
  • platform/network/cocoa/CookieStorageObserver.mm:

(WebCore::CookieStorageObserver::CookieStorageObserver):
(WebCore::CookieStorageObserver::cookiesDidChange):

Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r248957 r248958  
     12019-08-21  Chris Dumez  <cdumez@apple.com>
     2
     3        Get rid of m_weakThis data members now that we have a safe way to call makeWeakPtr() from various threads
     4        https://bugs.webkit.org/show_bug.cgi?id=200981
     5
     6        Reviewed by Alex Christensen.
     7
     8        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
     9        (WebCore::MediaPlayerPrivateAVFoundation::MediaPlayerPrivateAVFoundation):
     10        (WebCore::MediaPlayerPrivateAVFoundation::scheduleMainThreadNotification):
     11        (WebCore::MediaPlayerPrivateAVFoundation::dispatchNotification):
     12        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
     13        * platform/mediastream/libwebrtc/LibWebRTCDTMFSenderBackend.cpp:
     14        (WebCore::LibWebRTCDTMFSenderBackend::LibWebRTCDTMFSenderBackend):
     15        (WebCore::LibWebRTCDTMFSenderBackend::OnToneChange):
     16        * platform/mediastream/libwebrtc/LibWebRTCDTMFSenderBackend.h:
     17        * platform/network/cocoa/CookieStorageObserver.h:
     18        * platform/network/cocoa/CookieStorageObserver.mm:
     19        (WebCore::CookieStorageObserver::CookieStorageObserver):
     20        (WebCore::CookieStorageObserver::cookiesDidChange):
     21
    1222019-08-21  Chris Dumez  <cdumez@apple.com>
    223
  • trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

    r248846 r248958  
    5656
    5757MediaPlayerPrivateAVFoundation::MediaPlayerPrivateAVFoundation(MediaPlayer* player)
    58     : m_weakThis(makeWeakPtr(*this))
    59     , m_player(player)
     58    : m_player(player)
    6059    , m_queuedNotifications()
    6160    , m_queueMutex()
     
    776775        m_mainThreadCallPending = true;
    777776
    778         callOnMainThread([weakThis = m_weakThis] {
     777        callOnMainThread([weakThis = makeWeakPtr(*this)] {
    779778            if (!weakThis)
    780779                return;
     
    809808       
    810809        if (!m_queuedNotifications.isEmpty() && !m_mainThreadCallPending) {
    811             callOnMainThread([weakThis = m_weakThis] {
     810            callOnMainThread([weakThis = makeWeakPtr(*this)] {
    812811                if (!weakThis)
    813812                    return;
  • trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h

    r247415 r248958  
    4747class GenericCueData;
    4848
    49 class MediaPlayerPrivateAVFoundation : public CanMakeWeakPtr<MediaPlayerPrivateAVFoundation>, public MediaPlayerPrivateInterface, public AVFInbandTrackParent
     49// Use eager initialization for the WeakPtrFactory since we call makeWeakPtr() from another thread.
     50class MediaPlayerPrivateAVFoundation : public CanMakeWeakPtr<MediaPlayerPrivateAVFoundation, WeakPtrFactoryInitialization::Eager>, public MediaPlayerPrivateInterface, public AVFInbandTrackParent
    5051#if !RELEASE_LOG_DISABLED
    5152    , private LoggerHelper
     
    328329
    329330private:
    330     WeakPtr<MediaPlayerPrivateAVFoundation> m_weakThis;
    331331    MediaPlayer* m_player;
    332332
  • trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCDTMFSenderBackend.cpp

    r248282 r248958  
    4040LibWebRTCDTMFSenderBackend::LibWebRTCDTMFSenderBackend(rtc::scoped_refptr<webrtc::DtmfSenderInterface>&& sender)
    4141    : m_sender(WTFMove(sender))
    42     , m_weakThis(makeWeakPtr(this))
    4342{
    4443    m_sender->RegisterObserver(this);
     
    8180    if (!tone.empty())
    8281        return;
    83     callOnMainThread([this, weakThis = m_weakThis, tone = toWTFString(tone)] {
     82    callOnMainThread([this, weakThis = makeWeakPtr(*this), tone = toWTFString(tone)] {
    8483        if (!weakThis)
    8584            return;
  • trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCDTMFSenderBackend.h

    r248762 r248958  
    4040namespace WebCore {
    4141
    42 class LibWebRTCDTMFSenderBackend final : public RTCDTMFSenderBackend, private webrtc::DtmfSenderObserverInterface, public CanMakeWeakPtr<LibWebRTCDTMFSenderBackend> {
     42// Use eager initialization for the WeakPtrFactory since we call makeWeakPtr() from another thread.
     43class LibWebRTCDTMFSenderBackend final : public RTCDTMFSenderBackend, private webrtc::DtmfSenderObserverInterface, public CanMakeWeakPtr<LibWebRTCDTMFSenderBackend, WeakPtrFactoryInitialization::Eager> {
    4344    WTF_MAKE_FAST_ALLOCATED;
    4445public:
     
    6061    rtc::scoped_refptr<webrtc::DtmfSenderInterface> m_sender;
    6162    Function<void(const String&)> m_onTonePlayed;
    62     WeakPtr<LibWebRTCDTMFSenderBackend> m_weakThis;
    6363};
    6464
  • trunk/Source/WebCore/platform/network/cocoa/CookieStorageObserver.h

    r248902 r248958  
    3636namespace WebCore {
    3737
    38 class WEBCORE_EXPORT CookieStorageObserver : public CanMakeWeakPtr<CookieStorageObserver> {
     38// Use eager initialization for the WeakPtrFactory since we call makeWeakPtr() from a non-main thread.
     39class WEBCORE_EXPORT CookieStorageObserver : public CanMakeWeakPtr<CookieStorageObserver, WeakPtrFactoryInitialization::Eager> {
    3940    WTF_MAKE_FAST_ALLOCATED;
    4041    WTF_MAKE_NONCOPYABLE(CookieStorageObserver);
     
    4950
    5051private:
    51 
    52     WeakPtr<CookieStorageObserver> m_weakThis;
    5352    RetainPtr<NSHTTPCookieStorage> m_cookieStorage;
    5453    bool m_hasRegisteredInternalsForNotifications { false };
  • trunk/Source/WebCore/platform/network/cocoa/CookieStorageObserver.mm

    r248902 r248958  
    7676
    7777CookieStorageObserver::CookieStorageObserver(NSHTTPCookieStorage *cookieStorage)
    78     : m_weakThis(makeWeakPtr(*this))
    79     , m_cookieStorage(cookieStorage)
     78    : m_cookieStorage(cookieStorage)
    8079{
    8180    ASSERT(isMainThread());
     
    131130void CookieStorageObserver::cookiesDidChange()
    132131{
    133     callOnMainThread([weakThis = m_weakThis] {
     132    callOnMainThread([weakThis = makeWeakPtr(*this)] {
    134133        if (weakThis && weakThis->m_cookieChangeCallback)
    135134            weakThis->m_cookieChangeCallback();
Note: See TracChangeset for help on using the changeset viewer.