<!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>[185936] 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/185936">185936</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-24 16:56:24 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebContent process is unreponsive/idle when WKWebView is inside a view service.
https://bugs.webkit.org/show_bug.cgi?id=146296
Reviewed by Tim Horton.
* Platform/spi/ios/AssertionServicesSPI.h: Renamed from Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h.
Rename this and add SPI for BKSApplicationStateMonitor.
* Platform/spi/ios/UIKitSPI.h:
Add _UIApplicationIsExtension SPI.
* UIProcess/ApplicationStateTracker.mm:
(WebKit::isViewService):
Return whether we're an extension or the safari view controller service.
(WebKit::isBackgroundState):
Helper function that returns whether a given BKSApplicationState is a background state.
(WebKit::ApplicationStateTracker::ApplicationStateTracker):
If we're a view service, create a BKSApplicationStateMonitor and listen for state changes for our pid.
* UIProcess/ios/ProcessAssertionIOS.mm:
Update #import.
* WebKit2.xcodeproj/project.pbxproj:
Update for rename.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosUIKitSPIh">trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplicationStateTrackermm">trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosProcessAssertionIOSmm">trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2PlatformspiiosAssertionServicesSPIh">trunk/Source/WebKit2/Platform/spi/ios/AssertionServicesSPI.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2PlatformspiiosBKSProcessAssertionSPIh">trunk/Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185935 => 185936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-24 23:54:12 UTC (rev 185935)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-24 23:56:24 UTC (rev 185936)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-06-24 Anders Carlsson <andersca@apple.com>
+
+ WebContent process is unreponsive/idle when WKWebView is inside a view service.
+ https://bugs.webkit.org/show_bug.cgi?id=146296
+
+ Reviewed by Tim Horton.
+
+ * Platform/spi/ios/AssertionServicesSPI.h: Renamed from Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h.
+ Rename this and add SPI for BKSApplicationStateMonitor.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ Add _UIApplicationIsExtension SPI.
+
+ * UIProcess/ApplicationStateTracker.mm:
+ (WebKit::isViewService):
+ Return whether we're an extension or the safari view controller service.
+
+ (WebKit::isBackgroundState):
+ Helper function that returns whether a given BKSApplicationState is a background state.
+
+ (WebKit::ApplicationStateTracker::ApplicationStateTracker):
+ If we're a view service, create a BKSApplicationStateMonitor and listen for state changes for our pid.
+
+ * UIProcess/ios/ProcessAssertionIOS.mm:
+ Update #import.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Update for rename.
+
</ins><span class="cx"> 2015-06-24 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaSession: propagate MediaSessionMetadata to WebPageProxy
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosAssertionServicesSPIhfromrev185935trunkSourceWebKit2PlatformspiiosBKSProcessAssertionSPIh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Platform/spi/ios/AssertionServicesSPI.h (from rev 185935, trunk/Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h) (0 => 185936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/AssertionServicesSPI.h (rev 0)
+++ trunk/Source/WebKit2/Platform/spi/ios/AssertionServicesSPI.h 2015-06-24 23:56:24 UTC (rev 185936)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <AssertionServices/BKSApplicationStateMonitor.h>
+#import <AssertionServices/BKSProcessAssertion.h>
+
+#else
+
+enum {
+ BKSApplicationStateUnknown = 0,
+ BKSApplicationStateTerminated = (1 << 0),
+ BKSApplicationStateBackgroundTaskSuspended = (1 << 1),
+ BKSApplicationStateBackgroundRunning = (1 << 2),
+ BKSApplicationStateForegroundRunning = (1 << 3),
+ BKSApplicationStateProcessServer = (1 << 4),
+ BKSApplicationStateForegroundRunningObscured = (1 << 5),
+};
+typedef uint32_t BKSApplicationState;
+
+extern NSString * const BKSApplicationStateMostElevatedStateForProcessIDKey;
+extern NSString * const BKSApplicationStateProcessIDKey;
+
+typedef void(^BKSApplicationStateChangedHandler)(NSDictionary *userInfo);
+
+@interface BKSApplicationStateMonitor : NSObject
+
+@property (nonatomic, copy) BKSApplicationStateChangedHandler handler;
+
+- (BKSApplicationState)mostElevatedApplicationStateForPID:(pid_t)pid;
+
+@end
+
+enum {
+ BKSProcessAssertionNone = 0,
+ BKSProcessAssertionPreventTaskSuspend = 1 << 0,
+ BKSProcessAssertionPreventTaskThrottleDown = 1 << 1,
+ BKSProcessAssertionAllowIdleSleep = 1 << 2,
+ BKSProcessAssertionWantsForegroundResourcePriority = 1 << 3,
+ BKSProcessAssertionAllowSuspendOnSleep = 1 << 4,
+};
+typedef uint32_t BKSProcessAssertionFlags;
+
+enum {
+ BKSProcessAssertionReasonExtension = 13,
+};
+typedef uint32_t BKSProcessAssertionReason;
+
+typedef void (^BKSProcessAssertionAcquisitionHandler)(BOOL acquired);
+
+@interface BKSProcessAssertion : NSObject
+@end
+
+@interface BKSProcessAssertion (Details)
+@property (nonatomic, assign) BKSProcessAssertionFlags flags;
+- (id)initWithPID:(pid_t)pid flags:(BKSProcessAssertionFlags)flags reason:(BKSProcessAssertionReason)reason name:(NSString *)name withHandler:(BKSProcessAssertionAcquisitionHandler)handler;
+- (void)invalidate;
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosBKSProcessAssertionSPIh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h (185935 => 185936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h 2015-06-24 23:54:12 UTC (rev 185935)
+++ trunk/Source/WebKit2/Platform/spi/ios/BKSProcessAssertionSPI.h 2015-06-24 23:56:24 UTC (rev 185936)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <AssertionServices/BKSProcessAssertion.h>
-
-#else
-
-enum {
- BKSProcessAssertionNone = 0,
- BKSProcessAssertionPreventTaskSuspend = 1 << 0,
- BKSProcessAssertionPreventTaskThrottleDown = 1 << 1,
- BKSProcessAssertionAllowIdleSleep = 1 << 2,
- BKSProcessAssertionWantsForegroundResourcePriority = 1 << 3,
- BKSProcessAssertionAllowSuspendOnSleep = 1 << 4,
-};
-typedef uint32_t BKSProcessAssertionFlags;
-
-enum {
- BKSProcessAssertionReasonExtension = 13,
-};
-typedef uint32_t BKSProcessAssertionReason;
-
-typedef void(^BKSProcessAssertionAcquisitionHandler)(BOOL acquired);
-
-@interface BKSProcessAssertion : NSObject
-@end
-
-@interface BKSProcessAssertion (Details)
-@property (nonatomic, assign) BKSProcessAssertionFlags flags;
-- (id)initWithPID:(pid_t)pid flags:(BKSProcessAssertionFlags)flags reason:(BKSProcessAssertionReason)reason name:(NSString *)name withHandler:(BKSProcessAssertionAcquisitionHandler)handler;
-- (void)invalidate;
-@end
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (185935 => 185936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-06-24 23:54:12 UTC (rev 185935)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-06-24 23:56:24 UTC (rev 185936)
</span><span class="lines">@@ -730,6 +730,7 @@
</span><span class="cx"> extern NSString * const UIKeyboardIsLocalUserInfoKey;
</span><span class="cx">
</span><span class="cx"> extern UIApplication *UIApp;
</span><ins>+BOOL _UIApplicationIsExtension(void);
</ins><span class="cx"> void _UIApplicationLoadWebKit(void);
</span><span class="cx"> BOOL _UIApplicationUsesLegacyUI(void);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplicationStateTrackermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm (185935 => 185936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-06-24 23:54:12 UTC (rev 185935)
+++ trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-06-24 23:56:24 UTC (rev 185936)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "AssertionServicesSPI.h"
+#import "UIKitSPI.h"
</ins><span class="cx"> #import <UIKit/UIApplication.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><span class="lines">@@ -41,20 +43,65 @@
</span><span class="cx"> return applicationStateTracker;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isViewService()
+{
+ if (_UIApplicationIsExtension())
+ return true;
+
+ if ([[NSBundle mainBundle].bundleIdentifier isEqualToString:@"com.apple.SafariViewService"])
+ return true;
+
+ return false;
+}
+
+static bool isBackgroundState(BKSApplicationState state)
+{
+ switch (state) {
+ case BKSApplicationStateBackgroundRunning:
+ case BKSApplicationStateBackgroundTaskSuspended:
+ return true;
+
+ default:
+ return false;
+ }
+}
+
</ins><span class="cx"> ApplicationStateTracker::ApplicationStateTracker()
</span><span class="cx"> {
</span><del>- UIApplication *application = [UIApplication sharedApplication];
- NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
</del><ins>+ if (isViewService()) {
+ BKSApplicationStateMonitor *applicationStateMonitor = [[BKSApplicationStateMonitor alloc] init];
</ins><span class="cx">
</span><del>- m_isInBackground = application.applicationState == UIApplicationStateBackground;
</del><ins>+ m_isInBackground = isBackgroundState([applicationStateMonitor mostElevatedApplicationStateForPID:getpid()]);
</ins><span class="cx">
</span><del>- [notificationCenter addObserverForName:UIApplicationDidEnterBackgroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
- applicationDidEnterBackground();
- }];
</del><ins>+ applicationStateMonitor.handler = [this](NSDictionary *userInfo) {
+ pid_t pid = [userInfo[BKSApplicationStateProcessIDKey] integerValue];
+ if (pid != getpid())
+ return;
</ins><span class="cx">
</span><del>- [notificationCenter addObserverForName:UIApplicationWillEnterForegroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
- applicationWillEnterForeground();
- }];
</del><ins>+ BKSApplicationState newState = (BKSApplicationState)[userInfo[BKSApplicationStateMostElevatedStateForProcessIDKey] unsignedIntValue];
+ bool newInBackground = isBackgroundState(newState);
+
+ dispatch_async(dispatch_get_main_queue(), [this, newInBackground] {
+ if (!m_isInBackground && newInBackground)
+ applicationDidEnterBackground();
+ else if (m_isInBackground && !newInBackground)
+ applicationWillEnterForeground();
+ });
+ };
+ } else {
+ UIApplication *application = [UIApplication sharedApplication];
+ NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+
+ m_isInBackground = application.applicationState == UIApplicationStateBackground;
+
+ [notificationCenter addObserverForName:UIApplicationDidEnterBackgroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
+ applicationDidEnterBackground();
+ }];
+
+ [notificationCenter addObserverForName:UIApplicationWillEnterForegroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
+ applicationWillEnterForeground();
+ }];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationStateTracker::addListener(id object, SEL willEnterForegroundSelector, SEL didEnterBackgroundSelector)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosProcessAssertionIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm (185935 => 185936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2015-06-24 23:54:12 UTC (rev 185935)
+++ trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2015-06-24 23:56:24 UTC (rev 185936)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #import "ApplicationStateTracker.h"
</span><del>-#import "BKSProcessAssertionSPI.h"
</del><ins>+#import "AssertionServicesSPI.h"
</ins><span class="cx"> #import <UIKit/UIApplication.h>
</span><span class="cx"> #import <wtf/HashSet.h>
</span><span class="cx"> #import <wtf/Vector.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185935 => 185936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-24 23:54:12 UTC (rev 185935)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-24 23:56:24 UTC (rev 185936)
</span><span class="lines">@@ -1680,7 +1680,7 @@
</span><span class="cx"> CDC3831017212440008A2FC3 /* CookieStorageShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC3830D1721242D008A2FC3 /* CookieStorageShim.mm */; };
</span><span class="cx"> CDCA85C8132ABA4E00E961DF /* WKFullScreenWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */; };
</span><span class="cx"> CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */; };
</span><del>- CE1A0BD21A48E6C60054EF74 /* BKSProcessAssertionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BCC1A48E6C60054EF74 /* BKSProcessAssertionSPI.h */; };
</del><ins>+ CE1A0BD21A48E6C60054EF74 /* AssertionServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BCC1A48E6C60054EF74 /* AssertionServicesSPI.h */; };
</ins><span class="cx"> CE1A0BD31A48E6C60054EF74 /* CorePDFSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BCD1A48E6C60054EF74 /* CorePDFSPI.h */; };
</span><span class="cx"> CE1A0BD41A48E6C60054EF74 /* DataDetectorsUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BCE1A48E6C60054EF74 /* DataDetectorsUISPI.h */; };
</span><span class="cx"> CE1A0BD51A48E6C60054EF74 /* ManagedConfigurationSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BCF1A48E6C60054EF74 /* ManagedConfigurationSPI.h */; };
</span><span class="lines">@@ -3911,7 +3911,7 @@
</span><span class="cx"> CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKFullScreenWindowController.mm; sourceTree = "<group>"; };
</span><span class="cx"> CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFullScreenWindowController.h; sourceTree = "<group>"; };
</span><span class="cx"> CDCA85D4132AC2B300E961DF /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
</span><del>- CE1A0BCC1A48E6C60054EF74 /* BKSProcessAssertionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BKSProcessAssertionSPI.h; sourceTree = "<group>"; };
</del><ins>+ CE1A0BCC1A48E6C60054EF74 /* AssertionServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssertionServicesSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> CE1A0BCD1A48E6C60054EF74 /* CorePDFSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CorePDFSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE1A0BCE1A48E6C60054EF74 /* DataDetectorsUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDetectorsUISPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE1A0BCF1A48E6C60054EF74 /* ManagedConfigurationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ManagedConfigurationSPI.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7339,8 +7339,8 @@
</span><span class="cx"> CE1A0BCB1A48E6C60054EF74 /* ios */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ CE1A0BCC1A48E6C60054EF74 /* AssertionServicesSPI.h */,
</ins><span class="cx"> CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */,
</span><del>- CE1A0BCC1A48E6C60054EF74 /* BKSProcessAssertionSPI.h */,
</del><span class="cx"> CE1A0BCD1A48E6C60054EF74 /* CorePDFSPI.h */,
</span><span class="cx"> CE1A0BCE1A48E6C60054EF74 /* DataDetectorsUISPI.h */,
</span><span class="cx"> CE1A0BCF1A48E6C60054EF74 /* ManagedConfigurationSPI.h */,
</span><span class="lines">@@ -7590,7 +7590,7 @@
</span><span class="cx"> 512F58A312A883AD00629530 /* AuthenticationManagerMessages.h in Headers */,
</span><span class="cx"> 7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */,
</span><span class="cx"> CDA041F41ACE2105004A13EC /* BackBoardServicesSPI.h in Headers */,
</span><del>- CE1A0BD21A48E6C60054EF74 /* BKSProcessAssertionSPI.h in Headers */,
</del><ins>+ CE1A0BD21A48E6C60054EF74 /* AssertionServicesSPI.h in Headers */,
</ins><span class="cx"> E164A2F2191AF14E0010737D /* BlobDataFileReferenceWithSandboxExtension.h in Headers */,
</span><span class="cx"> E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */,
</span><span class="cx"> 4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>