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

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

Issue 534843002: Convert view manager to surfaces with uploading shim in client lib (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove overzealous shutdown check in cc/surfaces, add NON_EXPORTED_BASE for windows build, saturate… 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
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 10 matching lines...) Expand all
21 namespace examples { 21 namespace examples {
22 22
23 class SampleApp : public ApplicationDelegate, public NativeViewportClient { 23 class SampleApp : public ApplicationDelegate, public NativeViewportClient {
24 public: 24 public:
25 SampleApp() {} 25 SampleApp() {}
26 virtual ~SampleApp() {} 26 virtual ~SampleApp() {}
27 27
28 virtual void Initialize(ApplicationImpl* app) OVERRIDE { 28 virtual void Initialize(ApplicationImpl* app) OVERRIDE {
29 app->ConnectToService("mojo:mojo_native_viewport_service", &viewport_); 29 app->ConnectToService("mojo:mojo_native_viewport_service", &viewport_);
30 viewport_.set_client(this); 30 viewport_.set_client(this);
31 viewport_->Create(Rect::From(gfx::Rect(10, 10, 800, 600))); 31 viewport_->Create(Size::From(gfx::Size(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 // TODO(jamesr): Output to a surface instead.
41 gpu_service_->CreateOnscreenGLES2Context( 41 gpu_service_->CreateOnscreenGLES2Context(
42 native_viewport_id, Size::From(gfx::Size(800, 600)), Get(&cb)); 42 native_viewport_id, Size::From(gfx::Size(800, 600)), Get(&cb));
43 host_.reset(new CompositorHost(cb.PassMessagePipe())); 43 host_.reset(new CompositorHost(cb.PassMessagePipe()));
44 } 44 }
45 45
46 virtual void OnDestroyed() OVERRIDE { base::MessageLoop::current()->Quit(); } 46 virtual void OnDestroyed() OVERRIDE { base::MessageLoop::current()->Quit(); }
47 47
48 virtual void OnBoundsChanged(RectPtr bounds) OVERRIDE { 48 virtual void OnBoundsChanged(SizePtr bounds) OVERRIDE {
49 if (host_) 49 if (host_)
50 host_->SetSize(gfx::Size(bounds->width, bounds->height)); 50 host_->SetSize(bounds.To<gfx::Size>());
51 } 51 }
52 52
53 virtual void OnEvent(EventPtr event, 53 virtual void OnEvent(EventPtr event,
54 const mojo::Callback<void()>& callback) OVERRIDE { 54 const mojo::Callback<void()>& callback) OVERRIDE {
55 callback.Run(); 55 callback.Run();
56 } 56 }
57 57
58 private: 58 private:
59 NativeViewportPtr viewport_; 59 NativeViewportPtr viewport_;
60 GpuPtr gpu_service_; 60 GpuPtr gpu_service_;
61 scoped_ptr<CompositorHost> host_; 61 scoped_ptr<CompositorHost> host_;
62 DISALLOW_COPY_AND_ASSIGN(SampleApp); 62 DISALLOW_COPY_AND_ASSIGN(SampleApp);
63 }; 63 };
64 64
65 } // namespace examples 65 } // namespace examples
66 } // namespace mojo 66 } // namespace mojo
67 67
68 MojoResult MojoMain(MojoHandle shell_handle) { 68 MojoResult MojoMain(MojoHandle shell_handle) {
69 mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp); 69 mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp);
70 return runner.Run(shell_handle); 70 return runner.Run(shell_handle);
71 } 71 }
OLDNEW
« no previous file with comments | « cc/surfaces/surface_manager.cc ('k') | mojo/examples/pepper_container_app/pepper_container_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698