Changeset 223827 in webkit

Timestamp:

Oct 22, 2017 7:20:19 PM (6 years ago)

Author:

Wenson Hsieh

Message:

[iOS] WebProcess::initializeWebProcess spends ~150ms spinning up AVSystemController on some devices
​https://bugs.webkit.org/show_bug.cgi?id=178640
<rdar://problem/35113105>

Reviewed by Youenn Fablet.

In r213933, we added a mechanism to allow the web process to drive media capture, by setting an attribute on the
shared AVSystemController. This requires us to fault in the Celestial framework, which is a slight performance
hit on some hardware. Instead of doing this at the start of every web process launch, we can just do this work
lazily, the first time the web process requests permissions for user media access.

• WebProcess/WebCoreSupport/WebUserMediaClient.cpp:

(WebKit::WebUserMediaClient::requestUserMediaAccess):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::prepareToSendUserMediaPermissionRequest):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::prepareToSendUserMediaPermissionRequest):

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebUserMediaClient.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (3 diffs)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-22  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] WebProcess::initializeWebProcess spends ~150ms spinning up AVSystemController on some devices
+        https://bugs.webkit.org/show_bug.cgi?id=178640
+        <rdar://problem/35113105>
+
+        Reviewed by Youenn Fablet.
+
+        In r213933, we added a mechanism to allow the web process to drive media capture, by setting an attribute on the
+        shared AVSystemController. This requires us to fault in the Celestial framework, which is a slight performance
+        hit on some hardware. Instead of doing this at the start of every web process launch, we can just do this work
+        lazily, the first time the web process requests permissions for user media access.
+
+        * WebProcess/WebCoreSupport/WebUserMediaClient.cpp:
+        (WebKit::WebUserMediaClient::requestUserMediaAccess):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::prepareToSendUserMediaPermissionRequest):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::prepareToSendUserMediaPermissionRequest):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2017-10-21  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebUserMediaClient.cpp

@@ -44 +44 @@
 void WebUserMediaClient::requestUserMediaAccess(UserMediaRequest& request)
 {
+    m_page.prepareToSendUserMediaPermissionRequest();
     m_page.userMediaPermissionRequestManager().startUserMediaRequest(request);
 }

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -3899 +3899 @@
 
 #if ENABLE(MEDIA_STREAM)
+
+#if !PLATFORM(IOS)
+void WebPage::prepareToSendUserMediaPermissionRequest()
+{
+}
+#endif
+
 void WebPage::userMediaAccessWasGranted(uint64_t userMediaID, String&& audioDeviceUID, String&& videoDeviceUID, String&& mediaDeviceIdentifierHashSalt)
 {

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -512 +512 @@
 #if ENABLE(MEDIA_STREAM)
     UserMediaPermissionRequestManager& userMediaPermissionRequestManager() { return *m_userMediaPermissionRequestManager; }
+    void prepareToSendUserMediaPermissionRequest();
 #endif
 

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -100 +100 @@
 #import <WebCore/RenderThemeIOS.h>
 #import <WebCore/RenderView.h>
+#import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/Settings.h>
 #import <WebCore/SharedBuffer.h>
@@ -111 +112 @@
 #import <wtf/MemoryPressureHandler.h>
 #import <wtf/SetForScope.h>
+#import <wtf/SoftLinking.h>
 #import <wtf/text/TextStream.h>
+
+#if ENABLE(MEDIA_STREAM)
+#import "CelestialSPI.h"
+SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Celestial)
+SOFT_LINK_CLASS_OPTIONAL(Celestial, AVSystemController)
+SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_PIDToInheritApplicationStateFrom, NSString *)
+#endif
 
 using namespace WebCore;
@@ -3412 +3421 @@
 #endif
 
+#if ENABLE(MEDIA_STREAM)
+void WebPage::prepareToSendUserMediaPermissionRequest()
+{
+    static std::once_flag once;
+    std::call_once(once, [] {
+        if (!canLoadAVSystemController_PIDToInheritApplicationStateFrom())
+            return;
+
+        NSError *error = nil;
+        [[getAVSystemControllerClass() sharedAVSystemController] setAttribute:@(WebCore::presentingApplicationPID()) forKey:getAVSystemController_PIDToInheritApplicationStateFrom() error:&error];
+        if (error)
+            WTFLogAlways("Failed to set up PID proxying: %s", error.localizedDescription.UTF8String);
+    });
+}
+#endif
+
 } // namespace WebKit
 

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -71 +71 @@
 
 #if PLATFORM(IOS)
-#import "CelestialSPI.h"
 #import <pal/spi/ios/GraphicsServicesSPI.h>
-#import <wtf/SoftLinking.h>
 #endif
 
 #if USE(OS_STATE)
 #import <os/state_private.h>
-#endif
-
-#if PLATFORM(IOS)
-SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(Celestial)
-
-SOFT_LINK_CLASS_OPTIONAL(Celestial, AVSystemController)
-
-SOFT_LINK_CONSTANT_MAY_FAIL(Celestial, AVSystemController_PIDToInheritApplicationStateFrom, NSString *)
-
-#define AVSystemController_PIDToInheritApplicationStateFrom getAVSystemController_PIDToInheritApplicationStateFrom()
 #endif
 
@@ -175 +163 @@
     // Priority decay on iOS 9 is impacting page load time so we fix the priority of the WebProcess' main thread (rdar://problem/22003112).
     pthread_set_fixedpriority_self();
-#endif
-
-#if PLATFORM(IOS)
-    if (canLoadAVSystemController_PIDToInheritApplicationStateFrom()) {
-        pid_t pid = WebCore::presentingApplicationPID();
-        NSError *error = nil;
-        [[getAVSystemControllerClass() sharedAVSystemController] setAttribute:@(pid) forKey:AVSystemController_PIDToInheritApplicationStateFrom error:&error];
-        if (error)
-            WTFLogAlways("Failed to set up PID proxying: %s", [[error localizedDescription] UTF8String]);
-    }
 #endif
 }