Title: [213933] trunk/Source/WebKit2
- Revision
- 213933
- Author
- eric.carl...@apple.com
- Date
- 2017-03-14 13:03:32 -0700 (Tue, 14 Mar 2017)
Log Message
[iOS] The web process should inherit application state from UI process
https://bugs.webkit.org/show_bug.cgi?id=169156
<rdar://problem/30845473>
Reviewed by Brady Eidson.
Move PID proxy setup to platformInitializeWebProcess as suggested in
post-landing feedback.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::platformInitialize):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (213932 => 213933)
--- trunk/Source/WebKit2/ChangeLog 2017-03-14 20:01:45 UTC (rev 213932)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-14 20:03:32 UTC (rev 213933)
@@ -1,3 +1,19 @@
+2017-03-14 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] The web process should inherit application state from UI process
+ https://bugs.webkit.org/show_bug.cgi?id=169156
+ <rdar://problem/30845473>
+
+ Reviewed by Brady Eidson.
+
+ Move PID proxy setup to platformInitializeWebProcess as suggested in
+ post-landing feedback.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::platformInitialize):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2017-03-14 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r213915.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (213932 => 213933)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-03-14 20:01:45 UTC (rev 213932)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-03-14 20:03:32 UTC (rev 213933)
@@ -30,7 +30,6 @@
#import "AccessibilityIOS.h"
#import "AssistedNodeInformation.h"
-#import "CelestialSPI.h"
#import "DataReference.h"
#import "DrawingArea.h"
#import "EditingRange.h"
@@ -100,7 +99,6 @@
#import <WebCore/RenderView.h>
#import <WebCore/Settings.h>
#import <WebCore/SharedBuffer.h>
-#import <WebCore/SoftLinking.h>
#import <WebCore/StyleProperties.h>
#import <WebCore/TextIndicator.h>
#import <WebCore/TextIterator.h>
@@ -112,14 +110,6 @@
#import <wtf/MemoryPressureHandler.h>
#import <wtf/SetForScope.h>
-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()
-
using namespace WebCore;
namespace WebKit {
@@ -130,14 +120,6 @@
void WebPage::platformInitialize()
{
platformInitializeAccessibility();
-
- if (canLoadAVSystemController_PIDToInheritApplicationStateFrom()) {
- pid_t pid = WebProcess::singleton().presenterApplicationPid();
- 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]);
- }
}
void WebPage::platformDetach()
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (213932 => 213933)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2017-03-14 20:01:45 UTC (rev 213932)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2017-03-14 20:03:32 UTC (rev 213933)
@@ -67,7 +67,9 @@
#import <stdio.h>
#if PLATFORM(IOS)
+#import "CelestialSPI.h"
#import <WebCore/GraphicsServicesSPI.h>
+#import <WebCore/SoftLinking.h>
#endif
#if USE(OS_STATE)
@@ -74,6 +76,16 @@
#include <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
+
using namespace WebCore;
namespace WebKit {
@@ -159,6 +171,16 @@
// 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 = WebProcess::singleton().presenterApplicationPid();
+ 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
}
void WebProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
