| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stdio.h> | 5 #include <stdio.h> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| 11 #include "mojo/application/application_runner_chromium.h" | 11 #include "mojo/application/application_runner_chromium.h" |
| 12 #include "mojo/examples/compositor_app/compositor_host.h" | 12 #include "mojo/examples/compositor_app/compositor_host.h" |
| 13 #include "mojo/public/c/system/main.h" | 13 #include "mojo/public/c/system/main.h" |
| 14 #include "mojo/public/cpp/application/application_delegate.h" | 14 #include "mojo/public/cpp/application/application_delegate.h" |
| 15 #include "mojo/public/cpp/application/application_impl.h" | 15 #include "mojo/public/cpp/application/application_impl.h" |
| 16 #include "mojo/public/cpp/system/core.h" | 16 #include "mojo/public/cpp/system/core.h" |
| 17 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" | 17 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" |
| 18 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" | 18 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" |
| 19 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" | 19 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" |
| 20 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
| 21 | 21 |
| 22 namespace mojo { | 22 namespace mojo { |
| 23 namespace examples { | 23 namespace examples { |
| 24 | 24 |
| 25 class SampleApp : public ApplicationDelegate, public NativeViewportClient { | 25 class SampleApp : public ApplicationDelegate, public NativeViewportClient { |
| 26 public: | 26 public: |
| 27 SampleApp() : weak_factory_(this) {} | 27 SampleApp() : weak_factory_(this) {} |
| 28 virtual ~SampleApp() {} | 28 virtual ~SampleApp() {} |
| 29 | 29 |
| 30 virtual void Initialize(ApplicationImpl* app) OVERRIDE { | 30 virtual void Initialize(ApplicationImpl* app) override { |
| 31 app->ConnectToService("mojo:mojo_native_viewport_service", &viewport_); | 31 app->ConnectToService("mojo:mojo_native_viewport_service", &viewport_); |
| 32 viewport_.set_client(this); | 32 viewport_.set_client(this); |
| 33 viewport_->Create(Size::From(gfx::Size(800, 600)), | 33 viewport_->Create(Size::From(gfx::Size(800, 600)), |
| 34 base::Bind(&SampleApp::OnCreatedNativeViewport, | 34 base::Bind(&SampleApp::OnCreatedNativeViewport, |
| 35 weak_factory_.GetWeakPtr())); | 35 weak_factory_.GetWeakPtr())); |
| 36 viewport_->Show(); | 36 viewport_->Show(); |
| 37 | 37 |
| 38 // TODO(jamesr): Should be mojo:mojo_gpu_service | 38 // TODO(jamesr): Should be mojo:mojo_gpu_service |
| 39 app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_); | 39 app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_); |
| 40 } | 40 } |
| 41 | 41 |
| 42 virtual void OnDestroyed() OVERRIDE { base::MessageLoop::current()->Quit(); } | 42 virtual void OnDestroyed() override { base::MessageLoop::current()->Quit(); } |
| 43 | 43 |
| 44 virtual void OnSizeChanged(SizePtr size) OVERRIDE { | 44 virtual void OnSizeChanged(SizePtr size) override { |
| 45 if (host_) | 45 if (host_) |
| 46 host_->SetSize(size.To<gfx::Size>()); | 46 host_->SetSize(size.To<gfx::Size>()); |
| 47 } | 47 } |
| 48 | 48 |
| 49 virtual void OnEvent(EventPtr event, | 49 virtual void OnEvent(EventPtr event, |
| 50 const mojo::Callback<void()>& callback) OVERRIDE { | 50 const mojo::Callback<void()>& callback) override { |
| 51 callback.Run(); | 51 callback.Run(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 private: | 54 private: |
| 55 void OnCreatedNativeViewport(uint64_t native_viewport_id) { | 55 void OnCreatedNativeViewport(uint64_t native_viewport_id) { |
| 56 CommandBufferPtr cb; | 56 CommandBufferPtr cb; |
| 57 // TODO(jamesr): Output to a surface instead. | 57 // TODO(jamesr): Output to a surface instead. |
| 58 gpu_service_->CreateOnscreenGLES2Context( | 58 gpu_service_->CreateOnscreenGLES2Context( |
| 59 native_viewport_id, Size::From(gfx::Size(800, 600)), Get(&cb)); | 59 native_viewport_id, Size::From(gfx::Size(800, 600)), Get(&cb)); |
| 60 host_.reset(new CompositorHost(cb.PassMessagePipe())); | 60 host_.reset(new CompositorHost(cb.PassMessagePipe())); |
| 61 } | 61 } |
| 62 | 62 |
| 63 | 63 |
| 64 NativeViewportPtr viewport_; | 64 NativeViewportPtr viewport_; |
| 65 GpuPtr gpu_service_; | 65 GpuPtr gpu_service_; |
| 66 scoped_ptr<CompositorHost> host_; | 66 scoped_ptr<CompositorHost> host_; |
| 67 base::WeakPtrFactory<SampleApp> weak_factory_; | 67 base::WeakPtrFactory<SampleApp> weak_factory_; |
| 68 | 68 |
| 69 DISALLOW_COPY_AND_ASSIGN(SampleApp); | 69 DISALLOW_COPY_AND_ASSIGN(SampleApp); |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 } // namespace examples | 72 } // namespace examples |
| 73 } // namespace mojo | 73 } // namespace mojo |
| 74 | 74 |
| 75 MojoResult MojoMain(MojoHandle shell_handle) { | 75 MojoResult MojoMain(MojoHandle shell_handle) { |
| 76 mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp); | 76 mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp); |
| 77 return runner.Run(shell_handle); | 77 return runner.Run(shell_handle); |
| 78 } | 78 } |
| OLD | NEW |