Convert view manager to surfaces with uploading shim in client lib

mojo/mojo_services.gypi

 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'mojo_html_viewer',
       'type': 'loadable_module',
       'dependencies': [
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/native_theme/native_theme.gyp:native_theme',
         '../url/url.gyp:url_lib',
+        'mojo_base.gyp:mojo_application_chromium',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_utility',
-        'mojo_base.gyp:mojo_application_chromium',
         'mojo_content_handler_bindings',
         'mojo_navigation_bindings',
         'mojo_network_bindings',
         'mojo_view_manager_lib',
         '<(mojo_system_for_loadable_module)',
       ],
       'include_dirs': [
         'third_party/WebKit'
       ],
       'sources': [
@@ skipping 111 matching lines @@
       # GN version: //mojo/services/public/cpp/surfaces
       'target_name': 'mojo_surfaces_lib',
       'type': '<(component)',
       'defines': [
         'MOJO_SURFACES_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
+        '../skia/skia.gyp:skia',
         '../gpu/gpu.gyp:gpu',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_geometry_lib',
         'mojo_surfaces_bindings',
         '<(mojo_system_for_component)',
       ],
       'export_dependent_settings': [
         'mojo_geometry_lib',
         'mojo_surfaces_bindings',
       ],
       'sources': [
         'services/public/cpp/surfaces/lib/surfaces_type_converters.cc',
+        'services/public/cpp/surfaces/lib/surfaces_utils.cc',
         'services/public/cpp/surfaces/surfaces_type_converters.h',
+        'services/public/cpp/surfaces/surfaces_utils.h',
         'services/public/cpp/surfaces/mojo_surfaces_export.h',
       ],
     },
     {
       # GN version: //mojo/services/public/cpp/surfaces/tests
       'target_name': 'mojo_surfaces_lib_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
@@ skipping 291 matching lines @@
       'sources': [
         'services/public/interfaces/view_manager/view_manager.mojom',
         'services/public/interfaces/view_manager/view_manager_constants.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_base.gyp:mojo_application_bindings',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
+        'mojo_surface_id_bindings',
       ],
       'export_dependent_settings': [
         'mojo_base.gyp:mojo_application_bindings',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
+        'mojo_surface_id_bindings',
       ],
     },
     {
       # GN version: //mojo/services/public/cpp/view_manager
       'target_name': 'mojo_view_manager_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
+        '../cc/cc.gyp:cc_surfaces',
+        '../gpu/gpu.gyp:gpu',
         '../skia/skia.gyp:skia',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        '../third_party/khronos/khronos.gyp:khronos_headers',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_base.gyp:mojo_application_bindings',
         'mojo_core_window_manager_bindings',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
+        'mojo_surfaces_bindings',
+        'mojo_surfaces_lib',
         'mojo_view_manager_bindings',
         'mojo_view_manager_common',
+        'mojo_gpu_bindings',
+      ],
+      'includes': [
+        'mojo_public_gles2_for_loadable_module.gypi',
       ],
       'sources': [
+        'services/public/cpp/view_manager/lib/bitmap_uploader.cc',
+        'services/public/cpp/view_manager/lib/bitmap_uploader.h',
         'services/public/cpp/view_manager/lib/view.cc',
         'services/public/cpp/view_manager/lib/view_manager_client_factory.cc',
         'services/public/cpp/view_manager/lib/view_manager_client_impl.cc',
         'services/public/cpp/view_manager/lib/view_manager_client_impl.h',
         'services/public/cpp/view_manager/lib/view_observer.cc',
         'services/public/cpp/view_manager/lib/view_private.cc',
         'services/public/cpp/view_manager/lib/view_private.h',
         'services/public/cpp/view_manager/view.h',
         'services/public/cpp/view_manager/view_manager.h',
         'services/public/cpp/view_manager/view_manager_client_factory.h',
         'services/public/cpp/view_manager/view_manager_delegate.h',
         'services/public/cpp/view_manager/view_observer.h',
         'services/public/cpp/view_manager/window_manager_delegate.h',
       ],
       'export_dependent_settings': [
+        'mojo_gpu_bindings',
+        'mojo_surfaces_bindings',
         'mojo_view_manager_bindings',
       ],
     },
     {
       # GN version: //mojo/services/public/cpp/view_manager/tests:mojo_view_manager_lib_unittests
       'target_name': 'mojo_view_manager_lib_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
@@ skipping 140 matching lines @@
   ],
   'conditions': [
     ['use_aura==1', {
       'targets': [
         {
           # GN version: //mojo/services/view_manager
           'target_name': 'mojo_view_manager',
           'type': '<(component)',
           'dependencies': [
             '../base/base.gyp:base',
-            '../cc/cc.gyp:cc',
-            '../skia/skia.gyp:skia',
-            '../ui/aura/aura.gyp:aura',
+            '../cc/cc.gyp:cc_surfaces',
             '../ui/base/ui_base.gyp:ui_base',
-            '../ui/compositor/compositor.gyp:compositor',
             '../ui/events/events.gyp:events',
             '../ui/events/events.gyp:events_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
-            '../ui/gl/gl.gyp:gl',
-            '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
+            'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_common_lib',
-            'mojo_base.gyp:mojo_application_chromium',
-            'mojo_cc_support',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
+            'mojo_gpu_bindings',
             'mojo_input_events_bindings',
             'mojo_input_events_lib',
             'mojo_native_viewport_bindings',
+            'mojo_surfaces_bindings',
+            'mojo_surfaces_lib',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
-            'mojo_gpu_bindings',
-            '<(mojo_gles2_for_component)',
             '<(mojo_system_for_component)',
           ],
           'sources': [
             'services/view_manager/access_policy.h',
             'services/view_manager/access_policy_delegate.h',
             'services/view_manager/connection_manager.cc',
             'services/view_manager/connection_manager.h',
-            'services/view_manager/context_factory_impl.cc',
-            'services/view_manager/context_factory_impl.h',
             'services/view_manager/default_access_policy.cc',
             'services/view_manager/default_access_policy.h',
             'services/view_manager/display_manager.cc',
             'services/view_manager/display_manager.h',
-            'services/view_manager/display_manager_delegate.h',
             'services/view_manager/ids.h',
             'services/view_manager/main.cc',
-            'services/view_manager/screen_impl.cc',
-            'services/view_manager/screen_impl.h',
             'services/view_manager/server_view.cc',
             'services/view_manager/server_view.h',
             'services/view_manager/server_view_delegate.h',
             'services/view_manager/view_manager_export.h',
             'services/view_manager/view_manager_init_service_context.cc',
             'services/view_manager/view_manager_init_service_context.h',
             'services/view_manager/view_manager_init_service_impl.cc',
             'services/view_manager/view_manager_init_service_impl.h',
             'services/view_manager/view_manager_service_impl.cc',
             'services/view_manager/view_manager_service_impl.h',
             'services/view_manager/window_manager_access_policy.cc',
             'services/view_manager/window_manager_access_policy.h',
-            'services/view_manager/window_tree_host_impl.cc',
-            'services/view_manager/window_tree_host_impl.h',
           ],
           'defines': [
             'MOJO_VIEW_MANAGER_IMPLEMENTATION',
           ],
         },
         {
           # GN version: //mojo/services/public/cpp/view_manager/lib:run_unittests
           'target_name': 'mojo_view_manager_run_unittests',
           'type': 'static_library',
           'dependencies': [
@@ skipping 124 matching lines @@
               'dependencies': [
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }