<!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>[203578] branches/safari-602-branch/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/203578">203578</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-22 02:26:09 -0700 (Fri, 22 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203392">r203392</a>. rdar://problem/27056844</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformRuntimeApplicationChecksh">branches/safari-602-branch/Source/WebCore/platform/RuntimeApplicationChecks.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformRuntimeApplicationChecksmm">branches/safari-602-branch/Source/WebCore/platform/RuntimeApplicationChecks.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPICocoaAPIWebsiteDataStoreCocoamm">branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203577 => 203578)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:26:05 UTC (rev 203577)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:26:09 UTC (rev 203578)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203392. rdar://problem/27056844
+
+ 2016-07-18 Alex Christensen <achristensen@webkit.org>
+
+ webbookmarksd needs to use the same AppCache directory as MobileSafari
+ https://bugs.webkit.org/show_bug.cgi?id=159912
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests. This only changes behavior for webbookmarksd.
+
+ * platform/RuntimeApplicationChecks.h:
+ * platform/RuntimeApplicationChecks.mm:
+ (WebCore::IOSApplication::isWebBookmarksD): Added.
+
+2016-07-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203543. rdar://problem/27429465
</span><span class="cx">
</span><span class="cx"> 2016-07-21 Dean Jackson <dino@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformRuntimeApplicationChecksh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/RuntimeApplicationChecks.h (203577 => 203578)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2016-07-22 09:26:05 UTC (rev 203577)
+++ branches/safari-602-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2016-07-22 09:26:09 UTC (rev 203578)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isMobileMail();
</span><span class="cx"> WEBCORE_EXPORT bool isMobileSafari();
</span><ins>+WEBCORE_EXPORT bool isWebBookmarksD();
</ins><span class="cx"> bool isDumpRenderTree();
</span><span class="cx"> bool isMobileStore();
</span><span class="cx"> WEBCORE_EXPORT bool isWebApp();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformRuntimeApplicationChecksmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/RuntimeApplicationChecks.mm (203577 => 203578)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/RuntimeApplicationChecks.mm 2016-07-22 09:26:05 UTC (rev 203577)
+++ branches/safari-602-branch/Source/WebCore/platform/RuntimeApplicationChecks.mm 2016-07-22 09:26:09 UTC (rev 203578)
</span><span class="lines">@@ -170,6 +170,12 @@
</span><span class="cx"> return isMobileSafari;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool IOSApplication::isWebBookmarksD()
+{
+ static bool isWebBookmarksD = applicationBundleIsEqualTo("com.apple.webbookmarksd");
+ return isWebBookmarksD;
+}
+
</ins><span class="cx"> bool IOSApplication::isDumpRenderTree()
</span><span class="cx"> {
</span><span class="cx"> // We use a prefix match instead of strict equality since LayoutTestRelay may launch multiple instances of
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (203577 => 203578)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-22 09:26:05 UTC (rev 203577)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-22 09:26:09 UTC (rev 203578)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203392. rdar://problem/27056844
+
+ 2016-07-18 Alex Christensen <achristensen@webkit.org>
+
+ webbookmarksd needs to use the same AppCache directory as MobileSafari
+ https://bugs.webkit.org/show_bug.cgi?id=159912
+ <rdar://problem/27056844>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm:
+ (API::WebsiteDataStore::defaultApplicationCacheDirectory):
+ Make webbookmarksd match MobileSafari by adding a matching runtime exception.
+
+2016-07-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203541. rdar://problem/27450825
</span><span class="cx">
</span><span class="cx"> 2016-07-21 Chelsea Pugh <cpugh@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPICocoaAPIWebsiteDataStoreCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm (203577 => 203578)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2016-07-22 09:26:05 UTC (rev 203577)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm 2016-07-22 09:26:09 UTC (rev 203578)
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // This quirk used to make these apps share application cache storage, but doesn't accomplish that any more.
</span><span class="cx"> // Preserving it avoids the need to migrate data when upgrading.
</span><del>- // FIXME: Ideally we should just have Safari and WebApp create a data store with
</del><ins>+ // FIXME: Ideally we should just have Safari, WebApp, and webbookmarksd create a data store with
</ins><span class="cx"> // this application cache path, but that's not supported as of right now.
</span><del>- if (WebCore::IOSApplication::isMobileSafari() || WebCore::IOSApplication::isWebApp()) {
</del><ins>+ if (WebCore::IOSApplication::isMobileSafari() || WebCore::IOSApplication::isWebApp() || WebCore::IOSApplication::isWebBookmarksD()) {
</ins><span class="cx"> NSString *cachePath = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches/com.apple.WebAppCache"];
</span><span class="cx">
</span><span class="cx"> return WebKit::stringByResolvingSymlinksInPath(cachePath.stringByStandardizingPath);
</span></span></pre>
</div>
</div>
</body>
</html>