Index: mojo/mojo_services.gypi |
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi |
index c5a68a4ce792fc7c6956efa8b6be709ad9164f7a..b9768b6f032e780602ee631e6acd3757986d1250 100644 |
--- a/mojo/mojo_services.gypi |
+++ b/mojo/mojo_services.gypi |
@@ -13,10 +13,10 @@ |
'../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', |
@@ -148,6 +148,7 @@ |
'../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', |
@@ -162,7 +163,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', |
], |
}, |
@@ -474,12 +477,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', |
], |
}, |
{ |
@@ -488,19 +493,30 @@ |
'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', |
@@ -516,6 +532,8 @@ |
'services/public/cpp/view_manager/window_manager_delegate.h', |
], |
'export_dependent_settings': [ |
+ 'mojo_gpu_bindings', |
+ 'mojo_surfaces_bindings', |
'mojo_view_manager_bindings', |
], |
}, |
@@ -676,29 +694,24 @@ |
'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_common_lib', |
'mojo_base.gyp:mojo_application_chromium', |
- 'mojo_cc_support', |
+ 'mojo_base.gyp:mojo_common_lib', |
'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': [ |
@@ -706,17 +719,12 @@ |
'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', |
@@ -729,8 +737,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', |