<!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>[198051] 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/198051">198051</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-03-11 15:24:00 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/198040">r198040</a>): WebKit2.DocumentStartUserScriptAlertCrashTest API test is crashing in debug
https://bugs.webkit.org/show_bug.cgi?id=155382
Reviewed by Alexey Proskuryakov.
<a href="http://trac.webkit.org/projects/webkit/changeset/198040">r198040</a> introduced an assertion to make sure we never call
applicationBundleIsEqualTo() before setApplicationBundleIdentifier()
is called. This new assertion found a bug as it turns out we were
calling setApplicationBundleIdentifier() too late during the
WebProcess initialization and some runtime applications checks were
already done by then.
To address the problem, this patch moves the
setApplicationBundleIdentifier() call as early as possible during
the WebProcess and the NetworkProcess initialization. It also moves
it to the Cocoa specific files for clarity.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::initializeNetworkProcess):
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198050 => 198051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-11 23:15:08 UTC (rev 198050)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-11 23:24:00 UTC (rev 198051)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-03-11 Chris Dumez <cdumez@apple.com>
+
+ Regression(r198040): WebKit2.DocumentStartUserScriptAlertCrashTest API test is crashing in debug
+ https://bugs.webkit.org/show_bug.cgi?id=155382
+
+ Reviewed by Alexey Proskuryakov.
+
+ r198040 introduced an assertion to make sure we never call
+ applicationBundleIsEqualTo() before setApplicationBundleIdentifier()
+ is called. This new assertion found a bug as it turns out we were
+ calling setApplicationBundleIdentifier() too late during the
+ WebProcess initialization and some runtime applications checks were
+ already done by then.
+
+ To address the problem, this patch moves the
+ setApplicationBundleIdentifier() call as early as possible during
+ the WebProcess and the NetworkProcess initialization. It also moves
+ it to the Cocoa specific files for clarity.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2016-03-11 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Use only selected text for Look up.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (198050 => 198051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-03-11 23:15:08 UTC (rev 198050)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-03-11 23:24:00 UTC (rev 198051)
</span><span class="lines">@@ -215,7 +215,6 @@
</span><span class="cx"> setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || USE(CFNETWORK)
</span><del>- setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
</del><span class="cx"> SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (198050 => 198051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2016-03-11 23:15:08 UTC (rev 198050)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2016-03-11 23:24:00 UTC (rev 198051)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import <WebCore/NetworkStorageSession.h>
</span><span class="cx"> #import <WebCore/PublicSuffix.h>
</span><span class="cx"> #import <WebCore/ResourceRequestCFNet.h>
</span><ins>+#import <WebCore/RuntimeApplicationChecks.h>
</ins><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="cx"> #import <WebCore/SecurityOriginData.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="lines">@@ -67,6 +68,8 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><ins>+ WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.containerCachesDirectoryExtensionHandle);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (198050 => 198051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-03-11 23:15:08 UTC (rev 198050)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-03-11 23:24:00 UTC (rev 198051)
</span><span class="lines">@@ -347,7 +347,6 @@
</span><span class="cx"> enableSmoothedLayerText(parameters.enabledSmoothedLayerText);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || USE(CFNETWORK)
</span><del>- setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
</del><span class="cx"> SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (198050 => 198051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2016-03-11 23:15:08 UTC (rev 198050)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2016-03-11 23:24:00 UTC (rev 198051)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #import <WebCore/MemoryPressureHandler.h>
</span><span class="cx"> #import <WebCore/NSAccessibilitySPI.h>
</span><span class="cx"> #import <WebCore/PageCache.h>
</span><ins>+#import <WebCore/RuntimeApplicationChecks.h>
</ins><span class="cx"> #import <WebCore/pthreadSPI.h>
</span><span class="cx"> #import <WebCore/VNodeTracker.h>
</span><span class="cx"> #import <WebCore/WebCoreNSURLExtras.h>
</span><span class="lines">@@ -128,6 +129,8 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters)
</span><span class="cx"> {
</span><ins>+ WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
+
</ins><span class="cx"> #if ENABLE(SANDBOX_EXTENSIONS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.webSQLDatabaseDirectoryExtensionHandle);
</span></span></pre>
</div>
</div>
</body>
</html>