diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 23:13:57 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 23:13:57 +0000 |
| commit | 56200f01b42fc298eb187eac78b82c85eacedac0 (patch) | |
| tree | 2fdbc217ace5744c3e5afd1c9f3fa3aa25df5cd1 /webkit/tools | |
| parent | 4a3ce97a93e8b43082c4ae243ac8127c92890b28 (diff) | |
| download | chromium_src-56200f01b42fc298eb187eac78b82c85eacedac0.zip chromium_src-56200f01b42fc298eb187eac78b82c85eacedac0.tar.gz chromium_src-56200f01b42fc298eb187eac78b82c85eacedac0.tar.bz2 | |
Refactor WebGraphicsContext3DInProcess and TestWebGraphicsContext3D
This needs https://bugs.webkit.org/show_bug.cgi?id=76593 to land first.
This also removes WebKitPlatformSupport::createGraphicsContext3D implementations that are not called any more after the above.
BUG=None
TEST=chrome with accelerated content, DRT, test_shell_tests
Review URL: http://codereview.chromium.org/9226036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_webkit_init.cc | 13 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_webkit_init.h | 1 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 8 |
3 files changed, 4 insertions, 18 deletions
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.cc b/webkit/tools/test_shell/test_shell_webkit_init.cc index 647092f..5fd7761 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.cc +++ b/webkit/tools/test_shell/test_shell_webkit_init.cc @@ -300,20 +300,11 @@ TestShellWebKitInit::sharedWorkerRepository() { return NULL; } -WebKit::WebGraphicsContext3D* TestShellWebKitInit::createGraphicsContext3D() { - return new webkit::gpu::WebGraphicsContext3DInProcessImpl( - gfx::kNullPluginWindow, NULL); -} - WebKit::WebGraphicsContext3D* TestShellWebKitInit::createOffscreenGraphicsContext3D( const WebKit::WebGraphicsContext3D::Attributes& attributes) { - scoped_ptr<WebGraphicsContext3D> context( - new webkit::gpu::WebGraphicsContext3DInProcessImpl( - gfx::kNullPluginWindow, NULL)); - if (!context->initialize(attributes, NULL, false)) - return NULL; - return context.release(); + return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( + attributes, NULL, false); } void TestShellWebKitInit::GetPlugins( diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h index 223cdf3..b94f5c4 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.h +++ b/webkit/tools/test_shell/test_shell_webkit_init.h @@ -106,7 +106,6 @@ class TestShellWebKitInit : public webkit_glue::WebKitPlatformSupportImpl { #endif virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository() OVERRIDE; - virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D() OVERRIDE; virtual WebKit::WebGraphicsContext3D* createOffscreenGraphicsContext3D( const WebKit::WebGraphicsContext3D::Attributes& attributes); diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 91737f6..36040cf 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -340,12 +340,8 @@ WebGraphicsContext3D* TestWebViewDelegate::createGraphicsContext3D( bool direct) { if (!shell_->webView()) return NULL; - scoped_ptr<WebGraphicsContext3D> context( - new webkit::gpu::WebGraphicsContext3DInProcessImpl( - gfx::kNullPluginWindow, NULL)); - if (!context->initialize(attributes, shell_->webView(), direct)) - return NULL; - return context.release(); + return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( + attributes, shell_->webView(), direct); } void TestWebViewDelegate::didAddMessageToConsole( |