Changeset 248958 in webkit
- Timestamp:
- Aug 21, 2019 12:50:58 PM (5 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r248957 r248958 1 2019-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 1 22 2019-08-21 Chris Dumez <cdumez@apple.com> 2 23 -
trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
r248846 r248958 56 56 57 57 MediaPlayerPrivateAVFoundation::MediaPlayerPrivateAVFoundation(MediaPlayer* player) 58 : m_weakThis(makeWeakPtr(*this)) 59 , m_player(player) 58 : m_player(player) 60 59 , m_queuedNotifications() 61 60 , m_queueMutex() … … 776 775 m_mainThreadCallPending = true; 777 776 778 callOnMainThread([weakThis = m _weakThis] {777 callOnMainThread([weakThis = makeWeakPtr(*this)] { 779 778 if (!weakThis) 780 779 return; … … 809 808 810 809 if (!m_queuedNotifications.isEmpty() && !m_mainThreadCallPending) { 811 callOnMainThread([weakThis = m _weakThis] {810 callOnMainThread([weakThis = makeWeakPtr(*this)] { 812 811 if (!weakThis) 813 812 return; -
trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h
r247415 r248958 47 47 class GenericCueData; 48 48 49 class MediaPlayerPrivateAVFoundation : public CanMakeWeakPtr<MediaPlayerPrivateAVFoundation>, public MediaPlayerPrivateInterface, public AVFInbandTrackParent 49 // Use eager initialization for the WeakPtrFactory since we call makeWeakPtr() from another thread. 50 class MediaPlayerPrivateAVFoundation : public CanMakeWeakPtr<MediaPlayerPrivateAVFoundation, WeakPtrFactoryInitialization::Eager>, public MediaPlayerPrivateInterface, public AVFInbandTrackParent 50 51 #if !RELEASE_LOG_DISABLED 51 52 , private LoggerHelper … … 328 329 329 330 private: 330 WeakPtr<MediaPlayerPrivateAVFoundation> m_weakThis;331 331 MediaPlayer* m_player; 332 332 -
trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCDTMFSenderBackend.cpp
r248282 r248958 40 40 LibWebRTCDTMFSenderBackend::LibWebRTCDTMFSenderBackend(rtc::scoped_refptr<webrtc::DtmfSenderInterface>&& sender) 41 41 : m_sender(WTFMove(sender)) 42 , m_weakThis(makeWeakPtr(this))43 42 { 44 43 m_sender->RegisterObserver(this); … … 81 80 if (!tone.empty()) 82 81 return; 83 callOnMainThread([this, weakThis = m _weakThis, tone = toWTFString(tone)] {82 callOnMainThread([this, weakThis = makeWeakPtr(*this), tone = toWTFString(tone)] { 84 83 if (!weakThis) 85 84 return; -
trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCDTMFSenderBackend.h
r248762 r248958 40 40 namespace WebCore { 41 41 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. 43 class LibWebRTCDTMFSenderBackend final : public RTCDTMFSenderBackend, private webrtc::DtmfSenderObserverInterface, public CanMakeWeakPtr<LibWebRTCDTMFSenderBackend, WeakPtrFactoryInitialization::Eager> { 43 44 WTF_MAKE_FAST_ALLOCATED; 44 45 public: … … 60 61 rtc::scoped_refptr<webrtc::DtmfSenderInterface> m_sender; 61 62 Function<void(const String&)> m_onTonePlayed; 62 WeakPtr<LibWebRTCDTMFSenderBackend> m_weakThis;63 63 }; 64 64 -
trunk/Source/WebCore/platform/network/cocoa/CookieStorageObserver.h
r248902 r248958 36 36 namespace WebCore { 37 37 38 class WEBCORE_EXPORT CookieStorageObserver : public CanMakeWeakPtr<CookieStorageObserver> { 38 // Use eager initialization for the WeakPtrFactory since we call makeWeakPtr() from a non-main thread. 39 class WEBCORE_EXPORT CookieStorageObserver : public CanMakeWeakPtr<CookieStorageObserver, WeakPtrFactoryInitialization::Eager> { 39 40 WTF_MAKE_FAST_ALLOCATED; 40 41 WTF_MAKE_NONCOPYABLE(CookieStorageObserver); … … 49 50 50 51 private: 51 52 WeakPtr<CookieStorageObserver> m_weakThis;53 52 RetainPtr<NSHTTPCookieStorage> m_cookieStorage; 54 53 bool m_hasRegisteredInternalsForNotifications { false }; -
trunk/Source/WebCore/platform/network/cocoa/CookieStorageObserver.mm
r248902 r248958 76 76 77 77 CookieStorageObserver::CookieStorageObserver(NSHTTPCookieStorage *cookieStorage) 78 : m_weakThis(makeWeakPtr(*this)) 79 , m_cookieStorage(cookieStorage) 78 : m_cookieStorage(cookieStorage) 80 79 { 81 80 ASSERT(isMainThread()); … … 131 130 void CookieStorageObserver::cookiesDidChange() 132 131 { 133 callOnMainThread([weakThis = m _weakThis] {132 callOnMainThread([weakThis = makeWeakPtr(*this)] { 134 133 if (weakThis && weakThis->m_cookieChangeCallback) 135 134 weakThis->m_cookieChangeCallback();
Note: See TracChangeset
for help on using the changeset viewer.