diff options
| author | sky <sky@chromium.org> | 2015-04-23 09:20:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 16:20:15 +0000 |
| commit | d866af3aee3eff86fcc93f24d77bef4425b80b5a (patch) | |
| tree | a56f26a75a7809e7556e07b1a8cf09fd073bfe7d /mojo/gles2 | |
| parent | 29b6f6fa8785ed80c2fcf043bb0619f3f8b80065 (diff) | |
| download | chromium_src-d866af3aee3eff86fcc93f24d77bef4425b80b5a.zip chromium_src-d866af3aee3eff86fcc93f24d77bef4425b80b5a.tar.gz chromium_src-d866af3aee3eff86fcc93f24d77bef4425b80b5a.tar.bz2 | |
Moves services implementations out of third_party/mojo_services
Most go into components/, with the exception of events and
input_events. They are in ui/mojo now.
R=ben@chromium.org, jam@chromium.org, jochen@chromium.org
TBR=jochen@chromium.org
BUG=479353
Review URL: https://codereview.chromium.org/1085233004
Cr-Commit-Position: refs/heads/master@{#326535}
Diffstat (limited to 'mojo/gles2')
| -rw-r--r-- | mojo/gles2/BUILD.gn | 2 | ||||
| -rw-r--r-- | mojo/gles2/DEPS | 2 | ||||
| -rw-r--r-- | mojo/gles2/command_buffer_client_impl.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn index c6e501a..62d4d9e 100644 --- a/mojo/gles2/BUILD.gn +++ b/mojo/gles2/BUILD.gn @@ -37,6 +37,7 @@ source_set("gles2") { "//base", "//base/third_party/dynamic_annotations", "//components/gles2:lib", + "//components/gpu/public/interfaces", "//gpu/command_buffer/client", "//gpu/command_buffer/client:gles2_cmd_helper", "//gpu/command_buffer/client:gles2_implementation", @@ -47,7 +48,6 @@ source_set("gles2") { "//third_party/mojo/src/mojo/public/c/system", "//third_party/mojo/src/mojo/public/cpp/bindings", "//third_party/mojo/src/mojo/public/cpp/system", - "//third_party/mojo_services/src/gpu/public/interfaces", ] include_dirs = [ ".." ] diff --git a/mojo/gles2/DEPS b/mojo/gles2/DEPS index 9aea877..42db3a4 100644 --- a/mojo/gles2/DEPS +++ b/mojo/gles2/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+components/gles2", + "+components/gpu", "+gpu", - "+third_party/mojo_services/src/gpu", ] diff --git a/mojo/gles2/command_buffer_client_impl.h b/mojo/gles2/command_buffer_client_impl.h index 811bb07..875f7bb 100644 --- a/mojo/gles2/command_buffer_client_impl.h +++ b/mojo/gles2/command_buffer_client_impl.h @@ -9,11 +9,11 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "components/gpu/public/interfaces/command_buffer.mojom.h" #include "gpu/command_buffer/client/gpu_control.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/command_buffer_shared.h" #include "mojo/public/cpp/bindings/error_handler.h" -#include "third_party/mojo_services/src/gpu/public/interfaces/command_buffer.mojom.h" namespace base { class RunLoop; |