Move GLES2, GPU & Surfaces into the ViewManager directory. This does …

…not merge the applications, that will be a subsequent step. R=sky@chromium.org BUG= Review URL: https://codereview.chromium.org/1150093003 Cr-Commit-Position: refs/heads/master@{#331039}
cbchan · May 22, 2015 · 4b12854 · 4b12854
1 parent 2a3211d
commit 4b12854
Show file tree

Hide file tree

Showing 84 changed files with 276 additions and 165 deletions.
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
@@ -113,12 +113,11 @@ source_set("lib") {
     "//cc/blink",
     "//cc/surfaces",
     "//components/clipboard/public/interfaces",
-    "//components/gpu/public/interfaces",
     "//components/mime_util",
     "//components/resource_provider/public/cpp",
     "//components/resource_provider/public/interfaces",
     "//components/scheduler:scheduler",
-    "//components/surfaces/public/interfaces",
+    "//components/view_manager/public/interfaces",
     "//components/webcrypto",
     "//gin",
     "//mandoline/services/navigation/public/interfaces",
@@ -161,7 +160,6 @@ source_set("lib") {
 
   data_deps = [
     "//components/clipboard",
-    "//components/surfaces",
     "//components/view_manager",
   ]
 }

diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc
@@ -19,8 +19,8 @@
 #include "components/html_viewer/web_media_player_factory.h"
 #include "components/html_viewer/web_storage_namespace_impl.h"
 #include "components/html_viewer/web_url_loader_impl.h"
-#include "components/surfaces/public/interfaces/surfaces.mojom.h"
 #include "components/view_manager/public/cpp/view.h"
+#include "components/view_manager/public/interfaces/surfaces.mojom.h"
 #include "media/blink/webencryptedmediaclient_impl.h"
 #include "media/cdm/default_cdm_factory.h"
 #include "media/filters/default_media_permission.h"

diff --git a/components/html_viewer/web_layer_tree_view_impl.h b/components/html_viewer/web_layer_tree_view_impl.h
@@ -11,8 +11,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/trees/layer_tree_host_client.h"
-#include "components/gpu/public/interfaces/gpu.mojom.h"
-#include "components/surfaces/public/interfaces/surfaces.mojom.h"
+#include "components/view_manager/public/interfaces/gpu.mojom.h"
+#include "components/view_manager/public/interfaces/surfaces.mojom.h"
 #include "mojo/cc/output_surface_mojo.h"
 #include "third_party/WebKit/public/platform/WebLayerTreeView.h"
 

diff --git a/components/view_manager/BUILD.gn b/components/view_manager/BUILD.gn
@@ -13,8 +13,8 @@ if (is_android) {
   group("view_manager") {
     deps = [
       ":jni_headers",
+      ":lib",
       ":loader",
-      ":view_manager_lib",
       ":view_manager_java",
       "native_viewport",
     ]
@@ -54,7 +54,7 @@ if (is_android) {
     ]
 
     deps = [
-      ":view_manager_lib",
+      ":lib",
       "//base",
       "//components/view_manager/public/interfaces",
       "//components/view_manager/native_viewport",
@@ -69,7 +69,7 @@ if (is_android) {
   }
 }
 
-source_set("view_manager_lib") {
+source_set("lib") {
   sources = [
     "access_policy.h",
     "access_policy_delegate.h",
@@ -122,7 +122,6 @@ source_set("view_manager_lib") {
     "//base",
     "//cc/surfaces",
     "//cc/surfaces:surface_id",
-    "//components/surfaces/public/interfaces",
     "//components/view_manager/public/cpp:common",
     "//components/view_manager/public/interfaces",
     "//components/view_manager/native_viewport",
@@ -137,8 +136,6 @@ source_set("view_manager_lib") {
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
-
-  data_deps = [ "//components/surfaces" ]
 }
 
 source_set("test_support") {
@@ -184,7 +181,7 @@ test("view_manager_unittests") {
 
   deps = [
     ":test_support",
-    ":view_manager_lib",
+    ":lib",
     "//base",
     "//base/test:test_config",
     "//components/view_manager/public/cpp:common",

diff --git a/components/view_manager/display_manager.cc b/components/view_manager/display_manager.cc
@@ -5,10 +5,10 @@
 #include "components/view_manager/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
-#include "components/gpu/public/interfaces/gpu.mojom.h"
-#include "components/surfaces/public/interfaces/quads.mojom.h"
-#include "components/surfaces/public/interfaces/surfaces.mojom.h"
 #include "components/view_manager/connection_manager.h"
+#include "components/view_manager/public/interfaces/gpu.mojom.h"
+#include "components/view_manager/public/interfaces/quads.mojom.h"
+#include "components/view_manager/public/interfaces/surfaces.mojom.h"
 #include "components/view_manager/server_view.h"
 #include "components/view_manager/view_coordinate_conversions.h"
 #include "mojo/application/public/cpp/application_connection.h"

diff --git a/components/view_manager/display_manager.h b/components/view_manager/display_manager.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
-#include "components/surfaces/public/interfaces/display.mojom.h"
+#include "components/view_manager/public/interfaces/display.mojom.h"
 #include "components/view_manager/public/interfaces/native_viewport.mojom.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h"

diff --git a/components/gles2/BUILD.gn → components/view_manager/gles2/BUILD.gn b/components/gles2/BUILD.gn → components/view_manager/gles2/BUILD.gn
@@ -27,7 +27,7 @@ source_set("gles2") {
   ]
   deps = [
     "//base",
-    "//components/gpu/public/interfaces",
+    "//components/view_manager/public/interfaces",
     "//gpu/command_buffer/service",
     "//mojo/converters/geometry",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
@@ -50,7 +50,7 @@ source_set("lib") {
 
   deps = [
     "//base",
-    "//components/gpu/public/interfaces",
+    "//components/view_manager/public/interfaces",
     "//gpu/command_buffer/common",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//third_party/mojo/src/mojo/public/cpp/system",

diff --git a/components/gles2/DEPS → components/view_manager/gles2/DEPS b/components/gles2/DEPS → components/view_manager/gles2/DEPS
diff --git a/components/gles2/OWNERS → components/view_manager/gles2/OWNERS b/components/gles2/OWNERS → components/view_manager/gles2/OWNERS
diff --git a/components/gles2/command_buffer_driver.cc → ...ew_manager/gles2/command_buffer_driver.cc b/components/gles2/command_buffer_driver.cc → ...ew_manager/gles2/command_buffer_driver.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/gles2/command_buffer_driver.h"
+#include "components/view_manager/gles2/command_buffer_driver.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
-#include "components/gles2/command_buffer_type_conversions.h"
-#include "components/gles2/mojo_buffer_backing.h"
+#include "components/view_manager/gles2/command_buffer_type_conversions.h"
+#include "components/view_manager/gles2/mojo_buffer_backing.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"

diff --git a/components/gles2/command_buffer_driver.h → ...iew_manager/gles2/command_buffer_driver.h b/components/gles2/command_buffer_driver.h → ...iew_manager/gles2/command_buffer_driver.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_GLES2_COMMAND_BUFFER_DRIVER_H_
-#define COMPONENTS_GLES2_COMMAND_BUFFER_DRIVER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_DRIVER_H_
+#define COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_DRIVER_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/timer/timer.h"
-#include "components/gpu/public/interfaces/command_buffer.mojom.h"
+#include "components/view_manager/public/interfaces/command_buffer.mojom.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 

diff --git a/components/gles2/command_buffer_impl.cc → ...view_manager/gles2/command_buffer_impl.cc b/components/gles2/command_buffer_impl.cc → ...view_manager/gles2/command_buffer_impl.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/gles2/command_buffer_impl.h"
+#include "components/view_manager/gles2/command_buffer_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "components/gles2/command_buffer_driver.h"
-#include "components/gles2/command_buffer_impl_observer.h"
+#include "components/view_manager/gles2/command_buffer_driver.h"
+#include "components/view_manager/gles2/command_buffer_impl_observer.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 
 namespace gles2 {

diff --git a/components/gles2/command_buffer_impl.h → .../view_manager/gles2/command_buffer_impl.h b/components/gles2/command_buffer_impl.h → .../view_manager/gles2/command_buffer_impl.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_GLES2_COMMAND_BUFFER_IMPL_H_
-#define COMPONENTS_GLES2_COMMAND_BUFFER_IMPL_H_
+#ifndef COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_IMPL_H_
+#define COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
-#include "components/gpu/public/interfaces/command_buffer.mojom.h"
-#include "components/gpu/public/interfaces/viewport_parameter_listener.mojom.h"
+#include "components/view_manager/public/interfaces/command_buffer.mojom.h"
+#include "components/view_manager/public/interfaces/viewport_parameter_listener.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace gpu {
@@ -74,4 +74,4 @@ class CommandBufferImpl : public mojo::CommandBuffer {
 
 }  // namespace gles2
 
-#endif  // COMPONENTS_GLES2_COMMAND_BUFFER_IMPL_H_
+#endif  // COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_IMPL_H_
diff --git a/...ents/gles2/command_buffer_impl_observer.h → ...ager/gles2/command_buffer_impl_observer.h b/...ents/gles2/command_buffer_impl_observer.h → ...ager/gles2/command_buffer_impl_observer.h
diff --git a/.../gles2/command_buffer_type_conversions.cc → .../gles2/command_buffer_type_conversions.cc b/.../gles2/command_buffer_type_conversions.cc → .../gles2/command_buffer_type_conversions.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/gles2/command_buffer_type_conversions.h"
+#include "components/view_manager/gles2/command_buffer_type_conversions.h"
 
-#include "components/gpu/public/interfaces/command_buffer.mojom.h"
+#include "components/view_manager/public/interfaces/command_buffer.mojom.h"
 
 namespace mojo {
 

diff --git a/...s/gles2/command_buffer_type_conversions.h → ...r/gles2/command_buffer_type_conversions.h b/...s/gles2/command_buffer_type_conversions.h → ...r/gles2/command_buffer_type_conversions.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 COMPONENTS_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
-#define COMPONENTS_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
+#ifndef COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
+#define COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
 
-#include "components/gpu/public/interfaces/command_buffer.mojom.h"
+#include "components/view_manager/public/interfaces/command_buffer.mojom.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h"
@@ -64,4 +64,4 @@ struct TypeConverter<gpu::Capabilities, GpuCapabilitiesPtr> {
 
 }  // namespace gles2
 
-#endif  // COMPONENTS_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
+#endif  // COMPONENTS_VIEW_MANAGER_GLES2_COMMAND_BUFFER_TYPE_CONVERSIONS_H_
diff --git a/components/gles2/gpu_impl.cc → components/view_manager/gles2/gpu_impl.cc b/components/gles2/gpu_impl.cc → components/view_manager/gles2/gpu_impl.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/gles2/gpu_impl.h"
+#include "components/view_manager/gles2/gpu_impl.h"
 
-#include "components/gles2/command_buffer_driver.h"
-#include "components/gles2/command_buffer_impl.h"
+#include "components/view_manager/gles2/command_buffer_driver.h"
+#include "components/view_manager/gles2/command_buffer_impl.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"

diff --git a/components/gles2/gpu_impl.h → components/view_manager/gles2/gpu_impl.h b/components/gles2/gpu_impl.h → components/view_manager/gles2/gpu_impl.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_GLES2_GPU_IMPL_H_
-#define COMPONENTS_GLES2_GPU_IMPL_H_
+#ifndef COMPONENTS_VIEW_MANAGER_GLES2_GPU_IMPL_H_
+#define COMPONENTS_VIEW_MANAGER_GLES2_GPU_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
-#include "components/gles2/gpu_state.h"
-#include "components/gpu/public/interfaces/command_buffer.mojom.h"
-#include "components/gpu/public/interfaces/gpu.mojom.h"
+#include "components/view_manager/gles2/gpu_state.h"
+#include "components/view_manager/public/interfaces/command_buffer.mojom.h"
+#include "components/view_manager/public/interfaces/gpu.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 #include "ui/mojo/geometry/geometry.mojom.h"
@@ -46,4 +46,4 @@ class GpuImpl : public mojo::Gpu {
 
 }  // namespace gles2
 
-#endif  // COMPONENTS_GLES2_GPU_IMPL_H_
+#endif  // COMPONENTS_VIEW_MANAGER_GLES2_GPU_IMPL_H_
diff --git a/components/gles2/gpu_state.cc → components/view_manager/gles2/gpu_state.cc b/components/gles2/gpu_state.cc → components/view_manager/gles2/gpu_state.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "components/gles2/gpu_state.h"
+#include "components/view_manager/gles2/gpu_state.h"
 
 namespace gles2 {
 

diff --git a/components/gles2/gpu_state.h → components/view_manager/gles2/gpu_state.h b/components/gles2/gpu_state.h → components/view_manager/gles2/gpu_state.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_GLES2_GPU_STATE_H_
-#define COMPONENTS_GLES2_GPU_STATE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_GLES2_GPU_STATE_H_
+#define COMPONENTS_VIEW_MANAGER_GLES2_GPU_STATE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
@@ -49,4 +49,4 @@ class GpuState : public base::RefCounted<GpuState> {
 
 }  // namespace gles2
 
-#endif  // COMPONENTS_GLES2_GPU_STATE_H_
+#endif  // COMPONENTS_VIEW_MANAGER_GLES2_GPU_STATE_H_
diff --git a/components/gles2/mojo_buffer_backing.cc → ...view_manager/gles2/mojo_buffer_backing.cc b/components/gles2/mojo_buffer_backing.cc → ...view_manager/gles2/mojo_buffer_backing.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/gles2/mojo_buffer_backing.h"
+#include "components/view_manager/gles2/mojo_buffer_backing.h"
 
 #include "base/logging.h"
 

diff --git a/components/gles2/mojo_buffer_backing.h → .../view_manager/gles2/mojo_buffer_backing.h b/components/gles2/mojo_buffer_backing.h → .../view_manager/gles2/mojo_buffer_backing.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_GLES2_MOJO_BUFFER_BACKING_H_
-#define COMPONENTS_GLES2_MOJO_BUFFER_BACKING_H_
+#ifndef COMPONENTS_VIEW_MANAGER_GLES2_MOJO_BUFFER_BACKING_H_
+#define COMPONENTS_VIEW_MANAGER_GLES2_MOJO_BUFFER_BACKING_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -36,4 +36,4 @@ class MojoBufferBacking : public gpu::BufferBacking {
 
 }  // namespace gles2
 
-#endif  // COMPONENTS_GLES2_MOJO_BUFFER_BACKING_H_
+#endif  // COMPONENTS_VIEW_MANAGER_GLES2_MOJO_BUFFER_BACKING_H_
diff --git a/components/view_manager/native_viewport/BUILD.gn b/components/view_manager/native_viewport/BUILD.gn
@@ -27,7 +27,7 @@ source_set("native_viewport") {
 
   deps = [
     "//base",
-    "//components/gles2",
+    "//components/view_manager/gles2",
     "//components/view_manager/public/interfaces",
     "//gpu/command_buffer/service",
     "//mojo/application/public/cpp",

diff --git a/components/view_manager/native_viewport/native_viewport_application_delegate.h b/components/view_manager/native_viewport/native_viewport_application_delegate.h
@@ -6,7 +6,7 @@
 #define COMPONENTS_VIEW_MANAGER_NATIVE_VIEWPORT_NATIVE_VIEWPORT_APPLICATION_DELEGATE_H_
 
 #include "base/macros.h"
-#include "components/gles2/gpu_impl.h"
+#include "components/view_manager/gles2/gpu_impl.h"
 #include "components/view_manager/public/interfaces/native_viewport.mojom.h"
 #include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/application/public/cpp/application_delegate.h"

diff --git a/components/view_manager/native_viewport/native_viewport_impl.cc b/components/view_manager/native_viewport/native_viewport_impl.cc
@@ -9,7 +9,7 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
-#include "components/gles2/gpu_state.h"
+#include "components/view_manager/gles2/gpu_state.h"
 #include "components/view_manager/native_viewport/platform_viewport_headless.h"
 #include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"

diff --git a/components/view_manager/native_viewport/native_viewport_impl.h b/components/view_manager/native_viewport/native_viewport_impl.h
@@ -9,9 +9,9 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "components/gpu/public/interfaces/gpu.mojom.h"
 #include "components/view_manager/native_viewport/onscreen_context_provider.h"
 #include "components/view_manager/native_viewport/platform_viewport.h"
+#include "components/view_manager/public/interfaces/gpu.mojom.h"
 #include "components/view_manager/public/interfaces/native_viewport.mojom.h"
 #include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"

diff --git a/components/view_manager/native_viewport/onscreen_context_provider.cc b/components/view_manager/native_viewport/onscreen_context_provider.cc
@@ -5,9 +5,9 @@
 #include "components/view_manager/native_viewport/onscreen_context_provider.h"
 
 #include "base/bind.h"
-#include "components/gles2/command_buffer_driver.h"
-#include "components/gles2/command_buffer_impl.h"
-#include "components/gles2/gpu_state.h"
+#include "components/view_manager/gles2/command_buffer_driver.h"
+#include "components/view_manager/gles2/command_buffer_impl.h"
+#include "components/view_manager/gles2/gpu_state.h"
 
 namespace native_viewport {