Teach the native viewport service to draw a Surface into itself

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': [
@@ skipping 116 matching lines @@
       'export_dependent_settings': [
         '../ui/gfx/gfx.gyp:gfx',
       ],
       'sources': [
         'services/public/cpp/geometry/lib/geometry_type_converters.cc',
         'services/public/cpp/geometry/geometry_type_converters.h',
         'services/public/cpp/geometry/mojo_geometry_export.h',
       ],
     },
     {
-      # GN version: //mojo/services/public/cpp/geometry
+      # 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',
         '../gpu/gpu.gyp:gpu',
@@ skipping 84 matching lines @@
       'type': 'static_library',
       'sources': [
         'services/public/interfaces/native_viewport/native_viewport.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_gles2_bindings',
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
+        'mojo_surface_id_bindings',
       ],
       'export_dependent_settings': [
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_gles2_bindings',
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
+        'mojo_surface_id_bindings',
       ],
     },
     {
       # GN version: //mojo/services/native_viewport
       'target_name': 'mojo_native_viewport_service_lib',
       # This is linked directly into the embedder, so we make it a static_library.
       # TODO(davemoore): Make this a true service.
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
+        '../cc/cc.gyp:cc_surfaces',
+        '../skia/skia.gyp:skia',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gles2_service',
         'mojo_gpu_bindings',
         'mojo_input_events_lib',
         'mojo_native_viewport_bindings',
+        'mojo_surfaces_bindings',
+        'mojo_surfaces_lib',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_native_viewport_bindings',
+        'mojo_surfaces_bindings',
       ],
       'sources': [
         'services/native_viewport/gpu_impl.cc',
         'services/native_viewport/gpu_impl.h',
         'services/native_viewport/native_viewport_impl.cc',
         'services/native_viewport/native_viewport_impl.h',
         'services/native_viewport/platform_viewport.h',
         'services/native_viewport/platform_viewport_android.cc',
         'services/native_viewport/platform_viewport_mac.mm',
         'services/native_viewport/platform_viewport_ozone.cc',
         'services/native_viewport/platform_viewport_stub.cc',
         'services/native_viewport/platform_viewport_win.cc',
         'services/native_viewport/platform_viewport_x11.cc',
+        'services/native_viewport/viewport_surface.cc',
+        'services/native_viewport/viewport_surface.h',
       ],
       'conditions': [
         ['OS=="win" or OS=="android" or OS=="linux" or OS=="mac"', {
           'sources!': [
             'services/native_viewport/platform_viewport_stub.cc',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             'mojo_base.gyp:mojo_jni_headers',
@@ skipping 269 matching lines @@
             'mojo_base.gyp:mojo_run_all_unittests',
           ],
         }],
       ],
     },
     {
       # GN version: //mojo/services/public/interfaces/surfaces
       'target_name': 'mojo_surfaces_bindings',
       'type': 'static_library',
       'sources': [
-        'services/public/interfaces/surfaces/surface_id.mojom',
         'services/public/interfaces/surfaces/surfaces.mojom',
         'services/public/interfaces/surfaces/surfaces_service.mojom',
         'services/public/interfaces/surfaces/quads.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'dependencies': [
+        'mojo_base.gyp:mojo_cpp_bindings',
+        'mojo_base.gyp:mojo_gles2_bindings',
+        'mojo_geometry_bindings',
+        'mojo_surface_id_bindings',
+      ],
+      'export_dependent_settings': [
+        'mojo_base.gyp:mojo_cpp_bindings',
+        'mojo_base.gyp:mojo_gles2_bindings',
+        'mojo_geometry_bindings',
+        'mojo_surface_id_bindings',
+      ],
+    },
+    {
+      # GN version: //mojo/services/public/interfaces/surfaces:surface_id
+      'target_name': 'mojo_surface_id_bindings',
+      'type': 'static_library',
+      'sources': [
+        'services/public/interfaces/surfaces/surface_id.mojom',
+      ],
+      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'dependencies': [
+        'mojo_base.gyp:mojo_cpp_bindings',
+      ],
       'export_dependent_settings': [
         'mojo_base.gyp:mojo_cpp_bindings',
       ],
-      'dependencies': [
-        'mojo_base.gyp:mojo_cpp_bindings',
-        'mojo_geometry_bindings',
-        'mojo_native_viewport_bindings',
-      ],
     },
     {
       # GN version: //mojo/services/test_service:bindings
       'target_name': 'mojo_test_service_bindings',
       'type': 'static_library',
       'sources': [
          # TODO(tim): Move to services/public/interfaces?
         'services/test_service/test_request_tracker.mojom',
         'services/test_service/test_service.mojom',
       ],
@@ skipping 266 matching lines @@
               'dependencies': [
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }