Changeset 167039 in webkit

Timestamp:

Apr 9, 2014 3:13:07 PM (10 years ago)

Author:

barraclough@apple.com

Message:

Update SPI for managing tabs
​https://bugs.webkit.org/show_bug.cgi?id=131453

Reviewed by Alexey Proskuryakov.

• Configurations/WebKit2.xcconfig:
  • added AssertionServices
• UIProcess/WebProcessProxy.h:
  • added m_assertion, m_assertionState.
• UIProcess/ios/WebProcessProxyIOS.mm:

(WebKit::WebProcessProxy::updateProcessState):

• create BKSProcessAssertion to take an assertion.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Configurations/WebKit2.xcconfig (modified) (1 diff)
• UIProcess/WebProcessProxy.h (modified) (2 diffs)
• UIProcess/ios/WebProcessProxyIOS.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-09  Gavin Barraclough  <baraclough@apple.com>
+
+        Update SPI for managing tabs
+        https://bugs.webkit.org/show_bug.cgi?id=131453
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/WebKit2.xcconfig:
+            - added AssertionServices
+        * UIProcess/WebProcessProxy.h:
+            - added m_assertion, m_assertionState.
+        * UIProcess/ios/WebProcessProxyIOS.mm:
+        (WebKit::WebProcessProxy::updateProcessState):
+            - create BKSProcessAssertion to take an assertion.
+
 2014-04-09  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit2/Configurations/WebKit2.xcconfig

@@ -31 +31 @@
 
 FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileAsset -framework WebKit -lMobileGestalt -lassertion_extension;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileAsset -framework WebKit -lMobileGestalt -lassertion_extension;
 FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
 FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -47 +47 @@
 #endif
 
+#if PLATFORM(IOS) && USE(XPC_SERVICES)
+OBJC_CLASS BKSProcessAssertion;
+enum ProcessAssertionState {
+    AssertionBackground,
+    AssertionForeground
+};
+#endif
+
 namespace WebCore {
 class URL;
@@ -217 +225 @@
 
     int m_numberOfTimesSuddenTerminationWasDisabled;
+    
+#if PLATFORM(IOS) && USE(XPC_SERVICES)
+    RetainPtr<BKSProcessAssertion> m_assertion;
+    ProcessAssertionState m_assertionState;
+#endif
 };
 

trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm

@@ -29 +29 @@
 #if PLATFORM(IOS)
 
-#import <assertion/extension_private.h>
+#import <AssertionServices/BKSProcessAssertion.h>
 #import <WebCore/NotImplemented.h>
+
+const BKSProcessAssertionFlags BackgroundTabFlags = (BKSProcessAssertionAllowIdleSleep);
+const BKSProcessAssertionFlags ForegroundTabFlags = (BKSProcessAssertionAllowIdleSleep | BKSProcessAssertionPreventTaskSuspend | BKSProcessAssertionWantsForegroundResourcePriority | BKSProcessAssertionPreventTaskThrottleDown);
 
 namespace WebKit {
@@ -82 +85 @@
         return;
 
-    assertion_extension_state_t extensionState = ASSERTION_EXTENSION_STATE_BACKGROUND;
+    ProcessAssertionState assertionState = AssertionBackground;
     for (const auto& page : m_pageMap.values()) {
         if (page->isInWindow()) {
-            extensionState = ASSERTION_EXTENSION_STATE_FOREGROUND;
+            assertionState = AssertionForeground;
             break;
         }
     }
-
-    errno_t tabStateError = assertion_extension_set_state(xpcConnection, extensionState, NULL);
-    ASSERT_UNUSED(tabStateError, !tabStateError);
+    BKSProcessAssertionFlags flags = (assertionState == AssertionForeground) ? ForegroundTabFlags : BackgroundTabFlags;
+    
+    if (!m_assertion) {
+        pid_t pid = xpc_connection_get_pid(xpcConnection);
+        BKSProcessAssertionAcquisitionHandler handler = ^(BOOL acquired) {
+            if (!acquired) {
+                LOG_ERROR("Unable to acquire assertion for WebContent process %d", pid);
+                ASSERT_NOT_REACHED();
+            }
+        };
+        m_assertion = adoptNS([[BKSProcessAssertion alloc] initWithPID:pid flags:flags reason:BKSProcessAssertionReasonExtension name:@"Web content visible" withHandler:handler]);
+    } else if (m_assertionState != assertionState)
+        [m_assertion setFlags:flags];
+    
+    m_assertionState = assertionState;
 #endif
 }