diff options
author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 01:25:04 +0000 |
---|---|---|
committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 01:25:04 +0000 |
commit | 1ea3c791e775d70095461804fb7cc7a19f1576ca (patch) | |
tree | 35620b05f8d931ee668ed747afc322e9bdd5f715 /webkit/tools | |
parent | 4a64ea8eb45c6febf847037fa93e725d83eb0235 (diff) | |
download | chromium_src-1ea3c791e775d70095461804fb7cc7a19f1576ca.zip chromium_src-1ea3c791e775d70095461804fb7cc7a19f1576ca.tar.gz chromium_src-1ea3c791e775d70095461804fb7cc7a19f1576ca.tar.bz2 |
More DomStorage house cleaning, many files but all mechanical changes.
- delete old in_process_webkit sources (hooray)
- rename the new sources to no longer have the _new suffix
- fix up the includes
- remove the ENABLE_NEW_DOM_STORAGE_BACKEND flag since old stuff is now gone
Review URL: https://chromiumcodereview.appspot.com/10086018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/test_shell_webkit_init.cc | 19 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_shell_webkit_init.h | 6 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 6 |
3 files changed, 0 insertions, 31 deletions
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.cc b/webkit/tools/test_shell/test_shell_webkit_init.cc index 2f243e3..8d1e9ef 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.cc +++ b/webkit/tools/test_shell/test_shell_webkit_init.cc @@ -257,26 +257,7 @@ WebKit::WebString TestShellWebKitInit::defaultLocale() { WebKit::WebStorageNamespace* TestShellWebKitInit::createLocalStorageNamespace( const WebKit::WebString& path, unsigned quota) { -#ifdef ENABLE_NEW_DOM_STORAGE_BACKEND return dom_storage_system_.CreateLocalStorageNamespace(); -#else - // Enforce quota here, ignoring the value from the renderer as in Chrome. - return WebKit::WebStorageNamespace::createLocalStorageNamespace( - path, - WebKit::WebStorageNamespace::m_localStorageQuota); -#endif -} - -void TestShellWebKitInit::dispatchStorageEvent( - const WebKit::WebString& key, - const WebKit::WebString& old_value, const WebKit::WebString& new_value, - const WebKit::WebString& origin, const WebKit::WebURL& url, - bool is_local_storage) { - // All events are dispatched by the WebCore::StorageAreaProxy in the - // simple single process case. -#ifdef ENABLE_NEW_DOM_STORAGE_BACKEND - NOTREACHED(); -#endif } WebKit::WebIDBFactory* TestShellWebKitInit::idbFactory() { diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h index b334cb4..dfd27aa 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.h +++ b/webkit/tools/test_shell/test_shell_webkit_init.h @@ -76,12 +76,6 @@ class TestShellWebKitInit : public webkit_glue::WebKitPlatformSupportImpl { virtual WebKit::WebStorageNamespace* createLocalStorageNamespace( const WebKit::WebString& path, unsigned quota) OVERRIDE; - virtual void dispatchStorageEvent(const WebKit::WebString& key, - const WebKit::WebString& old_value, - const WebKit::WebString& new_value, - const WebKit::WebString& origin, - const WebKit::WebURL& url, - bool is_local_storage) OVERRIDE; virtual WebKit::WebIDBFactory* idbFactory() OVERRIDE; virtual void createIDBKeysFromSerializedValuesAndKeyPath( diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index d1c584b..9c5d4f9 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -335,13 +335,7 @@ WebWidget* TestWebViewDelegate::createPopupMenu(WebPopupType popup_type) { WebStorageNamespace* TestWebViewDelegate::createSessionStorageNamespace( unsigned quota) { -#ifdef ENABLE_NEW_DOM_STORAGE_BACKEND return SimpleDomStorageSystem::instance().CreateSessionStorageNamespace(); -#else - // Enforce quota, ignoring the parameter from WebCore as in Chrome. - return WebKit::WebStorageNamespace::createSessionStorageNamespace( - WebStorageNamespace::m_sessionStorageQuota); -#endif } WebGraphicsContext3D* TestWebViewDelegate::createGraphicsContext3D( |