Restructure public side of gpu service.
This CL goes from this:
//mojo/services/public/interfaces/gpu
to this:
//mojo/services/gpu/public/interfaces
This CL also makes the Mojo-side changes necessary to roll this change into
Chromium.
TBR=beng
Review URL: https://codereview.chromium.org/788343002
diff --git a/examples/bitmap_uploader/BUILD.gn b/examples/bitmap_uploader/BUILD.gn
index 64e4806..004c4ff 100644
--- a/examples/bitmap_uploader/BUILD.gn
+++ b/examples/bitmap_uploader/BUILD.gn
@@ -11,7 +11,7 @@
public_deps = [
"//base",
"//mojo/public/c/gles2",
- "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/surfaces/public/interfaces",
]
deps = [
diff --git a/examples/bitmap_uploader/bitmap_uploader.h b/examples/bitmap_uploader/bitmap_uploader.h
index bb6d605..dfe3e4d 100644
--- a/examples/bitmap_uploader/bitmap_uploader.h
+++ b/examples/bitmap_uploader/bitmap_uploader.h
@@ -11,7 +11,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/public/c/gles2/gles2.h"
#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
diff --git a/examples/ganesh_app/BUILD.gn b/examples/ganesh_app/BUILD.gn
index ae293cc..d1ac332 100644
--- a/examples/ganesh_app/BUILD.gn
+++ b/examples/ganesh_app/BUILD.gn
@@ -32,7 +32,7 @@
"//mojo/public/interfaces/application",
"//mojo/services/geometry/public/cpp",
"//mojo/services/geometry/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/surfaces/public/cpp",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
diff --git a/examples/js/cube.js b/examples/js/cube.js
index cfeb8eb..a4c6d66 100644
--- a/examples/js/cube.js
+++ b/examples/js/cube.js
@@ -7,11 +7,11 @@
define("main", [
"console",
"mojo/services/geometry/public/interfaces/geometry.mojom",
+ "mojo/services/gpu/public/interfaces/command_buffer.mojom",
+ "mojo/services/gpu/public/interfaces/gpu.mojom",
+ "mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom",
"mojo/services/native_viewport/public/interfaces/native_viewport.mojom",
"mojo/services/public/js/application",
- "mojo/services/public/interfaces/gpu/command_buffer.mojom",
- "mojo/services/public/interfaces/gpu/gpu.mojom",
- "mojo/services/public/interfaces/gpu/viewport_parameter_listener.mojom",
"mojo/public/js/core",
"services/js/modules/gl",
"services/js/modules/clock",
diff --git a/examples/sample_app/sample_app.cc b/examples/sample_app/sample_app.cc
index 288cf7d..06e8f49 100644
--- a/examples/sample_app/sample_app.cc
+++ b/examples/sample_app/sample_app.cc
@@ -16,8 +16,8 @@
#include "mojo/public/cpp/system/core.h"
#include "mojo/public/cpp/system/macros.h"
#include "mojo/public/cpp/utility/run_loop.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
namespace examples {
diff --git a/examples/surfaces_app/BUILD.gn b/examples/surfaces_app/BUILD.gn
index 13e3dc9..578afe3 100644
--- a/examples/surfaces_app/BUILD.gn
+++ b/examples/surfaces_app/BUILD.gn
@@ -33,8 +33,8 @@
"//mojo/environment:chromium",
"//mojo/public/cpp/system",
"//mojo/services/geometry/public/interfaces",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/native_viewport/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
"//mojo/services/surfaces/public/interfaces",
]
@@ -98,7 +98,7 @@
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
"//mojo/services/geometry/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
"//skia",
diff --git a/examples/surfaces_app/child_gl_app.cc b/examples/surfaces_app/child_gl_app.cc
index 015ffde..896bf06 100644
--- a/examples/surfaces_app/child_gl_app.cc
+++ b/examples/surfaces_app/child_gl_app.cc
@@ -11,7 +11,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/bindings/string.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
namespace mojo {
namespace examples {
diff --git a/examples/surfaces_app/surfaces_app.cc b/examples/surfaces_app/surfaces_app.cc
index f57a30e..e0f972d 100644
--- a/examples/surfaces_app/surfaces_app.cc
+++ b/examples/surfaces_app/surfaces_app.cc
@@ -16,9 +16,9 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/system/core.h"
+#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
-#include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
#include "ui/gfx/rect.h"
diff --git a/mojo/aura/BUILD.gn b/mojo/aura/BUILD.gn
index 05782b9..add74cd 100644
--- a/mojo/aura/BUILD.gn
+++ b/mojo/aura/BUILD.gn
@@ -35,8 +35,8 @@
"//mojo/public/c/gles2",
"//mojo/public/cpp/application",
"//mojo/public/interfaces/application:application",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/native_viewport/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/view_manager/public/cpp",
]
diff --git a/mojo/aura/surface_binding.cc b/mojo/aura/surface_binding.cc
index cfd03bd..3980563 100644
--- a/mojo/aura/surface_binding.cc
+++ b/mojo/aura/surface_binding.cc
@@ -21,7 +21,7 @@
#include "mojo/converters/surfaces/surfaces_type_converters.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
#include "mojo/services/view_manager/public/cpp/view.h"
diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn
index cdca35f..92b2375 100644
--- a/mojo/gles2/BUILD.gn
+++ b/mojo/gles2/BUILD.gn
@@ -46,7 +46,7 @@
"//mojo/public/c/system",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/gpu/public/interfaces",
"//services/gles2:lib",
]
}
diff --git a/mojo/gles2/command_buffer_client_impl.h b/mojo/gles2/command_buffer_client_impl.h
index 6b4f244..b37da0a 100644
--- a/mojo/gles2/command_buffer_client_impl.h
+++ b/mojo/gles2/command_buffer_client_impl.h
@@ -13,7 +13,7 @@
#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 "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
+#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
namespace base {
class RunLoop;
diff --git a/mojo/gpu/BUILD.gn b/mojo/gpu/BUILD.gn
index bd61934..010a7d5 100644
--- a/mojo/gpu/BUILD.gn
+++ b/mojo/gpu/BUILD.gn
@@ -26,6 +26,6 @@
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
"//mojo/services/geometry/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/gpu/public/interfaces",
]
}
diff --git a/mojo/gpu/gl_context.cc b/mojo/gpu/gl_context.cc
index 81ae14a..ab96407 100644
--- a/mojo/gpu/gl_context.cc
+++ b/mojo/gpu/gl_context.cc
@@ -6,7 +6,7 @@
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
namespace mojo {
diff --git a/mojo/services/public/interfaces/gpu/BUILD.gn b/mojo/services/gpu/public/interfaces/BUILD.gn
similarity index 94%
rename from mojo/services/public/interfaces/gpu/BUILD.gn
rename to mojo/services/gpu/public/interfaces/BUILD.gn
index 39aa4f1..e5bcc15 100644
--- a/mojo/services/public/interfaces/gpu/BUILD.gn
+++ b/mojo/services/gpu/public/interfaces/BUILD.gn
@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
-mojom("gpu") {
+mojom("interfaces") {
sources = [
"command_buffer.mojom",
"gpu.mojom",
diff --git a/mojo/services/public/interfaces/gpu/command_buffer.mojom b/mojo/services/gpu/public/interfaces/command_buffer.mojom
similarity index 95%
rename from mojo/services/public/interfaces/gpu/command_buffer.mojom
rename to mojo/services/gpu/public/interfaces/command_buffer.mojom
index df4c036..5301aea 100644
--- a/mojo/services/public/interfaces/gpu/command_buffer.mojom
+++ b/mojo/services/gpu/public/interfaces/command_buffer.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/gpu/gpu_capabilities.mojom";
+import "mojo/services/gpu/public/interfaces/gpu_capabilities.mojom";
struct CommandBufferState {
int32 num_entries;
diff --git a/mojo/services/public/interfaces/gpu/gpu.mojom b/mojo/services/gpu/public/interfaces/gpu.mojom
similarity index 81%
rename from mojo/services/public/interfaces/gpu/gpu.mojom
rename to mojo/services/gpu/public/interfaces/gpu.mojom
index f3187e3..4b74035 100644
--- a/mojo/services/public/interfaces/gpu/gpu.mojom
+++ b/mojo/services/gpu/public/interfaces/gpu.mojom
@@ -5,8 +5,8 @@
module mojo;
import "mojo/services/geometry/public/interfaces/geometry.mojom";
-import "mojo/services/public/interfaces/gpu/command_buffer.mojom";
-import "mojo/services/public/interfaces/gpu/viewport_parameter_listener.mojom";
+import "mojo/services/gpu/public/interfaces/command_buffer.mojom";
+import "mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom";
interface Gpu {
CreateOnscreenGLES2Context(uint64 native_viewport_id,
diff --git a/mojo/services/public/interfaces/gpu/gpu_capabilities.mojom b/mojo/services/gpu/public/interfaces/gpu_capabilities.mojom
similarity index 100%
rename from mojo/services/public/interfaces/gpu/gpu_capabilities.mojom
rename to mojo/services/gpu/public/interfaces/gpu_capabilities.mojom
diff --git a/mojo/services/public/interfaces/gpu/viewport_parameter_listener.mojom b/mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom
similarity index 100%
rename from mojo/services/public/interfaces/gpu/viewport_parameter_listener.mojom
rename to mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom
diff --git a/mojo/services/native_viewport/public/interfaces/BUILD.gn b/mojo/services/native_viewport/public/interfaces/BUILD.gn
index 07a4739..eda552f 100644
--- a/mojo/services/native_viewport/public/interfaces/BUILD.gn
+++ b/mojo/services/native_viewport/public/interfaces/BUILD.gn
@@ -11,7 +11,7 @@
public_deps = [
"//mojo/services/geometry/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/public/interfaces/input_events",
"//mojo/services/surfaces/public/interfaces:surface_id",
]
diff --git a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom b/mojo/services/native_viewport/public/interfaces/native_viewport.mojom
index 087a2ab..7772434 100644
--- a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom
+++ b/mojo/services/native_viewport/public/interfaces/native_viewport.mojom
@@ -5,7 +5,7 @@
module mojo;
import "mojo/services/geometry/public/interfaces/geometry.mojom";
-import "mojo/services/public/interfaces/gpu/command_buffer.mojom";
+import "mojo/services/gpu/public/interfaces/command_buffer.mojom";
import "mojo/services/public/interfaces/input_events/input_events.mojom";
import "mojo/services/surfaces/public/interfaces/surface_id.mojom";
diff --git a/mojo/services/public/mojo_services_public.gyp b/mojo/services/public/mojo_services_public.gyp
index b18a97a..7059800 100644
--- a/mojo/services/public/mojo_services_public.gyp
+++ b/mojo/services/public/mojo_services_public.gyp
@@ -76,14 +76,14 @@
],
},
{
- # GN version: //mojo/services/public/interfaces/gpu
+ # GN version: //mojo/services/gpu/public/interfaces
'target_name': 'mojo_gpu_bindings',
'type': 'static_library',
'sources': [
- 'interfaces/gpu/command_buffer.mojom',
- 'interfaces/gpu/gpu.mojom',
- 'interfaces/gpu/gpu_capabilities.mojom',
- 'interfaces/gpu/viewport_parameter_listener.mojom',
+ '../gpu/public/interfaces/command_buffer.mojom',
+ '../gpu/public/interfaces/gpu.mojom',
+ '../gpu/public/interfaces/gpu_capabilities.mojom',
+ '../gpu/public/interfaces/viewport_parameter_listener.mojom',
],
'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
'dependencies': [
diff --git a/mojo/services/surfaces/public/interfaces/BUILD.gn b/mojo/services/surfaces/public/interfaces/BUILD.gn
index 1ec5525..9e5ee48 100644
--- a/mojo/services/surfaces/public/interfaces/BUILD.gn
+++ b/mojo/services/surfaces/public/interfaces/BUILD.gn
@@ -14,8 +14,8 @@
deps = [
":surface_id",
"//mojo/services/geometry/public/interfaces",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/native_viewport/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
]
}
diff --git a/mojo/services/surfaces/public/interfaces/surfaces.mojom b/mojo/services/surfaces/public/interfaces/surfaces.mojom
index 0311814..46fb618 100644
--- a/mojo/services/surfaces/public/interfaces/surfaces.mojom
+++ b/mojo/services/surfaces/public/interfaces/surfaces.mojom
@@ -5,8 +5,8 @@
module mojo;
import "mojo/services/geometry/public/interfaces/geometry.mojom";
-import "mojo/services/public/interfaces/gpu/command_buffer.mojom";
-import "mojo/services/public/interfaces/gpu/viewport_parameter_listener.mojom";
+import "mojo/services/gpu/public/interfaces/command_buffer.mojom";
+import "mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom";
import "mojo/services/surfaces/public/interfaces/quads.mojom";
import "mojo/services/surfaces/public/interfaces/surface_id.mojom";
diff --git a/mojo/tools/roll/rev_sdk.py b/mojo/tools/roll/rev_sdk.py
index 8ca941f..5d88381 100755
--- a/mojo/tools/roll/rev_sdk.py
+++ b/mojo/tools/roll/rev_sdk.py
@@ -15,6 +15,7 @@
"mojo/services/public",
"mojo/services/accessibility/public",
"mojo/services/geometry/public",
+ "mojo/services/gpu/public",
"mojo/services/native_viewport/public",
"mojo/services/network/public",
"mojo/services/surfaces/public",
diff --git a/services/gles2/BUILD.gn b/services/gles2/BUILD.gn
index 60632a5..73c2917 100644
--- a/services/gles2/BUILD.gn
+++ b/services/gles2/BUILD.gn
@@ -23,7 +23,7 @@
"//mojo/converters/geometry",
"//mojo/public/cpp/bindings",
"//mojo/services/geometry/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/gpu/public/interfaces",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gl",
@@ -43,6 +43,6 @@
"//gpu/command_buffer/common",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/gpu/public/interfaces",
]
}
diff --git a/services/gles2/command_buffer_driver.h b/services/gles2/command_buffer_driver.h
index 9305142..f157ca6 100644
--- a/services/gles2/command_buffer_driver.h
+++ b/services/gles2/command_buffer_driver.h
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/single_thread_task_runner.h"
#include "base/timer/timer.h"
-#include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
+#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
diff --git a/services/gles2/command_buffer_impl.h b/services/gles2/command_buffer_impl.h
index def9f73..a165772 100644
--- a/services/gles2/command_buffer_impl.h
+++ b/services/gles2/command_buffer_impl.h
@@ -9,8 +9,8 @@
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
-#include "mojo/services/public/interfaces/gpu/viewport_parameter_listener.mojom.h"
+#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom.h"
namespace gpu {
class SyncPointManager;
diff --git a/services/gles2/command_buffer_type_conversions.cc b/services/gles2/command_buffer_type_conversions.cc
index ad514e7..831560c 100644
--- a/services/gles2/command_buffer_type_conversions.cc
+++ b/services/gles2/command_buffer_type_conversions.cc
@@ -4,7 +4,7 @@
#include "services/gles2/command_buffer_type_conversions.h"
-#include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
+#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
namespace mojo {
diff --git a/services/gles2/command_buffer_type_conversions.h b/services/gles2/command_buffer_type_conversions.h
index 913ff80..ab996e2 100644
--- a/services/gles2/command_buffer_type_conversions.h
+++ b/services/gles2/command_buffer_type_conversions.h
@@ -8,7 +8,7 @@
#include "gpu/command_buffer/common/capabilities.h"
#include "gpu/command_buffer/common/command_buffer.h"
#include "mojo/public/cpp/bindings/type_converter.h"
-#include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
+#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
namespace mojo {
diff --git a/services/gles2/gpu_impl.h b/services/gles2/gpu_impl.h
index 09603b5..b8bce82 100644
--- a/services/gles2/gpu_impl.h
+++ b/services/gles2/gpu_impl.h
@@ -11,8 +11,8 @@
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
-#include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
+#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
namespace gfx {
class GLShareGroup;
diff --git a/services/native_viewport/BUILD.gn b/services/native_viewport/BUILD.gn
index e4f1472..2ecc2e3 100644
--- a/services/native_viewport/BUILD.gn
+++ b/services/native_viewport/BUILD.gn
@@ -84,8 +84,8 @@
"//mojo/environment:chromium",
"//services/gles2",
"//mojo/services/geometry/public/interfaces",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/native_viewport/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
"//mojo/services/surfaces/public/cpp",
"//mojo/services/surfaces/public/interfaces",
"//ui/events",
diff --git a/services/native_viewport/native_viewport_impl.h b/services/native_viewport/native_viewport_impl.h
index 24835f3..829fb2a 100644
--- a/services/native_viewport/native_viewport_impl.h
+++ b/services/native_viewport/native_viewport_impl.h
@@ -8,8 +8,8 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "cc/surfaces/surface_id.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
#include "services/native_viewport/platform_viewport.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/services/native_viewport/viewport_surface.h b/services/native_viewport/viewport_surface.h
index bee7b57..e74d4fc 100644
--- a/services/native_viewport/viewport_surface.h
+++ b/services/native_viewport/viewport_surface.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "cc/surfaces/surface_id.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
#include "ui/gfx/native_widget_types.h"
diff --git a/services/surfaces/BUILD.gn b/services/surfaces/BUILD.gn
index a441655..7007cfb 100644
--- a/services/surfaces/BUILD.gn
+++ b/services/surfaces/BUILD.gn
@@ -32,7 +32,7 @@
"//mojo/public/c/gles2",
"//mojo/public/cpp/bindings",
"//mojo/services/geometry/public/interfaces",
- "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/surfaces/public/interfaces",
]
}
diff --git a/services/surfaces/surfaces_impl.h b/services/surfaces/surfaces_impl.h
index d73a92e..d59e40a 100644
--- a/services/surfaces/surfaces_impl.h
+++ b/services/surfaces/surfaces_impl.h
@@ -11,8 +11,8 @@
#include "mojo/common/weak_binding_set.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/public/interfaces/gpu/command_buffer.mojom.h"
-#include "mojo/services/public/interfaces/gpu/viewport_parameter_listener.mojom.h"
+#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
namespace cc {
diff --git a/services/view_manager/display_manager.cc b/services/view_manager/display_manager.cc
index bca8c01..8435b32 100644
--- a/services/view_manager/display_manager.cc
+++ b/services/view_manager/display_manager.cc
@@ -9,7 +9,7 @@
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
#include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
+#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
#include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
#include "services/view_manager/connection_manager.h"
diff --git a/sky/viewer/BUILD.gn b/sky/viewer/BUILD.gn
index 913cff4..2f52d9d 100644
--- a/sky/viewer/BUILD.gn
+++ b/sky/viewer/BUILD.gn
@@ -49,9 +49,9 @@
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
+ "//mojo/services/gpu/public/interfaces",
"//mojo/services/network/public/interfaces",
"//mojo/services/public/interfaces/content_handler",
- "//mojo/services/public/interfaces/gpu",
"//mojo/services/public/interfaces/input_events",
"//mojo/services/public/interfaces/navigation",
"//mojo/services/surfaces/public/interfaces",
