| 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 "base/threading/platform_thread.h" | 6 #include "base/threading/platform_thread.h" |
| 7 #include "examples/surfaces_app/child_gl_impl.h" | 7 #include "examples/ganesh_app/painter.h" |
| 8 #include "examples/surfaces_app/child.mojom.h" |
| 8 #include "mojo/application/application_runner_chromium.h" | 9 #include "mojo/application/application_runner_chromium.h" |
| 9 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/application/application_connection.h" | 11 #include "mojo/public/cpp/application/application_connection.h" |
| 11 #include "mojo/public/cpp/application/application_delegate.h" | 12 #include "mojo/public/cpp/application/application_delegate.h" |
| 12 #include "mojo/public/cpp/application/application_impl.h" | 13 #include "mojo/public/cpp/application/application_impl.h" |
| 13 #include "mojo/public/cpp/bindings/string.h" | 14 #include "mojo/public/cpp/bindings/string.h" |
| 14 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" | 15 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" |
| 15 | 16 |
| 16 namespace mojo { | 17 namespace mojo { |
| 17 namespace examples { | 18 namespace examples { |
| 18 | 19 |
| 19 class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> { | 20 class GaneshApp : public ApplicationDelegate, public InterfaceFactory<Child> { |
| 20 public: | 21 public: |
| 21 ChildGLApp() {} | 22 GaneshApp() {} |
| 22 virtual ~ChildGLApp() {} | 23 virtual ~GaneshApp() {} |
| 23 | 24 |
| 24 virtual void Initialize(ApplicationImpl* app) override { | 25 virtual void Initialize(ApplicationImpl* app) override { |
| 25 surfaces_service_connection_ = | 26 surfaces_service_connection_ = |
| 26 app->ConnectToApplication("mojo:surfaces_service"); | 27 app->ConnectToApplication("mojo:surfaces_service"); |
| 27 // TODO(jamesr): Should be mojo:gpu_service | 28 // TODO(jamesr): Should be mojo:gpu_service |
| 28 app->ConnectToService("mojo:native_viewport_service", &gpu_service_); | 29 app->ConnectToService("mojo:native_viewport_service", &gpu_service_); |
| 29 } | 30 } |
| 30 | 31 |
| 31 // ApplicationDelegate implementation. | 32 // ApplicationDelegate implementation. |
| 32 virtual bool ConfigureIncomingConnection( | 33 virtual bool ConfigureIncomingConnection( |
| 33 ApplicationConnection* connection) override { | 34 ApplicationConnection* connection) override { |
| 34 connection->AddService(this); | 35 connection->AddService(this); |
| 35 return true; | 36 return true; |
| 36 } | 37 } |
| 37 | 38 |
| 38 // InterfaceFactory<Child> implementation. | 39 // InterfaceFactory<Child> implementation. |
| 39 virtual void Create(ApplicationConnection* connection, | 40 virtual void Create(ApplicationConnection* connection, |
| 40 InterfaceRequest<Child> request) override { | 41 InterfaceRequest<Child> request) override { |
| 41 CommandBufferPtr command_buffer; | 42 CommandBufferPtr command_buffer; |
| 42 gpu_service_->CreateOffscreenGLES2Context(GetProxy(&command_buffer)); | 43 gpu_service_->CreateOffscreenGLES2Context(GetProxy(&command_buffer)); |
| 43 BindToRequest( | 44 BindToRequest( |
| 44 new ChildGLImpl(surfaces_service_connection_, command_buffer.Pass()), | 45 new Painter(surfaces_service_connection_, command_buffer.Pass()), |
| 45 &request); | 46 &request); |
| 46 } | 47 } |
| 47 | 48 |
| 48 private: | 49 private: |
| 49 ApplicationConnection* surfaces_service_connection_; | 50 ApplicationConnection* surfaces_service_connection_; |
| 50 GpuPtr gpu_service_; | 51 GpuPtr gpu_service_; |
| 51 | 52 |
| 52 DISALLOW_COPY_AND_ASSIGN(ChildGLApp); | 53 DISALLOW_COPY_AND_ASSIGN(GaneshApp); |
| 53 }; | 54 }; |
| 54 | 55 |
| 55 } // namespace examples | 56 } // namespace examples |
| 56 } // namespace mojo | 57 } // namespace mojo |
| 57 | 58 |
| 58 MojoResult MojoMain(MojoHandle shell_handle) { | 59 MojoResult MojoMain(MojoHandle shell_handle) { |
| 59 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp); | 60 mojo::ApplicationRunnerChromium runner(new mojo::examples::GaneshApp); |
| 60 return runner.Run(shell_handle); | 61 return runner.Run(shell_handle); |
| 61 } | 62 } |
| OLD | NEW |