From 49861ff21dace659d3da493b38551a07a611f4f4 Mon Sep 17 00:00:00 2001 From: "kbr@google.com" Date: Tue, 11 Jan 2011 19:50:40 +0000 Subject: Move the in-process WebGL implementation from the WebKit to the Chromium repository to break circular dependencies on Chromium's OpenGL bindings in app/gfx/gl. The minimal changes to the code were made in order to break dependencies on WebCore types and to make the code fit the Google C++ style guide as closely as possible. There are many references to undesirable types like "long" in the WebGraphicsContext3D interface, which are the source of the majority of lint errors and which will be fixed in follow-on work. The upstream WebGraphicsContext3DDefaultImpl will be deleted after this lands. Tested: - Various WebGL demos in Chrome - Built and ran WebGL layout tests in DRT BUG=none TEST=none (see above) Review URL: http://codereview.chromium.org/6100009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71069 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/support/test_webkit_client.cc | 4 ++-- webkit/support/webkit_support.gyp | 1 + webkit/support/webkit_support.gypi | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'webkit/support') diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc index 1a78768..a59dfc8 100644 --- a/webkit/support/test_webkit_client.cc +++ b/webkit/support/test_webkit_client.cc @@ -18,7 +18,6 @@ #include "third_party/WebKit/WebKit/chromium/public/WebData.h" #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileSystem.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" @@ -40,6 +39,7 @@ #include "webkit/glue/webclipboard_impl.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitclient_impl.h" +#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" #include "webkit/support/weburl_loader_mock_factory.h" #include "webkit/tools/test_shell/mock_webclipboard_impl.h" #include "webkit/tools/test_shell/simple_appcache_system.h" @@ -346,5 +346,5 @@ WebKit::WebSharedWorkerRepository* TestWebKitClient::sharedWorkerRepository() { } WebKit::WebGraphicsContext3D* TestWebKitClient::createGraphicsContext3D() { - return WebKit::WebGraphicsContext3D::createDefault(); + return new webkit_gpu::WebGraphicsContext3DInProcessImpl(); } diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp index 3550f33..fe8a3e5 100644 --- a/webkit/support/webkit_support.gyp +++ b/webkit/support/webkit_support.gyp @@ -9,6 +9,7 @@ '../fileapi/webkit_fileapi.gypi', '../database/webkit_database.gypi', '../glue/webkit_glue.gypi', + '../gpu/webkit_gpu.gypi', 'webkit_support.gypi', ], } diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi index da1e973..2d7300f 100644 --- a/webkit/support/webkit_support.gypi +++ b/webkit/support/webkit_support.gypi @@ -20,6 +20,7 @@ 'database', 'fileapi', 'glue', + 'webkit_gpu', ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', # for a header generated by grit -- cgit v1.1