Title: [254864] branches/safari-609-branch/Source/WebKit
- Revision
- 254864
- Author
- [email protected]
- Date
- 2020-01-21 11:16:53 -0800 (Tue, 21 Jan 2020)
Log Message
Cherry-pick r254125. rdar://problem/58353217
Fix non GPUProcess build issue in UserMediaCaptureManager
https://bugs.webkit.org/show_bug.cgi?id=205851
Reviewed by Eric Carlson.
Build fix, no change of behavior.
* WebProcess/cocoa/UserMediaCaptureManager.cpp:
(WebKit::UserMediaCaptureManager::Source::connection):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254125 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (254863 => 254864)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-21 18:58:36 UTC (rev 254863)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-21 19:16:53 UTC (rev 254864)
@@ -1,3 +1,32 @@
+2020-01-21 Alan Coon <[email protected]>
+
+ Cherry-pick r254125. rdar://problem/58353217
+
+ Fix non GPUProcess build issue in UserMediaCaptureManager
+ https://bugs.webkit.org/show_bug.cgi?id=205851
+
+ Reviewed by Eric Carlson.
+
+ Build fix, no change of behavior.
+
+ * WebProcess/cocoa/UserMediaCaptureManager.cpp:
+ (WebKit::UserMediaCaptureManager::Source::connection):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254125 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-07 youenn fablet <[email protected]>
+
+ Fix non GPUProcess build issue in UserMediaCaptureManager
+ https://bugs.webkit.org/show_bug.cgi?id=205851
+
+ Reviewed by Eric Carlson.
+
+ Build fix, no change of behavior.
+
+ * WebProcess/cocoa/UserMediaCaptureManager.cpp:
+ (WebKit::UserMediaCaptureManager::Source::connection):
+
2020-01-17 Alan Coon <[email protected]>
Cherry-pick r254433. rdar://problem/58686757
Modified: branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp (254863 => 254864)
--- branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp 2020-01-21 18:58:36 UTC (rev 254863)
+++ branches/safari-609-branch/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp 2020-01-21 19:16:53 UTC (rev 254864)
@@ -379,10 +379,10 @@
IPC::Connection* UserMediaCaptureManager::Source::connection()
{
#if ENABLE(GPU_PROCESS)
- return m_shouldCaptureInGPUProcess ? &WebProcess::singleton().ensureGPUProcessConnection().connection() : WebProcess::singleton().parentProcessConnection();
-#else
- return m_process.parentProcessConnection();
+ if (m_shouldCaptureInGPUProcess)
+ return &m_manager.m_process.ensureGPUProcessConnection().connection();
#endif
+ return m_manager.m_process.parentProcessConnection();
}
void UserMediaCaptureManager::Source::startProducingData()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
