Restructure public side of geometry service.
This CL goes from this:
//mojo/services/public/cpp/geometry
//mojo/services/public/interfaces/geometry
to this:
//mojo/services/geometry/public/cpp
//mojo/services/geometry/public/interfaces
This CL also makes the Mojo-side changes required to roll this change into
Chromium.
TBR=beng
Review URL: https://codereview.chromium.org/790213002
diff --git a/examples/aura_demo/BUILD.gn b/examples/aura_demo/BUILD.gn
index 8b4045b..88be9fe 100644
--- a/examples/aura_demo/BUILD.gn
+++ b/examples/aura_demo/BUILD.gn
@@ -25,7 +25,7 @@
"//mojo/converters/geometry",
"//mojo/aura",
"//mojo/public/cpp/system",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/native_viewport",
"//mojo/services/view_manager/public/cpp",
]
diff --git a/examples/bitmap_uploader/BUILD.gn b/examples/bitmap_uploader/BUILD.gn
index 8f6150b..64e4806 100644
--- a/examples/bitmap_uploader/BUILD.gn
+++ b/examples/bitmap_uploader/BUILD.gn
@@ -18,8 +18,8 @@
"//mojo/application",
"//mojo/public/cpp/bindings:bindings",
"//mojo/public/interfaces/application",
- "//mojo/services/public/cpp/geometry",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/cpp",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/input_events:input_events",
"//mojo/services/surfaces/public/cpp",
"//mojo/services/surfaces/public/interfaces:surface_id",
diff --git a/examples/bitmap_uploader/bitmap_uploader.cc b/examples/bitmap_uploader/bitmap_uploader.cc
index 5b957e9..86e3bc2 100644
--- a/examples/bitmap_uploader/bitmap_uploader.cc
+++ b/examples/bitmap_uploader/bitmap_uploader.cc
@@ -14,7 +14,7 @@
#include "mojo/public/c/gles2/gles2.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/public/cpp/geometry/geometry_util.h"
+#include "mojo/services/geometry/public/cpp/geometry_util.h"
#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
#include "mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h"
#include "third_party/khronos/GLES2/gl2.h"
diff --git a/examples/bitmap_uploader/bitmap_uploader.h b/examples/bitmap_uploader/bitmap_uploader.h
index 9f67239..bb6d605 100644
--- a/examples/bitmap_uploader/bitmap_uploader.h
+++ b/examples/bitmap_uploader/bitmap_uploader.h
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/c/gles2/gles2.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
diff --git a/examples/browser/BUILD.gn b/examples/browser/BUILD.gn
index 657f3fd..e936486 100644
--- a/examples/browser/BUILD.gn
+++ b/examples/browser/BUILD.gn
@@ -21,7 +21,7 @@
"//mojo/common",
"//mojo/converters/geometry",
"//mojo/converters/input_events",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/input_events",
"//mojo/services/public/interfaces/navigation",
"//mojo/services/view_manager/public/cpp",
diff --git a/examples/embedded_app/BUILD.gn b/examples/embedded_app/BUILD.gn
index b363927..2d6d9e4 100644
--- a/examples/embedded_app/BUILD.gn
+++ b/examples/embedded_app/BUILD.gn
@@ -17,7 +17,7 @@
"//mojo/public/c/gles2",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/navigation",
"//mojo/services/view_manager/public/cpp",
"//ui/events:events_base",
diff --git a/examples/ganesh_app/BUILD.gn b/examples/ganesh_app/BUILD.gn
index c081eee..ae293cc 100644
--- a/examples/ganesh_app/BUILD.gn
+++ b/examples/ganesh_app/BUILD.gn
@@ -30,8 +30,8 @@
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
- "//mojo/services/public/cpp/geometry",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/cpp",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/gpu",
"//mojo/services/surfaces/public/cpp",
"//mojo/services/surfaces/public/interfaces",
diff --git a/examples/ganesh_app/texture_uploader.cc b/examples/ganesh_app/texture_uploader.cc
index 2273591..7b77d8d 100644
--- a/examples/ganesh_app/texture_uploader.cc
+++ b/examples/ganesh_app/texture_uploader.cc
@@ -14,7 +14,7 @@
#include "mojo/public/c/gles2/gles2.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/public/cpp/geometry/geometry_util.h"
+#include "mojo/services/geometry/public/cpp/geometry_util.h"
#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
namespace examples {
diff --git a/examples/ganesh_app/texture_uploader.h b/examples/ganesh_app/texture_uploader.h
index 54cc245..09b1e1a 100644
--- a/examples/ganesh_app/texture_uploader.h
+++ b/examples/ganesh_app/texture_uploader.h
@@ -10,7 +10,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/gpu/gl_context.h"
#include "mojo/gpu/gl_texture.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.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/js/cube.js b/examples/js/cube.js
index 0f772ec..df7c303 100644
--- a/examples/js/cube.js
+++ b/examples/js/cube.js
@@ -6,9 +6,9 @@
define("main", [
"console",
+ "mojo/services/geometry/public/interfaces/geometry.mojom",
"mojo/services/public/js/application",
"mojo/services/public/interfaces/gpu/command_buffer.mojom",
- "mojo/services/public/interfaces/geometry/geometry.mojom",
"mojo/services/public/interfaces/gpu/gpu.mojom",
"mojo/services/public/interfaces/native_viewport/native_viewport.mojom",
"mojo/services/public/interfaces/gpu/viewport_parameter_listener.mojom",
diff --git a/examples/keyboard/BUILD.gn b/examples/keyboard/BUILD.gn
index b5bf557..0ef968b 100644
--- a/examples/keyboard/BUILD.gn
+++ b/examples/keyboard/BUILD.gn
@@ -27,7 +27,7 @@
"//mojo/common",
"//mojo/converters/geometry",
"//mojo/converters/input_events",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/navigation",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/view_manager/public/interfaces",
diff --git a/examples/nesting_app/BUILD.gn b/examples/nesting_app/BUILD.gn
index f0d95e6..7a7c1d7 100644
--- a/examples/nesting_app/BUILD.gn
+++ b/examples/nesting_app/BUILD.gn
@@ -16,7 +16,7 @@
"//mojo/application",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/navigation",
"//mojo/services/view_manager/public/cpp",
"//skia",
diff --git a/examples/sample_app/BUILD.gn b/examples/sample_app/BUILD.gn
index c043bad..ece7bdb 100644
--- a/examples/sample_app/BUILD.gn
+++ b/examples/sample_app/BUILD.gn
@@ -21,7 +21,7 @@
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/native_viewport",
]
}
diff --git a/examples/sample_app/gles2_client_impl.h b/examples/sample_app/gles2_client_impl.h
index 7f9c3ac..b3a55cb 100644
--- a/examples/sample_app/gles2_client_impl.h
+++ b/examples/sample_app/gles2_client_impl.h
@@ -7,7 +7,7 @@
#include "examples/sample_app/spinning_cube.h"
#include "mojo/public/c/gles2/gles2.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
#include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h"
namespace examples {
diff --git a/examples/sky_compositor_app/BUILD.gn b/examples/sky_compositor_app/BUILD.gn
index b91fddc..7c1b7d1 100644
--- a/examples/sky_compositor_app/BUILD.gn
+++ b/examples/sky_compositor_app/BUILD.gn
@@ -19,7 +19,7 @@
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//skia",
"//sky/compositor",
diff --git a/examples/surfaces_app/BUILD.gn b/examples/surfaces_app/BUILD.gn
index 378af72..cdadd82 100644
--- a/examples/surfaces_app/BUILD.gn
+++ b/examples/surfaces_app/BUILD.gn
@@ -32,7 +32,7 @@
"//mojo/converters/surfaces",
"//mojo/environment:chromium",
"//mojo/public/cpp/system",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/gpu",
"//mojo/services/public/interfaces/native_viewport",
"//mojo/services/surfaces/public/interfaces",
@@ -61,7 +61,7 @@
"//mojo/converters/surfaces",
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
"//skia",
@@ -97,7 +97,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/gpu",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
@@ -129,7 +129,7 @@
mojom("bindings") {
deps = [
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
]
diff --git a/examples/surfaces_app/child.mojom b/examples/surfaces_app/child.mojom
index 1180784..1dd60cf 100644
--- a/examples/surfaces_app/child.mojom
+++ b/examples/surfaces_app/child.mojom
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+import "mojo/services/geometry/public/interfaces/geometry.mojom";
import "mojo/services/surfaces/public/interfaces/quads.mojom";
import "mojo/services/surfaces/public/interfaces/surface_id.mojom";
diff --git a/examples/window_manager/BUILD.gn b/examples/window_manager/BUILD.gn
index fc8623d..ead2046 100644
--- a/examples/window_manager/BUILD.gn
+++ b/examples/window_manager/BUILD.gn
@@ -28,7 +28,7 @@
"//mojo/public/c/gles2",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/input_events",
"//mojo/services/public/interfaces/navigation",
"//mojo/services/view_manager/public/cpp",
@@ -50,6 +50,6 @@
"window_manager.mojom",
]
deps = [
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
]
}
diff --git a/examples/window_manager/window_manager.mojom b/examples/window_manager/window_manager.mojom
index 6ade711..94fb80b 100644
--- a/examples/window_manager/window_manager.mojom
+++ b/examples/window_manager/window_manager.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+import "mojo/services/geometry/public/interfaces/geometry.mojom";
interface IWindowManager {
CloseWindow(uint32 node_id);
diff --git a/mojo/converters/geometry/BUILD.gn b/mojo/converters/geometry/BUILD.gn
index 2817356..a5d6699 100644
--- a/mojo/converters/geometry/BUILD.gn
+++ b/mojo/converters/geometry/BUILD.gn
@@ -14,7 +14,7 @@
"//ui/gfx/geometry",
"//mojo/environment:chromium",
"//mojo/public/c/system",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
]
defines = [ "MOJO_GEOMETRY_IMPLEMENTATION" ]
diff --git a/mojo/converters/geometry/geometry_type_converters.h b/mojo/converters/geometry/geometry_type_converters.h
index bdb29e7..e56be9f 100644
--- a/mojo/converters/geometry/geometry_type_converters.h
+++ b/mojo/converters/geometry/geometry_type_converters.h
@@ -6,7 +6,7 @@
#define MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
#include "mojo/converters/geometry/mojo_geometry_export.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/point_f.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/mojo/converters/input_events/BUILD.gn b/mojo/converters/input_events/BUILD.gn
index 4b0fb46..97c1abb 100644
--- a/mojo/converters/input_events/BUILD.gn
+++ b/mojo/converters/input_events/BUILD.gn
@@ -20,7 +20,7 @@
"//mojo/converters/geometry",
"//mojo/environment:chromium",
"//mojo/public/c/system",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/input_events",
- "//mojo/services/public/interfaces/geometry",
]
}
diff --git a/mojo/converters/surfaces/tests/BUILD.gn b/mojo/converters/surfaces/tests/BUILD.gn
index 0374ee1..982afde 100644
--- a/mojo/converters/surfaces/tests/BUILD.gn
+++ b/mojo/converters/surfaces/tests/BUILD.gn
@@ -14,7 +14,7 @@
"//mojo/converters/surfaces",
"//mojo/edk/test:run_all_unittests",
"//mojo/environment:chromium",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//skia",
"//testing/gtest",
diff --git a/mojo/gpu/BUILD.gn b/mojo/gpu/BUILD.gn
index 13418b1..bd61934 100644
--- a/mojo/gpu/BUILD.gn
+++ b/mojo/gpu/BUILD.gn
@@ -25,7 +25,7 @@
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/gpu",
]
}
diff --git a/mojo/gpu/gl_texture.h b/mojo/gpu/gl_texture.h
index 82251f8..4a2e71b 100644
--- a/mojo/gpu/gl_texture.h
+++ b/mojo/gpu/gl_texture.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "mojo/gpu/gl_context.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
namespace mojo {
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index 87f5882..0fa4df8 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -6,12 +6,12 @@
group("services") {
deps = [
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/network",
"//mojo/services/network/public/interfaces",
"//mojo/services/public/interfaces/accessibility",
"//mojo/services/public/interfaces/clipboard",
"//mojo/services/public/interfaces/content_handler",
- "//mojo/services/public/interfaces/geometry",
"//mojo/services/public/interfaces/input_events",
"//mojo/services/public/interfaces/native_viewport",
"//mojo/services/public/interfaces/navigation",
diff --git a/mojo/services/public/cpp/geometry/BUILD.gn b/mojo/services/geometry/public/cpp/BUILD.gn
similarity index 74%
rename from mojo/services/public/cpp/geometry/BUILD.gn
rename to mojo/services/geometry/public/cpp/BUILD.gn
index 349a865..ab410af 100644
--- a/mojo/services/public/cpp/geometry/BUILD.gn
+++ b/mojo/services/geometry/public/cpp/BUILD.gn
@@ -2,12 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-source_set("geometry") {
+source_set("cpp") {
sources = [
"geometry_util.h",
]
deps = [
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
]
}
diff --git a/mojo/services/public/cpp/geometry/geometry_util.h b/mojo/services/geometry/public/cpp/geometry_util.h
similarity index 77%
rename from mojo/services/public/cpp/geometry/geometry_util.h
rename to mojo/services/geometry/public/cpp/geometry_util.h
index c238678..45a8b4b 100644
--- a/mojo/services/public/cpp/geometry/geometry_util.h
+++ b/mojo/services/geometry/public/cpp/geometry_util.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_UTIL_H_
-#define MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_UTIL_H_
+#ifndef MOJO_SERVICES_GEOMETRY_PUBLIC_CPP_GEOMETRY_UTIL_H_
+#define MOJO_SERVICES_GEOMETRY_PUBLIC_CPP_GEOMETRY_UTIL_H_
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
namespace mojo {
@@ -36,4 +36,4 @@
}
-#endif // MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_UTIL_H_
\ No newline at end of file
+#endif // MOJO_SERVICES_GEOMETRY_PUBLIC_CPP_GEOMETRY_UTIL_H_
\ No newline at end of file
diff --git a/mojo/services/public/interfaces/geometry/BUILD.gn b/mojo/services/geometry/public/interfaces/BUILD.gn
similarity index 91%
rename from mojo/services/public/interfaces/geometry/BUILD.gn
rename to mojo/services/geometry/public/interfaces/BUILD.gn
index 17b2d25..3e8ed26 100644
--- a/mojo/services/public/interfaces/geometry/BUILD.gn
+++ b/mojo/services/geometry/public/interfaces/BUILD.gn
@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
-mojom("geometry") {
+mojom("interfaces") {
sources = [
"geometry.mojom",
]
diff --git a/mojo/services/public/interfaces/geometry/geometry.mojom b/mojo/services/geometry/public/interfaces/geometry.mojom
similarity index 100%
rename from mojo/services/public/interfaces/geometry/geometry.mojom
rename to mojo/services/geometry/public/interfaces/geometry.mojom
diff --git a/mojo/services/public/interfaces/accessibility/BUILD.gn b/mojo/services/public/interfaces/accessibility/BUILD.gn
index 64b570b..2ea1415 100644
--- a/mojo/services/public/interfaces/accessibility/BUILD.gn
+++ b/mojo/services/public/interfaces/accessibility/BUILD.gn
@@ -10,6 +10,6 @@
]
deps = [
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
]
}
diff --git a/mojo/services/public/interfaces/accessibility/accessibility.mojom b/mojo/services/public/interfaces/accessibility/accessibility.mojom
index abc97c3..de8aa82 100644
--- a/mojo/services/public/interfaces/accessibility/accessibility.mojom
+++ b/mojo/services/public/interfaces/accessibility/accessibility.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+import "mojo/services/geometry/public/interfaces/geometry.mojom";
interface AxProvider {
GetTree() => (array<AxNode> nodes);
diff --git a/mojo/services/public/interfaces/gpu/BUILD.gn b/mojo/services/public/interfaces/gpu/BUILD.gn
index 26d2dbd..39aa4f1 100644
--- a/mojo/services/public/interfaces/gpu/BUILD.gn
+++ b/mojo/services/public/interfaces/gpu/BUILD.gn
@@ -13,6 +13,6 @@
]
deps = [
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
]
}
diff --git a/mojo/services/public/interfaces/gpu/gpu.mojom b/mojo/services/public/interfaces/gpu/gpu.mojom
index a765c1c..f3187e3 100644
--- a/mojo/services/public/interfaces/gpu/gpu.mojom
+++ b/mojo/services/public/interfaces/gpu/gpu.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+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";
diff --git a/mojo/services/public/interfaces/input_events/BUILD.gn b/mojo/services/public/interfaces/input_events/BUILD.gn
index 0385091..de7a3a9 100644
--- a/mojo/services/public/interfaces/input_events/BUILD.gn
+++ b/mojo/services/public/interfaces/input_events/BUILD.gn
@@ -12,6 +12,6 @@
]
deps = [
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
]
}
diff --git a/mojo/services/public/interfaces/input_events/input_events.mojom b/mojo/services/public/interfaces/input_events/input_events.mojom
index d06ee85..2611450 100644
--- a/mojo/services/public/interfaces/input_events/input_events.mojom
+++ b/mojo/services/public/interfaces/input_events/input_events.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+import "mojo/services/geometry/public/interfaces/geometry.mojom";
import "mojo/services/public/interfaces/input_events/input_event_constants.mojom";
import "mojo/services/public/interfaces/input_events/input_key_codes.mojom";
diff --git a/mojo/services/public/interfaces/native_viewport/BUILD.gn b/mojo/services/public/interfaces/native_viewport/BUILD.gn
index 04502af..f0967e5 100644
--- a/mojo/services/public/interfaces/native_viewport/BUILD.gn
+++ b/mojo/services/public/interfaces/native_viewport/BUILD.gn
@@ -10,7 +10,7 @@
]
public_deps = [
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/gpu",
"//mojo/services/public/interfaces/input_events",
"//mojo/services/surfaces/public/interfaces:surface_id",
diff --git a/mojo/services/public/interfaces/native_viewport/native_viewport.mojom b/mojo/services/public/interfaces/native_viewport/native_viewport.mojom
index d5287f5..087a2ab 100644
--- a/mojo/services/public/interfaces/native_viewport/native_viewport.mojom
+++ b/mojo/services/public/interfaces/native_viewport/native_viewport.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+import "mojo/services/geometry/public/interfaces/geometry.mojom";
import "mojo/services/public/interfaces/gpu/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 495c215..08bfe42 100644
--- a/mojo/services/public/mojo_services_public.gyp
+++ b/mojo/services/public/mojo_services_public.gyp
@@ -61,11 +61,11 @@
],
},
{
- # GN version: //mojo/services/public/interfaces/geometry
+ # GN version: //mojo/services/geometry/public/interfaces
'target_name': 'mojo_geometry_bindings',
'type': 'static_library',
'sources': [
- 'interfaces/geometry/geometry.mojom',
+ '../geometry/public/interfaces/geometry.mojom',
],
'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
'dependencies': [
diff --git a/mojo/services/surfaces/public/cpp/BUILD.gn b/mojo/services/surfaces/public/cpp/BUILD.gn
index 927b6f9..f8e483b 100644
--- a/mojo/services/surfaces/public/cpp/BUILD.gn
+++ b/mojo/services/surfaces/public/cpp/BUILD.gn
@@ -9,7 +9,7 @@
]
deps = [
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/surfaces/public/interfaces",
]
}
diff --git a/mojo/services/surfaces/public/cpp/DEPS b/mojo/services/surfaces/public/cpp/DEPS
index 98daf37..8f1baa0 100644
--- a/mojo/services/surfaces/public/cpp/DEPS
+++ b/mojo/services/surfaces/public/cpp/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+mojo/services/public/interfaces/geometry",
+ "+mojo/services/geometry/public/interfaces",
]
diff --git a/mojo/services/surfaces/public/cpp/surfaces_utils.cc b/mojo/services/surfaces/public/cpp/surfaces_utils.cc
index 4718407..aa8038a 100644
--- a/mojo/services/surfaces/public/cpp/surfaces_utils.cc
+++ b/mojo/services/surfaces/public/cpp/surfaces_utils.cc
@@ -4,7 +4,7 @@
#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
namespace mojo {
diff --git a/mojo/services/surfaces/public/interfaces/BUILD.gn b/mojo/services/surfaces/public/interfaces/BUILD.gn
index 6954ecd..74379ba 100644
--- a/mojo/services/surfaces/public/interfaces/BUILD.gn
+++ b/mojo/services/surfaces/public/interfaces/BUILD.gn
@@ -13,7 +13,7 @@
deps = [
":surface_id",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/gpu",
"//mojo/services/public/interfaces/native_viewport",
]
diff --git a/mojo/services/surfaces/public/interfaces/quads.mojom b/mojo/services/surfaces/public/interfaces/quads.mojom
index 89ab447..88006f7 100644
--- a/mojo/services/surfaces/public/interfaces/quads.mojom
+++ b/mojo/services/surfaces/public/interfaces/quads.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+import "mojo/services/geometry/public/interfaces/geometry.mojom";
import "mojo/services/surfaces/public/interfaces/surface_id.mojom";
struct Color {
diff --git a/mojo/services/surfaces/public/interfaces/surfaces.mojom b/mojo/services/surfaces/public/interfaces/surfaces.mojom
index 6750fd1..0311814 100644
--- a/mojo/services/surfaces/public/interfaces/surfaces.mojom
+++ b/mojo/services/surfaces/public/interfaces/surfaces.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+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/surfaces/public/interfaces/quads.mojom";
diff --git a/mojo/services/view_manager/public/cpp/BUILD.gn b/mojo/services/view_manager/public/cpp/BUILD.gn
index f042dc6..e0e6a94 100644
--- a/mojo/services/view_manager/public/cpp/BUILD.gn
+++ b/mojo/services/view_manager/public/cpp/BUILD.gn
@@ -32,7 +32,7 @@
"//mojo/public/cpp/application",
"//mojo/public/cpp/bindings:bindings",
"//mojo/public/interfaces/application",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/input_events:input_events",
"//mojo/services/surfaces/public/interfaces:surface_id",
"//mojo/services/view_manager/public/interfaces",
diff --git a/mojo/services/view_manager/public/cpp/DEPS b/mojo/services/view_manager/public/cpp/DEPS
index cc7466a..0165d5d 100644
--- a/mojo/services/view_manager/public/cpp/DEPS
+++ b/mojo/services/view_manager/public/cpp/DEPS
@@ -1,6 +1,6 @@
include_rules = [
- "+mojo/services/public/cpp/geometry",
- "+mojo/services/public/interfaces/geometry",
+ "+mojo/services/geometry/public/cpp",
+ "+mojo/services/geometry/public/interfaces",
"+mojo/services/public/interfaces/input_events",
"+mojo/services/surfaces/public/interfaces",
"+ui/gfx/geometry"
diff --git a/mojo/services/view_manager/public/cpp/tests/BUILD.gn b/mojo/services/view_manager/public/cpp/tests/BUILD.gn
index ca4aa1d..fb2ed5a 100644
--- a/mojo/services/view_manager/public/cpp/tests/BUILD.gn
+++ b/mojo/services/view_manager/public/cpp/tests/BUILD.gn
@@ -17,8 +17,8 @@
"//mojo/converters/geometry",
"//mojo/environment:chromium",
"//mojo/public/cpp/application",
- "//mojo/services/public/cpp/geometry",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/cpp",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/view_manager/public/interfaces",
"//shell:test_support",
diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc b/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
index 2061d34..0416f05 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
+++ b/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
@@ -13,7 +13,7 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/public/cpp/geometry/geometry_util.h"
+#include "mojo/services/geometry/public/cpp/geometry_util.h"
#include "mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h"
#include "mojo/services/view_manager/public/cpp/lib/view_private.h"
#include "mojo/services/view_manager/public/cpp/util.h"
diff --git a/mojo/services/view_manager/public/cpp/view.h b/mojo/services/view_manager/public/cpp/view.h
index 9e64ab9..8569616 100644
--- a/mojo/services/view_manager/public/cpp/view.h
+++ b/mojo/services/view_manager/public/cpp/view.h
@@ -11,7 +11,7 @@
#include "base/observer_list.h"
#include "mojo/public/cpp/bindings/array.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
#include "mojo/services/view_manager/public/cpp/types.h"
#include "mojo/services/view_manager/public/interfaces/view_manager_constants.mojom.h"
diff --git a/mojo/services/view_manager/public/interfaces/BUILD.gn b/mojo/services/view_manager/public/interfaces/BUILD.gn
index ad6f4b9..4252ca9 100644
--- a/mojo/services/view_manager/public/interfaces/BUILD.gn
+++ b/mojo/services/view_manager/public/interfaces/BUILD.gn
@@ -13,7 +13,7 @@
deps = [
"//mojo/public/interfaces/application",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/input_events",
"//mojo/services/surfaces/public/interfaces:surface_id",
]
diff --git a/mojo/services/view_manager/public/interfaces/animations.mojom b/mojo/services/view_manager/public/interfaces/animations.mojom
index fad22ea..fc44e0b 100644
--- a/mojo/services/view_manager/public/interfaces/animations.mojom
+++ b/mojo/services/view_manager/public/interfaces/animations.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+import "mojo/services/geometry/public/interfaces/geometry.mojom";
enum AnimationTweenType {
LINEAR,
diff --git a/mojo/services/view_manager/public/interfaces/view_manager.mojom b/mojo/services/view_manager/public/interfaces/view_manager.mojom
index 9a5ed75..c0967c3 100644
--- a/mojo/services/view_manager/public/interfaces/view_manager.mojom
+++ b/mojo/services/view_manager/public/interfaces/view_manager.mojom
@@ -5,7 +5,7 @@
module mojo;
import "mojo/public/interfaces/application/service_provider.mojom";
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+import "mojo/services/geometry/public/interfaces/geometry.mojom";
import "mojo/services/public/interfaces/input_events/input_events.mojom";
import "mojo/services/surfaces/public/interfaces/surface_id.mojom";
import "mojo/services/view_manager/public/interfaces/view_manager_constants.mojom";
diff --git a/mojo/services/window_manager/public/interfaces/BUILD.gn b/mojo/services/window_manager/public/interfaces/BUILD.gn
index 73c5e58..64b8005 100644
--- a/mojo/services/window_manager/public/interfaces/BUILD.gn
+++ b/mojo/services/window_manager/public/interfaces/BUILD.gn
@@ -12,7 +12,7 @@
deps = [
"//mojo/public/interfaces/application",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/input_events",
]
}
diff --git a/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom b/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
index c453abd..955e534 100644
--- a/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
+++ b/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "mojo/services/public/interfaces/geometry/geometry.mojom";
+import "mojo/services/geometry/public/interfaces/geometry.mojom";
import "mojo/services/public/interfaces/input_events/input_events.mojom";
// WindowManagerInternal is an interface provided by the WindowManager
diff --git a/mojo/tools/roll/rev_sdk.py b/mojo/tools/roll/rev_sdk.py
index 2480711..3a1631b 100755
--- a/mojo/tools/roll/rev_sdk.py
+++ b/mojo/tools/roll/rev_sdk.py
@@ -13,6 +13,7 @@
"mojo/edk",
"mojo/public",
"mojo/services/public",
+ "mojo/services/geometry/public",
"mojo/services/network/public",
"mojo/services/surfaces/public",
"mojo/services/view_manager/public",
diff --git a/services/gles2/BUILD.gn b/services/gles2/BUILD.gn
index a0ca482..60632a5 100644
--- a/services/gles2/BUILD.gn
+++ b/services/gles2/BUILD.gn
@@ -22,7 +22,7 @@
"//gpu/command_buffer/service",
"//mojo/converters/geometry",
"//mojo/public/cpp/bindings",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/gpu",
"//ui/gfx",
"//ui/gfx/geometry",
diff --git a/services/gles2/gpu_impl.h b/services/gles2/gpu_impl.h
index cf31a52..09603b5 100644
--- a/services/gles2/gpu_impl.h
+++ b/services/gles2/gpu_impl.h
@@ -10,7 +10,7 @@
#include "base/threading/thread.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.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"
diff --git a/services/native_viewport/BUILD.gn b/services/native_viewport/BUILD.gn
index b796e43..cc1abd8 100644
--- a/services/native_viewport/BUILD.gn
+++ b/services/native_viewport/BUILD.gn
@@ -83,7 +83,7 @@
"//mojo/converters/surfaces",
"//mojo/environment:chromium",
"//services/gles2",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/gpu",
"//mojo/services/public/interfaces/native_viewport",
"//mojo/services/surfaces/public/cpp",
diff --git a/services/surfaces/BUILD.gn b/services/surfaces/BUILD.gn
index 84e90e4..a441655 100644
--- a/services/surfaces/BUILD.gn
+++ b/services/surfaces/BUILD.gn
@@ -31,7 +31,7 @@
"//mojo/environment:chromium",
"//mojo/public/c/gles2",
"//mojo/public/cpp/bindings",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/gpu",
"//mojo/services/surfaces/public/interfaces",
]
diff --git a/services/view_manager/BUILD.gn b/services/view_manager/BUILD.gn
index 7f97601..e0ccbee 100644
--- a/services/view_manager/BUILD.gn
+++ b/services/view_manager/BUILD.gn
@@ -65,7 +65,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/bindings:callback",
"//mojo/public/interfaces/application",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/interfaces/input_events",
"//mojo/services/public/interfaces/native_viewport",
"//mojo/services/surfaces/public/cpp",
@@ -90,7 +90,7 @@
"//base",
"//mojo/common",
"//mojo/public/cpp/bindings:bindings",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/view_manager/public/cpp:common",
"//mojo/services/view_manager/public/interfaces",
]
@@ -117,8 +117,8 @@
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/public/cpp/native_viewport:args",
- "//mojo/services/public/interfaces/geometry",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/view_manager/public/interfaces",
"//mojo/services/window_manager/public/interfaces",
@@ -147,7 +147,7 @@
"//mojo/application:test_support",
"//mojo/common",
"//mojo/public/cpp/bindings",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/view_manager/public/interfaces",
"//mojo/services/window_manager/public/interfaces",
]
diff --git a/services/view_manager/test_change_tracker.h b/services/view_manager/test_change_tracker.h
index 5be4ca6..9ac023f 100644
--- a/services/view_manager/test_change_tracker.h
+++ b/services/view_manager/test_change_tracker.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "mojo/public/cpp/bindings/array.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
#include "mojo/services/view_manager/public/cpp/types.h"
#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
diff --git a/sky/compositor/BUILD.gn b/sky/compositor/BUILD.gn
index 40c4841..2e03d45 100644
--- a/sky/compositor/BUILD.gn
+++ b/sky/compositor/BUILD.gn
@@ -32,7 +32,7 @@
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
- "//mojo/services/public/interfaces/geometry",
+ "//mojo/services/geometry/public/interfaces",
"//mojo/services/surfaces/public/cpp",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
