Title: [239083] branches/safari-606-branch/Source/WebCore
- Revision
- 239083
- Author
- [email protected]
- Date
- 2018-12-11 13:12:04 -0800 (Tue, 11 Dec 2018)
Log Message
Cherry-pick r238232. rdar://problem/46085281
Modernize RTCPeerConnection handling of pendingActivity
https://bugs.webkit.org/show_bug.cgi?id=191661
Reviewed by Eric Carlson.
makePendingActivity is the modern way to handle set/unset of pending activity.
No change of behavior.
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::create):
(WebCore::RTCPeerConnection::doStop):
* Modules/mediastream/RTCPeerConnection.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238232 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (239082 => 239083)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-12-11 21:12:01 UTC (rev 239082)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-12-11 21:12:04 UTC (rev 239083)
@@ -1,3 +1,37 @@
+2018-12-11 Alan Coon <[email protected]>
+
+ Cherry-pick r238232. rdar://problem/46085281
+
+ Modernize RTCPeerConnection handling of pendingActivity
+ https://bugs.webkit.org/show_bug.cgi?id=191661
+
+ Reviewed by Eric Carlson.
+
+ makePendingActivity is the modern way to handle set/unset of pending activity.
+ No change of behavior.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::create):
+ (WebCore::RTCPeerConnection::doStop):
+ * Modules/mediastream/RTCPeerConnection.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238232 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-15 Youenn Fablet <[email protected]>
+
+ Modernize RTCPeerConnection handling of pendingActivity
+ https://bugs.webkit.org/show_bug.cgi?id=191661
+
+ Reviewed by Eric Carlson.
+
+ makePendingActivity is the modern way to handle set/unset of pending activity.
+ No change of behavior.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::create):
+ (WebCore::RTCPeerConnection::doStop):
+ * Modules/mediastream/RTCPeerConnection.h:
+
2018-12-10 Mark Lam <[email protected]>
Cherry-pick r239062. rdar://problem/46603464
Modified: branches/safari-606-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (239082 => 239083)
--- branches/safari-606-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2018-12-11 21:12:01 UTC (rev 239082)
+++ branches/safari-606-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2018-12-11 21:12:04 UTC (rev 239083)
@@ -68,7 +68,7 @@
// RTCPeerConnection may send events at about any time during its lifetime.
// Let's make it uncollectable until the pc is closed by JS or the page stops it.
if (!peerConnection->isClosed()) {
- peerConnection->setPendingActivity(peerConnection.ptr());
+ peerConnection->m_pendingActivity = peerConnection->makePendingActivity(peerConnection.get());
if (auto* page = downcast<Document>(context).page())
peerConnection->registerToController(page->rtcController());
}
@@ -451,8 +451,7 @@
m_isStopped = true;
m_backend->stop();
-
- unsetPendingActivity(this);
+ m_pendingActivity = nullptr;
}
void RTCPeerConnection::registerToController(RTCController& controller)
Modified: branches/safari-606-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (239082 => 239083)
--- branches/safari-606-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2018-12-11 21:12:01 UTC (rev 239082)
+++ branches/safari-606-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2018-12-11 21:12:04 UTC (rev 239083)
@@ -215,6 +215,8 @@
RTCConfiguration m_configuration;
RTCController* m_controller { nullptr };
+ Vector<RefPtr<RTCCertificate>> m_certificates;
+ RefPtr<PendingActivity<RTCPeerConnection>> m_pendingActivity;
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
