Title: [215297] trunk/Source/WebKit2
Revision
215297
Author
[email protected]
Date
2017-04-12 15:06:23 -0700 (Wed, 12 Apr 2017)

Log Message

[WK2] Do not pass microphone sandbox extension to WebProcess if capturing is happening in UIProcess.
https://bugs.webkit.org/show_bug.cgi?id=170781

Reviewed by Alex Christensen.

Simultaneously, allow clients to configure whether capturing will occur in the UIProcess through
_WKProcessPoolConfiguration.

* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::copy):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/C/WKContextConfigurationRef.cpp:
(WKContextConfigurationShouldCaptureAudioInUIProcess):
(WKContextConfigurationSetShouldCaptureAudioInUIProcess):
* UIProcess/API/C/WKContextConfigurationRef.h:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _shouldCaptureAudioInUIProcess]):
(-[WKWebViewConfiguration _setShouldCaptureAudioInUIProcess:]):
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
(-[_WKProcessPoolConfiguration shouldCaptureAudioInUIProcess]):
(-[_WKProcessPoolConfiguration setShouldCaptureAudioInUIProcess:]):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createNewWebProcess):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (215296 => 215297)


--- trunk/Source/WebKit2/ChangeLog	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/ChangeLog	2017-04-12 22:06:23 UTC (rev 215297)
@@ -1,3 +1,33 @@
+2017-04-12  Jer Noble  <[email protected]>
+
+        [WK2] Do not pass microphone sandbox extension to WebProcess if capturing is happening in UIProcess.
+        https://bugs.webkit.org/show_bug.cgi?id=170781
+
+        Reviewed by Alex Christensen.
+
+        Simultaneously, allow clients to configure whether capturing will occur in the UIProcess through
+        _WKProcessPoolConfiguration.
+
+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
+        (API::ProcessPoolConfiguration::copy):
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        * UIProcess/API/C/WKContextConfigurationRef.cpp:
+        (WKContextConfigurationShouldCaptureAudioInUIProcess):
+        (WKContextConfigurationSetShouldCaptureAudioInUIProcess):
+        * UIProcess/API/C/WKContextConfigurationRef.h:
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration copyWithZone:]):
+        (-[WKWebViewConfiguration _shouldCaptureAudioInUIProcess]):
+        (-[WKWebViewConfiguration _setShouldCaptureAudioInUIProcess:]):
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+        (-[_WKProcessPoolConfiguration shouldCaptureAudioInUIProcess]):
+        (-[_WKProcessPoolConfiguration setShouldCaptureAudioInUIProcess:]):
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::createNewWebProcess):
+
 2017-04-12  Keith Rollin  <[email protected]>
 
         Add some missing NetworkResourceLoader logging

Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (215296 => 215297)


--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp	2017-04-12 22:06:23 UTC (rev 215297)
@@ -117,6 +117,7 @@
     copy->m_sourceApplicationBundleIdentifier = this->m_sourceApplicationBundleIdentifier;
     copy->m_sourceApplicationSecondaryIdentifier = this->m_sourceApplicationSecondaryIdentifier;
     copy->m_alwaysRunsAtBackgroundPriority = this->m_alwaysRunsAtBackgroundPriority;
+    copy->m_shouldCaptureAudioInUIProcess = this->m_shouldCaptureAudioInUIProcess;
 #if PLATFORM(IOS)
     copy->m_ctDataConnectionServiceType = this->m_ctDataConnectionServiceType;
 #endif

Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (215296 => 215297)


--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h	2017-04-12 22:06:23 UTC (rev 215297)
@@ -117,6 +117,9 @@
     bool alwaysRunsAtBackgroundPriority() const { return m_alwaysRunsAtBackgroundPriority; }
     void setAlwaysRunsAtBackgroundPriority(bool alwaysRunsAtBackgroundPriority) { m_alwaysRunsAtBackgroundPriority = alwaysRunsAtBackgroundPriority; }
 
+    bool shouldCaptureAudioInUIProcess() const { return m_shouldCaptureAudioInUIProcess; }
+    void setShouldCaptureAudioInUIProcess(bool shouldCaptureAudioInUIProcess) { m_shouldCaptureAudioInUIProcess = shouldCaptureAudioInUIProcess; }
+
 #if PLATFORM(IOS)
     const WTF::String& ctDataConnectionServiceType() const { return m_ctDataConnectionServiceType; }
     void setCTDataConnectionServiceType(const WTF::String& ctDataConnectionServiceType) { m_ctDataConnectionServiceType = ctDataConnectionServiceType; }
@@ -150,6 +153,7 @@
     WTF::String m_sourceApplicationSecondaryIdentifier;
     bool m_allowsCellularAccess { true };
     bool m_alwaysRunsAtBackgroundPriority { false };
+    bool m_shouldCaptureAudioInUIProcess { false };
 #if PLATFORM(IOS)
     WTF::String m_ctDataConnectionServiceType;
 #endif

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp (215296 => 215297)


--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp	2017-04-12 22:06:23 UTC (rev 215297)
@@ -131,3 +131,13 @@
 {
     toImpl(configuration)->setOverrideLanguages(toImpl(overrideLanguages)->toStringVector());
 }
