summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 08:54:15 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 08:54:15 +0000
commit92fd8c010966954fb521cbbc263b810b69285bc4 (patch)
treebef9e0551016be552d13056729c41e9302c2f53e /webkit/tools
parenta7dffcf0aef844af2ce4d501dc7a9e95a975809d (diff)
downloadchromium_src-92fd8c010966954fb521cbbc263b810b69285bc4.zip
chromium_src-92fd8c010966954fb521cbbc263b810b69285bc4.tar.gz
chromium_src-92fd8c010966954fb521cbbc263b810b69285bc4.tar.bz2
Stop using WebGraphicsContext3DInProcessImpl in webkit/
This class is being replaced by WebGraphicsContext3DInProcessCommandBufferImpl, and these contexts are all offscreen so we are able to replace them now. R=jamesr BUG=224665 Review URL: https://chromiumcodereview.appspot.com/13292002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell_webkit_init.cc5
-rw-r--r--webkit/tools/test_shell/test_shell_webkit_init.h1
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc1
3 files changed, 3 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.cc b/webkit/tools/test_shell/test_shell_webkit_init.cc
index 245817e..88dade6 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.cc
+++ b/webkit/tools/test_shell/test_shell_webkit_init.cc
@@ -15,6 +15,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
#include "ui/gl/gl_bindings_skia_in_process.h"
#include "v8/include/v8.h"
+#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
#include "webkit/plugins/npapi/plugin_list.h"
#include "webkit/plugins/webplugininfo.h"
#include "webkit/tools/test_shell/simple_socket_stream_bridge.h"
@@ -266,8 +267,8 @@ WebKit::WebIDBFactory* TestShellWebKitInit::idbFactory() {
WebKit::WebGraphicsContext3D*
TestShellWebKitInit::createOffscreenGraphicsContext3D(
const WebKit::WebGraphicsContext3D::Attributes& attributes) {
- return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
- attributes, false);
+ return new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl(
+ attributes);
}
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 2a19ab6..7f774c4 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -13,7 +13,6 @@
#include "webkit/glue/webfileutilities_impl.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webkitplatformsupport_impl.h"
-#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
#include "webkit/support/simple_database_system.h"
#include "webkit/tools/test_shell/mock_webclipboard_impl.h"
#include "webkit/tools/test_shell/simple_appcache_system.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index df7ced9..6fa3a97 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -61,7 +61,6 @@
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webpreferences.h"
#include "webkit/glue/weburlrequest_extradata_impl.h"
-#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
#include "webkit/media/webmediaplayer_impl.h"
#include "webkit/media/webmediaplayer_params.h"
#include "webkit/plugins/npapi/plugin_list.h"