Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Side by Side Diff: examples/surfaces_app/child_gl_app.cc

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « examples/surfaces_app/child_app.cc ('k') | examples/wget/wget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/surfaces_app/child_gl_impl.h"
8 #include "mojo/application/application_runner_chromium.h" 8 #include "mojo/application/application_runner_chromium.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"
11 #include "mojo/public/cpp/application/application_delegate.h" 11 #include "mojo/public/cpp/application/application_delegate.h"
12 #include "mojo/public/cpp/application/application_impl.h" 12 #include "mojo/public/cpp/application/application_impl.h"
13 #include "mojo/public/cpp/bindings/string.h" 13 #include "mojo/public/cpp/bindings/string.h"
14 #include "mojo/services/gpu/public/interfaces/gpu.mojom.h" 14 #include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
15 15
16 namespace mojo { 16 namespace mojo {
17 namespace examples { 17 namespace examples {
18 18
19 class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> { 19 class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> {
20 public: 20 public:
21 ChildGLApp() {} 21 ChildGLApp() {}
22 virtual ~ChildGLApp() {} 22 ~ChildGLApp() override {}
23 23
24 virtual void Initialize(ApplicationImpl* app) override { 24 void Initialize(ApplicationImpl* app) override {
25 surfaces_service_connection_ = 25 surfaces_service_connection_ =
26 app->ConnectToApplication("mojo:surfaces_service"); 26 app->ConnectToApplication("mojo:surfaces_service");
27 // TODO(jamesr): Should be mojo:gpu_service 27 // TODO(jamesr): Should be mojo:gpu_service
28 app->ConnectToService("mojo:native_viewport_service", &gpu_service_); 28 app->ConnectToService("mojo:native_viewport_service", &gpu_service_);
29 } 29 }
30 30
31 // ApplicationDelegate implementation. 31 // ApplicationDelegate implementation.
32 virtual bool ConfigureIncomingConnection( 32 bool ConfigureIncomingConnection(
33 ApplicationConnection* connection) override { 33 ApplicationConnection* connection) override {
34 connection->AddService(this); 34 connection->AddService(this);
35 return true; 35 return true;
36 } 36 }
37 37
38 // InterfaceFactory<Child> implementation. 38 // InterfaceFactory<Child> implementation.
39 virtual void Create(ApplicationConnection* connection, 39 void Create(ApplicationConnection* connection,
40 InterfaceRequest<Child> request) override { 40 InterfaceRequest<Child> request) override {
41 CommandBufferPtr command_buffer; 41 CommandBufferPtr command_buffer;
42 gpu_service_->CreateOffscreenGLES2Context(GetProxy(&command_buffer)); 42 gpu_service_->CreateOffscreenGLES2Context(GetProxy(&command_buffer));
43 new ChildGLImpl(surfaces_service_connection_, command_buffer.Pass(), 43 new ChildGLImpl(surfaces_service_connection_, command_buffer.Pass(),
44 request.Pass()); 44 request.Pass());
45 } 45 }
46 46
47 private: 47 private:
48 ApplicationConnection* surfaces_service_connection_; 48 ApplicationConnection* surfaces_service_connection_;
49 GpuPtr gpu_service_; 49 GpuPtr gpu_service_;
50 50
51 DISALLOW_COPY_AND_ASSIGN(ChildGLApp); 51 DISALLOW_COPY_AND_ASSIGN(ChildGLApp);
52 }; 52 };
53 53
54 } // namespace examples 54 } // namespace examples
55 } // namespace mojo 55 } // namespace mojo
56 56
57 MojoResult MojoMain(MojoHandle shell_handle) { 57 MojoResult MojoMain(MojoHandle shell_handle) {
58 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp); 58 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp);
59 return runner.Run(shell_handle); 59 return runner.Run(shell_handle);
60 } 60 }
OLDNEW
« no previous file with comments | « examples/surfaces_app/child_app.cc ('k') | examples/wget/wget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698