Convert view manager to surfaces with uploading shim in client lib

mojo/mojo_services.gypi

Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 995cc6e664ad6e9af36dde61df8ed623be94d281..809e32b8ec31da30d25171a62804fb81e6f89250 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -17,9 +17,9 @@
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_utility',
         'mojo_base.gyp:mojo_application_chromium',
+        'mojo_launcher_bindings',
         'mojo_navigation_bindings',
         'mojo_network_bindings',
-        'mojo_launcher_bindings',
         'mojo_view_manager_lib',
         '<(mojo_system_for_loadable_module)',
       ],
@@ -158,7 +158,9 @@
       ],
       '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',
       ],
     },
@@ -499,12 +501,14 @@
         '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',
       ],
     },
     {
@@ -517,15 +521,24 @@
         '../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',
@@ -541,6 +554,8 @@
         'services/public/cpp/view_manager/window_manager_delegate.h',
       ],
       'export_dependent_settings': [
+        'mojo_gpu_bindings',
+        'mojo_surfaces_bindings',
         'mojo_view_manager_bindings',
       ],
     },
@@ -737,11 +752,8 @@
             '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',
@@ -754,8 +766,6 @@
             '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',