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 /ui/compositor | |
| 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 'ui/compositor')
| -rw-r--r-- | ui/compositor/DEPS | 9 | ||||
| -rw-r--r-- | ui/compositor/compositor.cc | 4 | ||||
| -rw-r--r-- | ui/compositor/compositor.gyp | 2 | ||||
| -rw-r--r-- | ui/compositor/test/DEPS | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/ui/compositor/DEPS b/ui/compositor/DEPS index 95ad49f..7dbb84f 100644 --- a/ui/compositor/DEPS +++ b/ui/compositor/DEPS @@ -3,8 +3,9 @@ # Compositor out of WebKit. include_rules = [ "+cc", - "+third_party/WebKit/Source/Platform/chromium/public", - "+third_party/WebKit/Source/WebKit/chromium/public", - "+webkit/glue", - "+webkit/gpu", + "+third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h", + "+third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h", + "+third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h", + "+third_party/WebKit/Source/Platform/chromium/public/WebString.h", + "+webkit/common/gpu", ] diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index a8306fe..d605478 100644 --- a/ui/compositor/compositor.cc +++ b/ui/compositor/compositor.cc @@ -32,8 +32,8 @@ #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_surface.h" #include "ui/gl/gl_switches.h" -#include "webkit/gpu/grcontext_for_webgraphicscontext3d.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #if defined(OS_CHROMEOS) #include "base/chromeos/chromeos_version.h" diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 464c43d..226b2c4 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -18,7 +18,7 @@ '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', - '<(DEPTH)/webkit/gpu/webkit_gpu.gyp:webkit_gpu', + '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', ], 'defines': [ 'COMPOSITOR_IMPLEMENTATION', diff --git a/ui/compositor/test/DEPS b/ui/compositor/test/DEPS new file mode 100644 index 0000000..e85ba2d --- /dev/null +++ b/ui/compositor/test/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + "+third_party/WebKit/Source/WebKit/chromium/public", + "+webkit/glue", +] |