diff options
| author | sky <sky@chromium.org> | 2014-10-07 12:53:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 19:53:38 +0000 |
| commit | 9e877c0132baa5ac52186addf7bf31c4521b105b (patch) | |
| tree | e32f2ca9858edb466df7ba5d21457c1ecedd5020 /mojo/mojo.gyp | |
| parent | 00425c257e1d5a9cf8c7f0bd9e4d05904cda3f5b (diff) | |
| download | chromium_src-9e877c0132baa5ac52186addf7bf31c4521b105b.zip chromium_src-9e877c0132baa5ac52186addf7bf31c4521b105b.tar.gz chromium_src-9e877c0132baa5ac52186addf7bf31c4521b105b.tar.bz2 | |
Makes it so each mojo::View outputs a surface
I didn't remove SetContents yet. There is one consumer that needs to
converted. I'll do that separately.
BUG=none
TEST=none
R=ben@chromium.org, jamesr@chromium.org
Review URL: https://codereview.chromium.org/618073005
Cr-Commit-Position: refs/heads/master@{#298546}
Diffstat (limited to 'mojo/mojo.gyp')
| -rw-r--r-- | mojo/mojo.gyp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp index 96966b4..e927a20 100644 --- a/mojo/mojo.gyp +++ b/mojo/mojo.gyp @@ -530,7 +530,14 @@ '../ui/events/events.gyp:events', '../ui/events/events.gyp:events_base', 'mojo_cc_support', + 'mojo_geometry_lib', 'mojo_native_viewport_bindings', + 'mojo_gpu_bindings', + 'mojo_surfaces_bindings', + 'mojo_surfaces_lib', + 'mojo_view_manager_lib', + 'public/mojo_public.gyp:mojo_application_base', + 'public/mojo_public.gyp:mojo_application_bindings', ], 'includes': [ 'mojo_public_gles2_for_loadable_module.gypi', @@ -538,13 +545,14 @@ 'sources': [ 'aura/aura_init.cc', 'aura/aura_init.h', - 'aura/context_factory_mojo.cc', - 'aura/context_factory_mojo.h', 'aura/screen_mojo.cc', 'aura/screen_mojo.h', + 'aura/surface_binding.cc', + 'aura/surface_binding.h', + 'aura/surface_context_factory.cc', + 'aura/surface_context_factory.h', 'aura/window_tree_host_mojo.cc', 'aura/window_tree_host_mojo.h', - 'aura/window_tree_host_mojo_delegate.h', ], }, { @@ -564,6 +572,7 @@ 'mojo_aura_support', 'mojo_views_support_internal', 'mojo_view_manager_bindings', + 'mojo_view_manager_lib', ], 'sources': [ 'views/input_method_mojo_linux.cc', |