| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 } | 49 } |
| 50 | 50 |
| 51 void OnEmbed(mojo::ViewManager* view_manager, | 51 void OnEmbed(mojo::ViewManager* view_manager, |
| 52 mojo::View* root, | 52 mojo::View* root, |
| 53 mojo::ServiceProviderImpl* exported_services, | 53 mojo::ServiceProviderImpl* exported_services, |
| 54 scoped_ptr<mojo::ServiceProvider> imported_services) override { | 54 scoped_ptr<mojo::ServiceProvider> imported_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 bool is_testing = false; |
| 60 root_layer_ = make_scoped_refptr(new sky::Layer(this, is_testing)); |
| 60 layer_host_->SetRootLayer(root_layer_); | 61 layer_host_->SetRootLayer(root_layer_); |
| 61 layer_host_->SetNeedsAnimate(); | 62 layer_host_->SetNeedsAnimate(); |
| 62 } | 63 } |
| 63 | 64 |
| 64 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override { | 65 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override { |
| 65 mojo::ApplicationImpl::Terminate(); | 66 mojo::ApplicationImpl::Terminate(); |
| 66 } | 67 } |
| 67 | 68 |
| 68 private: | 69 private: |
| 69 // sky::LayerHostClient | 70 // sky::LayerHostClient |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 | 105 |
| 105 DISALLOW_COPY_AND_ASSIGN(SkyCompositorApp); | 106 DISALLOW_COPY_AND_ASSIGN(SkyCompositorApp); |
| 106 }; | 107 }; |
| 107 | 108 |
| 108 } // namespace examples | 109 } // namespace examples |
| 109 | 110 |
| 110 MojoResult MojoMain(MojoHandle handle) { | 111 MojoResult MojoMain(MojoHandle handle) { |
| 111 mojo::ApplicationRunnerChromium runner(new examples::SkyCompositorApp); | 112 mojo::ApplicationRunnerChromium runner(new examples::SkyCompositorApp); |
| 112 return runner.Run(handle); | 113 return runner.Run(handle); |
| 113 } | 114 } |
| OLD | NEW |