<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167039] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167039">167039</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-04-09 15:13:07 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKit2xcconfig">trunk/Source/WebKit2/Configurations/WebKit2.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebProcessProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167038 => 167039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-09 22:12:40 UTC (rev 167038)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-09 22:13:07 UTC (rev 167039)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-04-09 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> WK2: Dictated words disappear after being inserted.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKit2xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit2.xcconfig (167038 => 167039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-04-09 22:12:40 UTC (rev 167038)
+++ trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-04-09 22:13:07 UTC (rev 167039)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
</span><span class="cx">
</span><span class="cx"> FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
</span><del>-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;
</del><ins>+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;
</ins><span class="cx"> FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
</span><span class="cx"> FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (167038 => 167039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-04-09 22:12:40 UTC (rev 167038)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-04-09 22:13:07 UTC (rev 167039)
</span><span class="lines">@@ -46,6 +46,14 @@
</span><span class="cx"> #include "CustomProtocolManagerProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS) && USE(XPC_SERVICES)
+OBJC_CLASS BKSProcessAssertion;
+enum ProcessAssertionState {
+ AssertionBackground,
+ AssertionForeground
+};
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class URL;
</span><span class="cx"> struct PluginInfo;
</span><span class="lines">@@ -216,6 +224,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> int m_numberOfTimesSuddenTerminationWasDisabled;
</span><ins>+
+#if PLATFORM(IOS) && USE(XPC_SERVICES)
+ RetainPtr<BKSProcessAssertion> m_assertion;
+ ProcessAssertionState m_assertionState;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebProcessProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm (167038 => 167039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm 2014-04-09 22:12:40 UTC (rev 167038)
+++ trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm 2014-04-09 22:13:07 UTC (rev 167039)
</span><span class="lines">@@ -28,9 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import <assertion/extension_private.h>
</del><ins>+#import <AssertionServices/BKSProcessAssertion.h>
</ins><span class="cx"> #import <WebCore/NotImplemented.h>
</span><span class="cx">
</span><ins>+const BKSProcessAssertionFlags BackgroundTabFlags = (BKSProcessAssertionAllowIdleSleep);
+const BKSProcessAssertionFlags ForegroundTabFlags = (BKSProcessAssertionAllowIdleSleep | BKSProcessAssertionPreventTaskSuspend | BKSProcessAssertionWantsForegroundResourcePriority | BKSProcessAssertionPreventTaskThrottleDown);
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> bool WebProcessProxy::fullKeyboardAccessEnabled()
</span><span class="lines">@@ -81,16 +84,28 @@
</span><span class="cx"> if (!xpcConnection)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- assertion_extension_state_t extensionState = ASSERTION_EXTENSION_STATE_BACKGROUND;
</del><ins>+ ProcessAssertionState assertionState = AssertionBackground;
</ins><span class="cx"> for (const auto& page : m_pageMap.values()) {
</span><span class="cx"> if (page->isInWindow()) {
</span><del>- extensionState = ASSERTION_EXTENSION_STATE_FOREGROUND;
</del><ins>+ assertionState = AssertionForeground;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- errno_t tabStateError = assertion_extension_set_state(xpcConnection, extensionState, NULL);
- ASSERT_UNUSED(tabStateError, !tabStateError);
</del><ins>+ 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;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>