| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/macros.h" | 5 #include "base/macros.h" |
| 6 #include "mojo/application/application_runner_chromium.h" | 6 #include "mojo/application/application_runner_chromium.h" |
| 7 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 8 #include "mojo/public/cpp/application/application_connection.h" | 8 #include "mojo/public/cpp/application/application_connection.h" |
| 9 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
| 10 #include "mojo/public/cpp/application/application_impl.h" | 10 #include "mojo/public/cpp/application/application_impl.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 new mojo::ViewManagerClientFactory(app->shell(), this)); | 43 new mojo::ViewManagerClientFactory(app->shell(), this)); |
| 44 } | 44 } |
| 45 | 45 |
| 46 bool ConfigureIncomingConnection( | 46 bool ConfigureIncomingConnection( |
| 47 mojo::ApplicationConnection* connection) override { | 47 mojo::ApplicationConnection* connection) override { |
| 48 connection->AddService(view_manager_client_factory_.get()); | 48 connection->AddService(view_manager_client_factory_.get()); |
| 49 return true; | 49 return true; |
| 50 } | 50 } |
| 51 | 51 |
| 52 void OnEmbed(mojo::View* root, | 52 void OnEmbed(mojo::View* root, |
| 53 mojo::ServiceProviderImpl* exported_services, | 53 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 54 scoped_ptr<mojo::ServiceProvider> imported_services) override { | 54 mojo::ServiceProviderPtr exposed_services) override { |
| 55 view_ = root; | 55 view_ = root; |
| 56 base_time_ = base::TimeTicks::Now(); | 56 base_time_ = base::TimeTicks::Now(); |
| 57 | 57 |
| 58 layer_host_.reset(new sky::LayerHost(this)); | 58 layer_host_.reset(new sky::LayerHost(this)); |
| 59 root_layer_ = make_scoped_refptr(new sky::Layer(this)); | 59 root_layer_ = make_scoped_refptr(new sky::Layer(this)); |
| 60 root_layer_->set_rasterizer( | 60 root_layer_->set_rasterizer( |
| 61 make_scoped_ptr(new sky::RasterizerGanesh(layer_host_.get()))); | 61 make_scoped_ptr(new sky::RasterizerGanesh(layer_host_.get()))); |
| 62 layer_host_->SetRootLayer(root_layer_); | 62 layer_host_->SetRootLayer(root_layer_); |
| 63 layer_host_->SetNeedsAnimate(); | 63 layer_host_->SetNeedsAnimate(); |
| 64 } | 64 } |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 106 |
| 107 DISALLOW_COPY_AND_ASSIGN(SkyCompositorApp); | 107 DISALLOW_COPY_AND_ASSIGN(SkyCompositorApp); |
| 108 }; | 108 }; |
| 109 | 109 |
| 110 } // namespace examples | 110 } // namespace examples |
| 111 | 111 |
| 112 MojoResult MojoMain(MojoHandle handle) { | 112 MojoResult MojoMain(MojoHandle handle) { |
| 113 mojo::ApplicationRunnerChromium runner(new examples::SkyCompositorApp); | 113 mojo::ApplicationRunnerChromium runner(new examples::SkyCompositorApp); |
| 114 return runner.Run(handle); | 114 return runner.Run(handle); |
| 115 } | 115 } |
| OLD | NEW |