diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-26 03:23:48 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-26 03:23:48 +0000 |
| commit | 1fb9e7ebc8d70d2cccd621f88c1653c8d66d0e2c (patch) | |
| tree | 0ec4a91b44f2761aba60c04bc5c30c249d358c20 /android_webview | |
| parent | 51f5a060ee080c0154652c8c4ae541665789bbaa (diff) | |
| download | chromium_src-1fb9e7ebc8d70d2cccd621f88c1653c8d66d0e2c.zip chromium_src-1fb9e7ebc8d70d2cccd621f88c1653c8d66d0e2c.tar.gz chromium_src-1fb9e7ebc8d70d2cccd621f88c1653c8d66d0e2c.tar.bz2 | |
Move webkit/gpu into webkit/common/gpu
The code in webkit/gpu is needed everywhere the compositor is used, which means
both renderer and browser processes. This is a bit of a bummer but hard to fix
immediately since the compositor uses WebKit::WebGraphicsContext3D. webkit/gpu
itself only depends on the context type (which is just a vtable) and a couple
exported functions from WebString, so it's not the end of the world to have it
linked into every process. This moves the code into webkit/common/ to make this
clearer.
R=piman, joth
BUG=237267
Review URL: https://chromiumcodereview.appspot.com/16046003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/android_webview.gyp | 2 | ||||
| -rw-r--r-- | android_webview/browser/gpu_memory_buffer_impl.cc | 2 | ||||
| -rw-r--r-- | android_webview/lib/main/aw_main_delegate.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 0cc2083..08d459b 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -76,7 +76,7 @@ '../skia/skia.gyp:skia', '../gpu/gpu.gyp:gles2_implementation', '../ui/gl/gl.gyp:gl', - '../webkit/gpu/webkit_gpu.gyp:webkit_gpu', + '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 'android_webview_pak', ], 'include_dirs': [ diff --git a/android_webview/browser/gpu_memory_buffer_impl.cc b/android_webview/browser/gpu_memory_buffer_impl.cc index f92aad7..9ee37738 100644 --- a/android_webview/browser/gpu_memory_buffer_impl.cc +++ b/android_webview/browser/gpu_memory_buffer_impl.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "gpu/command_buffer/client/gpu_memory_buffer.h" #include "ui/gfx/size.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace android_webview { diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index 665bdb8..e659ce3 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -22,7 +22,7 @@ #include "content/public/browser/browser_main_runner.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace android_webview { |