From 25bc891982334820cbaffcda1b4116f9822ab22e Mon Sep 17 00:00:00 2001
From: "kbr@google.com" <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 12 Jan 2011 00:06:49 +0000
Subject: [PATCH] Fix WebKit canary builders after deletion of
WebGraphicsContext3DDefaultImpl from WebKit repository.
BUG=none
TEST=built test_shell on Linux
Review URL: http://codereview.chromium.org/6153004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71108 0039d316-1c4b-4281-b951-d872f2087c98
---
webkit/tools/test_shell/test_shell.gypi | 1 +
webkit/tools/test_shell/test_shell_webkit_init.h | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index bf53fd43a43e5..f33145eaf630d 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -44,6 +44,7 @@
'<(DEPTH)/webkit/support/webkit_support.gyp:blob',
'<(DEPTH)/webkit/support/webkit_support.gyp:database',
'<(DEPTH)/webkit/support/webkit_support.gyp:glue',
+ '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
],
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index 0909b7f77f549..d26307d509296 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -6,7 +6,6 @@
#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
#include "base/utf_string_conversions.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h"
#include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
#include "third_party/WebKit/WebKit/chromium/public/WebIDBKey.h"
#include "third_party/WebKit/WebKit/chromium/public/WebIDBKeyPath.h"
@@ -16,6 +15,7 @@
#include "webkit/glue/webfileutilities_impl.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webkitclient_impl.h"
+#include "webkit/gpu/webgraphicscontext3d_in_process_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"
@@ -161,7 +161,7 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
}
virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D() {
- return WebKit::WebGraphicsContext3D::createDefault();
+ return new webkit_gpu::WebGraphicsContext3DInProcessImpl();
}
private:
--
GitLab