+
+bool WKContextConfigurationShouldCaptureAudioInUIProcess(WKContextConfigurationRef configuration)
+{
+    return toImpl(configuration)->shouldCaptureAudioInUIProcess();
+}
+
+void WKContextConfigurationSetShouldCaptureAudioInUIProcess(WKContextConfigurationRef configuration, bool should)
+{
+    toImpl(configuration)->setShouldCaptureAudioInUIProcess(should);
+}

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h (215296 => 215297)


--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h	2017-04-12 22:06:23 UTC (rev 215297)
@@ -61,6 +61,9 @@
 WK_EXPORT WKArrayRef WKContextConfigurationCopyOverrideLanguages(WKContextConfigurationRef configuration);
 WK_EXPORT void WKContextConfigurationSetOverrideLanguages(WKContextConfigurationRef configuration, WKArrayRef overrideLanguages);
 
+WK_EXPORT bool WKContextConfigurationShouldCaptureAudioInUIProcess(WKContextConfigurationRef configuration);
+WK_EXPORT void WKContextConfigurationSetShouldCaptureAudioInUIProcess(WKContextConfigurationRef configuration, bool allowed);
+
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (215296 => 215297)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2017-04-12 22:06:23 UTC (rev 215297)
@@ -131,6 +131,7 @@
     BOOL _controlledByAutomation;
 #if ENABLE(MEDIA_STREAM)
     BOOL _mediaStreamEnabled;
+    BOOL _shouldCaptureAudioInUIProcess;
 #endif
 
 #if ENABLE(APPLE_PAY)
@@ -298,6 +299,7 @@
     configuration->_controlledByAutomation = self->_controlledByAutomation;
 #if ENABLE(MEDIA_STREAM)
     configuration->_mediaStreamEnabled = self->_mediaStreamEnabled;
+    configuration->_shouldCaptureAudioInUIProcess = self->_shouldCaptureAudioInUIProcess;
 #endif
 
 #if PLATFORM(IOS)
@@ -742,6 +744,25 @@
 #endif
 }
 
+- (BOOL)_shouldCaptureAudioInUIProcess
+{
+#if ENABLE(MEDIA_STREAM)
+    return _shouldCaptureAudioInUIProcess;
+#else
+    return NO;
+#endif
+}
+
+- (void)_setShouldCaptureAudioInUIProcess:(BOOL)value
+{
+#if ENABLE(MEDIA_STREAM)
+    _shouldCaptureAudioInUIProcess = value;
+#else
+    return NO;
+#endif
+}
+
+
 #if PLATFORM(MAC)
 - (BOOL)_showsURLsInToolTips
 {

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (215296 => 215297)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h	2017-04-12 22:06:23 UTC (rev 215297)
@@ -48,11 +48,13 @@
 @property (nonatomic, nullable, copy) NSString *sourceApplicationBundleIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 @property (nonatomic, nullable, copy) NSString *sourceApplicationSecondaryIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 @property (nonatomic) BOOL allowsCellularAccess WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic) BOOL shouldCaptureAudioInUIProcess WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 #if TARGET_OS_IPHONE
 @property (nonatomic, nullable, copy) NSString *CTDataConnectionServiceType WK_API_AVAILABLE(ios(WK_IOS_TBA));
 @property (nonatomic) BOOL alwaysRunsAtBackgroundPriority WK_API_AVAILABLE(ios(WK_IOS_TBA));
 #endif
 
+
 @end
 
 NS_ASSUME_NONNULL_END

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (215296 => 215297)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm	2017-04-12 22:06:23 UTC (rev 215297)
@@ -181,6 +181,16 @@
     _processPoolConfiguration->setAllowsCellularAccess(allowsCellularAccess);
 }
 
+- (BOOL)shouldCaptureAudioInUIProcess
+{
+    return _processPoolConfiguration->shouldCaptureAudioInUIProcess();
+}
+
+- (void)setShouldCaptureAudioInUIProcess:(BOOL)shouldCaptureAudioInUIProcess
+{
+    _processPoolConfiguration->setShouldCaptureAudioInUIProcess(shouldCaptureAudioInUIProcess);
+}
+
 #if PLATFORM(IOS)
 - (NSString *)CTDataConnectionServiceType
 {

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (215296 => 215297)


--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2017-04-12 22:06:23 UTC (rev 215297)
@@ -256,10 +256,8 @@
         webRTCEnabled = [defaults boolForKey:@"ExperimentalPeerConnectionEnabled"];
     
     // FIXME: Remove this and related parameter when <rdar://problem/29448368> is fixed.
-    if (mediaStreamEnabled || webRTCEnabled)
+    if (!parameters.shouldCaptureAudioInUIProcess && (mediaStreamEnabled || webRTCEnabled))
         SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone", parameters.audioCaptureExtensionHandle);
-
-    parameters.shouldCaptureAudioInUIProcess = m_defaultPageGroup->preferences().shouldCaptureAudioInUIProcess();
 #endif
 }
 

Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (215296 => 215297)


--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2017-04-12 21:59:17 UTC (rev 215296)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2017-04-12 22:06:23 UTC (rev 215297)
@@ -731,6 +731,7 @@
 #endif
 
     parameters.resourceLoadStatisticsEnabled = resourceLoadStatisticsEnabled();
+    parameters.shouldCaptureAudioInUIProcess = m_configuration->shouldCaptureAudioInUIProcess();
 
     // Add any platform specific parameters
     platformInitializeWebProcess(parameters);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to