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

Side by Side Diff: mojo/examples/compositor_app/compositor_app.cc

Issue 510553002: Teach the native viewport service to draw a Surface into itself (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | mojo/examples/pepper_container_app/pepper_container_app.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 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/macros.h" 8 #include "base/macros.h"
9 #include "mojo/examples/compositor_app/compositor_host.h" 9 #include "mojo/examples/compositor_app/compositor_host.h"
10 #include "mojo/public/c/system/main.h" 10 #include "mojo/public/c/system/main.h"
(...skipping 19 matching lines...) Expand all
30 viewport_.set_client(this); 30 viewport_.set_client(this);
31 viewport_->Create(Rect::From(gfx::Rect(10, 10, 800, 600))); 31 viewport_->Create(Rect::From(gfx::Rect(10, 10, 800, 600)));
32 viewport_->Show(); 32 viewport_->Show();
33 33
34 // TODO(jamesr): Should be mojo:mojo_gpu_service 34 // TODO(jamesr): Should be mojo:mojo_gpu_service
35 app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_); 35 app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_);
36 } 36 }
37 37
38 virtual void OnCreated(uint64_t native_viewport_id) OVERRIDE { 38 virtual void OnCreated(uint64_t native_viewport_id) OVERRIDE {
39 CommandBufferPtr cb; 39 CommandBufferPtr cb;
40 // TODO(jamesr): Output to a surface instead.
40 gpu_service_->CreateOnscreenGLES2Context( 41 gpu_service_->CreateOnscreenGLES2Context(
41 native_viewport_id, Size::From(gfx::Size(800, 600)), Get(&cb)); 42 native_viewport_id, Size::From(gfx::Size(800, 600)), Get(&cb));
42 host_.reset(new CompositorHost(cb.PassMessagePipe())); 43 host_.reset(new CompositorHost(cb.PassMessagePipe()));
43 } 44 }
44 45
45 virtual void OnDestroyed() OVERRIDE { base::MessageLoop::current()->Quit(); } 46 virtual void OnDestroyed() OVERRIDE { base::MessageLoop::current()->Quit(); }
46 47
47 virtual void OnBoundsChanged(RectPtr bounds) OVERRIDE { 48 virtual void OnBoundsChanged(RectPtr bounds) OVERRIDE {
48 if (host_) 49 if (host_)
49 host_->SetSize(gfx::Size(bounds->width, bounds->height)); 50 host_->SetSize(gfx::Size(bounds->width, bounds->height));
(...skipping 11 matching lines...) Expand all
61 DISALLOW_COPY_AND_ASSIGN(SampleApp); 62 DISALLOW_COPY_AND_ASSIGN(SampleApp);
62 }; 63 };
63 64
64 } // namespace examples 65 } // namespace examples
65 } // namespace mojo 66 } // namespace mojo
66 67
67 MojoResult MojoMain(MojoHandle shell_handle) { 68 MojoResult MojoMain(MojoHandle shell_handle) {
68 mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp); 69 mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp);
69 return runner.Run(shell_handle); 70 return runner.Run(shell_handle);
70 } 71 }
OLDNEW
« no previous file with comments | « no previous file | mojo/examples/pepper_container_app/pepper_container_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698