webbookmarksd needs to use the same AppCache directory as MobileSafari

achristensen07 · achristensen07 · commit b2c8ebce96fc · 2016-07-19T02:02:37.000Z
https://bugs.webkit.org/show_bug.cgi?id=159912 Source/WebCore: Reviewed by Alexey Proskuryakov. No new tests. This only changes behavior for webbookmarksd. * platform/RuntimeApplicationChecks.h: * platform/RuntimeApplicationChecks.mm: (WebCore::IOSApplication::isWebBookmarksD): Added. Source/WebKit2: <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. Canonical link: https://commits.webkit.org/178076@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203392 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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-18  Chris Dumez  <cdumez@apple.com>
 
         EventTarget.dispatchEvent() parameter should not be nullable
diff --git a/Source/WebCore/platform/RuntimeApplicationChecks.h b/Source/WebCore/platform/RuntimeApplicationChecks.h
@@ -62,6 +62,7 @@ namespace IOSApplication {
 
 WEBCORE_EXPORT bool isMobileMail();
 WEBCORE_EXPORT bool isMobileSafari();
+WEBCORE_EXPORT bool isWebBookmarksD();
 bool isDumpRenderTree();
 bool isMobileStore();
 WEBCORE_EXPORT bool isWebApp();
diff --git a/Source/WebCore/platform/RuntimeApplicationChecks.mm b/Source/WebCore/platform/RuntimeApplicationChecks.mm
@@ -170,6 +170,12 @@ static bool applicationBundleIsEqualTo(const String& bundleIdentifierString)
     return isMobileSafari;
 }
 
+bool IOSApplication::isWebBookmarksD()
+{
+    static bool isWebBookmarksD = applicationBundleIsEqualTo("com.apple.webbookmarksd");
+    return isWebBookmarksD;
+}
+
 bool IOSApplication::isDumpRenderTree()
 {
     // We use a prefix match instead of strict equality since LayoutTestRelay may launch multiple instances of
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+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-18  Anders Carlsson  <andersca@apple.com>
 
         Don't null out the IPC::Connection's XPC connection
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm b/Source/WebKit2/UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
@@ -40,9 +40,9 @@
 #if PLATFORM(IOS)
     // This quirk used to make these apps share application cache storage, but doesn't accomplish that any more.
     // Preserving it avoids the need to migrate data when upgrading.
-    // FIXME: Ideally we should just have Safari and WebApp create a data store with
+    // FIXME: Ideally we should just have Safari, WebApp, and webbookmarksd create a data store with
     // this application cache path, but that's not supported as of right now.
-    if (WebCore::IOSApplication::isMobileSafari() || WebCore::IOSApplication::isWebApp()) {
+    if (WebCore::IOSApplication::isMobileSafari() || WebCore::IOSApplication::isWebApp() || WebCore::IOSApplication::isWebBookmarksD()) {
         NSString *cachePath = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches/com.apple.WebAppCache"];
 
         return WebKit::stringByResolvingSymlinksInPath(cachePath.stringByStandardizingPath);

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,12 @@ static bool applicationBundleIsEqualTo(const String& bundleIdentifierString)`
`170`	`170`	`return isMobileSafari;`
`171`	`171`	`}`
`172`	`172`
	`173`	`+bool IOSApplication::isWebBookmarksD()`
	`174`	`+{`
	`175`	`+ static bool isWebBookmarksD = applicationBundleIsEqualTo("com.apple.webbookmarksd");`
	`176`	`+ return isWebBookmarksD;`
	`177`	`+}`
	`178`	`+`
`173`	`179`	`bool IOSApplication::isDumpRenderTree()`
`174`	`180`	`{`
`175`	`181`	`// We use a prefix match instead of strict equality since LayoutTestRelay may launch multiple instances of`