diff options
| author | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 09:13:39 +0000 |
|---|---|---|
| committer | tkent@google.com <tkent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 09:13:39 +0000 |
| commit | 587f4ff6420df90d4e6160aeb78918fcf55e3599 (patch) | |
| tree | eec256c6964c74ac7bcc448f37d20a31d6c1e397 /webkit/support/test_webkit_client.h | |
| parent | 5df870bf1e212e8ac4214e17d942a141fce2691a (diff) | |
| download | chromium_src-587f4ff6420df90d4e6160aeb78918fcf55e3599.zip chromium_src-587f4ff6420df90d4e6160aeb78918fcf55e3599.tar.gz chromium_src-587f4ff6420df90d4e6160aeb78918fcf55e3599.tar.bz2 | |
Apply recent changes of test_shell to webkit_support.
- Enable some runtime WebKit flags
- Use DumpRenderTreePasteboard
- Use webkit_glue::WebFileSystemImpl
- Use TestShellWebMimeRegistryImpl
- Add webkit_support::CreateApplicationCacheHost()
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2038010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support/test_webkit_client.h')
| -rw-r--r-- | webkit/support/test_webkit_client.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/webkit/support/test_webkit_client.h b/webkit/support/test_webkit_client.h index 8e4dacc..c0c8a6a 100644 --- a/webkit/support/test_webkit_client.h +++ b/webkit/support/test_webkit_client.h @@ -5,12 +5,13 @@ #ifndef WEBKIT_SUPPORT_TEST_WEBKIT_CLIENT_H_ #define WEBKIT_SUPPORT_TEST_WEBKIT_CLIENT_H_ -#include "webkit/glue/simple_webmimeregistry_impl.h" +#include "webkit/glue/webfilesystem_impl.h" #include "webkit/glue/webkitclient_impl.h" #include "webkit/tools/test_shell/mock_webclipboard_impl.h" #include "webkit/tools/test_shell/simple_appcache_system.h" #include "webkit/tools/test_shell/simple_database_system.h" #include "webkit/tools/test_shell/simple_webcookiejar_impl.h" +#include "webkit/tools/test_shell/test_shell_webmimeregistry_impl.h" // An implementation of WebKitClient for tests. class TestWebKitClient : public webkit_glue::WebKitClientImpl { @@ -20,6 +21,7 @@ class TestWebKitClient : public webkit_glue::WebKitClientImpl { virtual WebKit::WebMimeRegistry* mimeRegistry(); WebKit::WebClipboard* clipboard(); + virtual WebKit::WebFileSystem* fileSystem(); virtual WebKit::WebSandboxSupport* sandboxSupport(); virtual WebKit::WebCookieJar* cookieJar(); virtual bool sandboxEnabled(); @@ -32,7 +34,6 @@ class TestWebKitClient : public webkit_glue::WebKitClientImpl { const WebKit::WebString& vfs_file_name); virtual long long databaseGetFileSize( const WebKit::WebString& vfs_file_name); - virtual bool getFileSize(const WebKit::WebString& path, long long& result); virtual unsigned long long visitedLinkHash(const char* canonicalURL, size_t length); virtual bool isLinkVisited(unsigned long long linkHash); @@ -54,10 +55,12 @@ class TestWebKitClient : public webkit_glue::WebKitClientImpl { #endif virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository(); + virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D(); private: - webkit_glue::SimpleWebMimeRegistryImpl mime_registry_; + TestShellWebMimeRegistryImpl mime_registry_; MockWebClipboardImpl mock_clipboard_; + webkit_glue::WebFileSystemImpl file_system_; ScopedTempDir appcache_dir_; SimpleAppCacheSystem appcache_system_; SimpleDatabaseSystem database_system_; |