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/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
8 #include "mojo/common/tracing_impl.h" | 8 #include "mojo/common/tracing_impl.h" |
9 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
10 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 | 48 |
49 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { | 49 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { |
50 connection->AddService<NativeViewport>(this); | 50 connection->AddService<NativeViewport>(this); |
51 connection->AddService<Gpu>(this); | 51 connection->AddService<Gpu>(this); |
52 return true; | 52 return true; |
53 } | 53 } |
54 | 54 |
55 // mojo::InterfaceFactory<NativeViewport> implementation. | 55 // mojo::InterfaceFactory<NativeViewport> implementation. |
56 void Create(ApplicationConnection* connection, | 56 void Create(ApplicationConnection* connection, |
57 mojo::InterfaceRequest<NativeViewport> request) override { | 57 mojo::InterfaceRequest<NativeViewport> request) override { |
58 BindToRequest(new NativeViewportImpl(app_, is_headless_), &request); | 58 new NativeViewportImpl(app_, is_headless_, request.Pass()); |
59 } | 59 } |
60 | 60 |
61 // mojo::InterfaceFactory<Gpu> implementation. | 61 // mojo::InterfaceFactory<Gpu> implementation. |
62 void Create(ApplicationConnection* connection, | 62 void Create(ApplicationConnection* connection, |
63 mojo::InterfaceRequest<Gpu> request) override { | 63 mojo::InterfaceRequest<Gpu> request) override { |
64 if (!gpu_state_.get()) | 64 if (!gpu_state_.get()) |
65 gpu_state_ = new gles2::GpuImpl::State; | 65 gpu_state_ = new gles2::GpuImpl::State; |
66 new gles2::GpuImpl(request.Pass(), gpu_state_); | 66 new gles2::GpuImpl(request.Pass(), gpu_state_); |
67 } | 67 } |
68 | 68 |
69 mojo::ApplicationImpl* app_; | 69 mojo::ApplicationImpl* app_; |
70 scoped_refptr<gles2::GpuImpl::State> gpu_state_; | 70 scoped_refptr<gles2::GpuImpl::State> gpu_state_; |
71 bool is_headless_; | 71 bool is_headless_; |
72 DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate); | 72 DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate); |
73 }; | 73 }; |
74 } | 74 } |
75 | 75 |
76 MojoResult MojoMain(MojoHandle shell_handle) { | 76 MojoResult MojoMain(MojoHandle shell_handle) { |
77 mojo::ApplicationRunnerChromium runner( | 77 mojo::ApplicationRunnerChromium runner( |
78 new native_viewport::NativeViewportAppDelegate); | 78 new native_viewport::NativeViewportAppDelegate); |
79 runner.set_message_loop_type(base::MessageLoop::TYPE_UI); | 79 runner.set_message_loop_type(base::MessageLoop::TYPE_UI); |
80 return runner.Run(shell_handle); | 80 return runner.Run(shell_handle); |
81 } | 81 } |
OLD | NEW |