<!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>[185939] trunk/Source</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/185939">185939</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-24 17:35:26 -0700 (Wed, 24 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Detect view services by using the "com.apple.UIKit.vends-view-services" entitlement
https://bugs.webkit.org/show_bug.cgi?id=146301
Reviewed by Tim Horton.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj:
* platform/spi/cocoa/SecuritySPI.h:
Source/WebKit2:
* UIProcess/ApplicationStateTracker.mm:
(WebKit::hasEntitlement):
(WebKit::isViewService):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaSecuritySPIh">trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplicationStateTrackermm">trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185938 => 185939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-25 00:33:40 UTC (rev 185938)
+++ trunk/Source/WebCore/ChangeLog 2015-06-25 00:35:26 UTC (rev 185939)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-24 Anders Carlsson <andersca@apple.com>
+
+ Detect view services by using the "com.apple.UIKit.vends-view-services" entitlement
+ https://bugs.webkit.org/show_bug.cgi?id=146301
+
+ Reviewed by Tim Horton.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/spi/cocoa/SecuritySPI.h:
+
</ins><span class="cx"> 2015-06-24 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a new color -apple-wireless-playback-target-active
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (185938 => 185939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-25 00:33:40 UTC (rev 185938)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-25 00:35:26 UTC (rev 185939)
</span><span class="lines">@@ -1344,7 +1344,7 @@
</span><span class="cx"> 339B5B63131DAA3200F48D02 /* CookiesStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 339B5B62131DAA3200F48D02 /* CookiesStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 33D0212D131DB37B004091A8 /* CookieStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E13F01EA1270E10D00DFBA71 /* CookieStorage.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 3571883EEF618793751E4089 /* RenderMathMLMenclose.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3662F984047CEDBE5DDDAFAA /* RenderMathMLMenclose.cpp */; };
</span><del>- 3717833A1AACDCF7000910E3 /* SecuritySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 371783391AACDCF7000910E3 /* SecuritySPI.h */; };
</del><ins>+ 3717833A1AACDCF7000910E3 /* SecuritySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 371783391AACDCF7000910E3 /* SecuritySPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 3717D7E817ECC591003C276D /* extract-localizable-strings.pl in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 3717D7E517ECC3A6003C276D /* extract-localizable-strings.pl */; };
</span><span class="cx"> 371A67CB11C6C7DB00047B8B /* HyphenationCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 371A67CA11C6C7DB00047B8B /* HyphenationCF.cpp */; };
</span><span class="cx"> 371E65CC13661EDC00BEEDB0 /* PageSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 371E65CB13661EDC00BEEDB0 /* PageSerializer.h */; };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaSecuritySPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h (185938 => 185939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h 2015-06-25 00:33:40 UTC (rev 185938)
+++ trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h 2015-06-25 00:35:26 UTC (rev 185939)
</span><span class="lines">@@ -28,8 +28,19 @@
</span><span class="cx">
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #include <Security/SecCertificatePriv.h>
</span><ins>+
+#if PLATFORM(IOS)
+#include <Security/SecTask.h>
+#endif
+
</ins><span class="cx"> #else
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+EXTERN_C SecTaskRef SecTaskCreateFromSelf(CFAllocatorRef);
+EXTERN_C CFTypeRef SecTaskCopyValueForEntitlement(SecTaskRef, CFStringRef entitlement, CFErrorRef *);
+#endif
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
</ins><span class="cx"> typedef uint32_t SecSignatureHashAlgorithm;
</span><span class="cx"> enum {
</span><span class="cx"> kSecSignatureHashAlgorithmUnknown = 0,
</span><span class="lines">@@ -43,10 +54,10 @@
</span><span class="cx"> kSecSignatureHashAlgorithmSHA512 = 8
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+EXTERN_C SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef);
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
-EXTERN_C SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef certificate);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif // SecuritySPI_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185938 => 185939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-25 00:33:40 UTC (rev 185938)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-25 00:35:26 UTC (rev 185939)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-06-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Detect view services by using the "com.apple.UIKit.vends-view-services" entitlement
+ https://bugs.webkit.org/show_bug.cgi?id=146301
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ApplicationStateTracker.mm:
+ (WebKit::hasEntitlement):
+ (WebKit::isViewService):
+
+2015-06-24 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WebContent process is unreponsive/idle when WKWebView is inside a view service.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146296
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplicationStateTrackermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm (185938 => 185939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-06-25 00:33:40 UTC (rev 185938)
+++ trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-06-25 00:35:26 UTC (rev 185939)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "AssertionServicesSPI.h"
</span><span class="cx"> #import "UIKitSPI.h"
</span><span class="cx"> #import <UIKit/UIApplication.h>
</span><ins>+#import <WebCore/SecuritySPI.h>
</ins><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><span class="cx">
</span><span class="lines">@@ -43,12 +44,33 @@
</span><span class="cx"> return applicationStateTracker;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool hasEntitlement(NSString *entitlement)
+{
+#if PLATFORM(IOS_SIMULATOR)
+ // The simulator doesn't support entitlements.
+ return true;
+#else
+ auto task = adoptCF(SecTaskCreateFromSelf(CFAllocatorGetDefault()));
+ if (!task)
+ return false;
+
+ auto value = adoptCF(SecTaskCopyValueForEntitlement(task.get(), (__bridge CFStringRef)entitlement, nullptr));
+ if (!value)
+ return false;
+
+ if (CFGetTypeID(value.get()) != CFBooleanGetTypeID())
+ return false;
+
+ return CFBooleanGetValue(static_cast<CFBooleanRef>(value.get()));
+#endif
+}
+
</ins><span class="cx"> static bool isViewService()
</span><span class="cx"> {
</span><span class="cx"> if (_UIApplicationIsExtension())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if ([[NSBundle mainBundle].bundleIdentifier isEqualToString:@"com.apple.SafariViewService"])
</del><ins>+ if (hasEntitlement(@"com.apple.UIKit.vends-view-services"))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>