Title: [169325] trunk/Source/WebKit2
- Revision
- 169325
- Author
- [email protected]
- Date
- 2014-05-25 15:30:25 -0700 (Sun, 25 May 2014)
Log Message
Use the right paths for website data
https://bugs.webkit.org/show_bug.cgi?id=133267
<rdar://problem/17027698>
Reviewed by Sam Weinig.
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _initWithConfiguration:]):
Get the path of the absolute URL.
* UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
(WebKit::LocalStorageDatabaseTracker::databasePath):
Fix spelling error.
* WebProcess/Network/NetworkProcessConnection.cpp:
(WebKit::NetworkProcessConnection::didCacheResource):
Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169324 => 169325)
--- trunk/Source/WebKit2/ChangeLog 2014-05-25 22:17:43 UTC (rev 169324)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-25 22:30:25 UTC (rev 169325)
@@ -1,3 +1,23 @@
+2014-05-25 Anders Carlsson <[email protected]>
+
+ Use the right paths for website data
+ https://bugs.webkit.org/show_bug.cgi?id=133267
+ <rdar://problem/17027698>
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool _initWithConfiguration:]):
+ Get the path of the absolute URL.
+
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::LocalStorageDatabaseTracker::databasePath):
+ Fix spelling error.
+
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::didCacheResource):
+ Ditto.
+
2014-05-25 Benjamin Poulain <[email protected]>
[iOS][WK2] Use ScrollView's scrollOffset as the unobscuredContentRect
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (169324 => 169325)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-05-25 22:17:43 UTC (rev 169324)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-05-25 22:30:25 UTC (rev 169325)
@@ -153,9 +153,9 @@
webContextConfiguration.injectedBundlePath = bundleURL.path;
}
- webContextConfiguration.localStorageDirectory = websiteDataDirectoryURL(@"LocalStorage").absoluteString.fileSystemRepresentation;
- webContextConfiguration.webSQLDatabaseDirectory = websiteDataDirectoryURL(@"WebSQL").absoluteString.fileSystemRepresentation;
- webContextConfiguration.indexedDBDatabaseDirectory = websiteDataDirectoryURL(@"IndexedDB").absoluteString.fileSystemRepresentation;
+ webContextConfiguration.localStorageDirectory = websiteDataDirectoryURL(@"LocalStorage").absoluteURL.path.fileSystemRepresentation;
+ webContextConfiguration.webSQLDatabaseDirectory = websiteDataDirectoryURL(@"WebSQL").absoluteURL.path.fileSystemRepresentation;
+ webContextConfiguration.indexedDBDatabaseDirectory = websiteDataDirectoryURL(@"IndexedDB").absoluteURL.path.fileSystemRepresentation;
API::Object::constructInWrapper<WebKit::WebContext>(self, std::move(webContextConfiguration));
_context->setHistoryClient(std::make_unique<WebKit::HistoryClient>());
Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (169324 => 169325)
--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2014-05-25 22:17:43 UTC (rev 169324)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2014-05-25 22:30:25 UTC (rev 169325)
@@ -158,7 +158,7 @@
String LocalStorageDatabaseTracker::databasePath(const String& filename) const
{
if (!makeAllDirectories(m_localStorageDirectory)) {
- LOG_ERROR("Unabled to create LocalStorage database path %s", m_localStorageDirectory.utf8().data());
+ LOG_ERROR("Unable to create LocalStorage database path %s", m_localStorageDirectory.utf8().data());
return String();
}
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (169324 => 169325)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2014-05-25 22:17:43 UTC (rev 169324)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2014-05-25 22:30:25 UTC (rev 169325)
@@ -90,7 +90,7 @@
RefPtr<SharedBuffer> buffer = handle.tryWrapInSharedBuffer();
if (!buffer) {
- LOG_ERROR("Unabled to create SharedBuffer from ShareableResource handle for resource url %s", request.url().string().utf8().data());
+ LOG_ERROR("Unable to create SharedBuffer from ShareableResource handle for resource url %s", request.url().string().utf8().data());
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
