diff options
| author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-03 00:07:29 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-03 00:07:29 +0000 |
| commit | 2b1a1066433a4e01c55f60d9f7fedffea292e456 (patch) | |
| tree | a9cfbbbd36c196dfdfb910b0f572285bb4e1e58a | |
| parent | 1cacb04a38c2e6f3129b4ca92e5360dc459576f7 (diff) | |
| download | chromium_src-2b1a1066433a4e01c55f60d9f7fedffea292e456.zip chromium_src-2b1a1066433a4e01c55f60d9f7fedffea292e456.tar.gz chromium_src-2b1a1066433a4e01c55f60d9f7fedffea292e456.tar.bz2 | |
The second half of http://trac.webkit.org/changeset/49040
BUG=16876
TEST=It compiles.
Review URL: http://codereview.chromium.org/255065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27920 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/api/src/StorageNamespaceProxy.cpp | 2 | ||||
| -rw-r--r-- | webkit/api/src/WebStorageNamespaceImpl.cpp | 3 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 |
4 files changed, 7 insertions, 3 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "49039", + "webkit_revision": "49040", "ffmpeg_revision": "27457", } diff --git a/webkit/api/src/StorageNamespaceProxy.cpp b/webkit/api/src/StorageNamespaceProxy.cpp index 61acf1b..8b44f6e 100644 --- a/webkit/api/src/StorageNamespaceProxy.cpp +++ b/webkit/api/src/StorageNamespaceProxy.cpp @@ -37,7 +37,7 @@ namespace WebCore { -PassRefPtr<StorageNamespace> StorageNamespace::localStorageNamespace(const String& path) +PassRefPtr<StorageNamespace> StorageNamespace::localStorageNamespace(const String& path, unsigned quota) { return new StorageNamespaceProxy(WebKit::webKitClient()->createLocalStorageNamespace(path)); } diff --git a/webkit/api/src/WebStorageNamespaceImpl.cpp b/webkit/api/src/WebStorageNamespaceImpl.cpp index e6fa684..6754d18 100644 --- a/webkit/api/src/WebStorageNamespaceImpl.cpp +++ b/webkit/api/src/WebStorageNamespaceImpl.cpp @@ -34,6 +34,7 @@ #if ENABLE(DOM_STORAGE) #include "SecurityOrigin.h" +#include "StorageMap.h" #include "WebStorageAreaImpl.h" #include "WebString.h" @@ -42,7 +43,7 @@ namespace WebKit { WebStorageNamespace* WebStorageNamespace::createLocalStorageNamespace(const WebString& path) { - return new WebStorageNamespaceImpl(WebCore::StorageNamespaceImpl::localStorageNamespace(path)); + return new WebStorageNamespaceImpl(WebCore::StorageNamespaceImpl::localStorageNamespace(path, WebCore::StorageMap::noQuota)); } WebStorageNamespace* WebStorageNamespace::createSessionStorageNamespace() diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index cdf19ef..9396840 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -638,6 +638,9 @@ BUG21118 WIN LINUX : LayoutTests/fast/forms/box-shadow-override.html = FAIL // I'm marking them as deferred for now, but we should do something with them. BUG849072 SKIP : chrome/http/mime = PASS +// Disable quota test for now. +BUG16876 : LayoutTests/storage/domstorage/localstorage/quota.html = FAIL + // These tests all depend on DOM Storage events which are not yet supported. BUG4360 : LayoutTests/storage/domstorage/window-attributes-exist.html = FAIL BUG4360 : LayoutTests/storage/domstorage/localstorage/iframe-events.html = TIMEOUT |