| OLD | NEW | 
|---|
| 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 "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" | 
| 10 #include "mojo/examples/compositor_app/compositor_host.h" | 10 #include "mojo/examples/compositor_app/compositor_host.h" | 
| 11 #include "mojo/geometry/geometry_type_converters.h" | 11 #include "mojo/geometry/geometry_type_converters.h" | 
| 12 #include "mojo/public/cpp/bindings/allocation_scope.h" |  | 
| 13 #include "mojo/public/cpp/gles2/gles2.h" | 12 #include "mojo/public/cpp/gles2/gles2.h" | 
| 14 #include "mojo/public/cpp/shell/application.h" | 13 #include "mojo/public/cpp/shell/application.h" | 
| 15 #include "mojo/public/cpp/system/core.h" | 14 #include "mojo/public/cpp/system/core.h" | 
| 16 #include "mojo/public/interfaces/shell/shell.mojom.h" | 15 #include "mojo/public/interfaces/shell/shell.mojom.h" | 
| 17 #include "mojo/services/native_viewport/native_viewport.mojom.h" | 16 #include "mojo/services/native_viewport/native_viewport.mojom.h" | 
| 18 #include "ui/gfx/rect.h" | 17 #include "ui/gfx/rect.h" | 
| 19 | 18 | 
| 20 #if defined(WIN32) | 19 #if defined(WIN32) | 
| 21 #if !defined(CDECL) | 20 #if !defined(CDECL) | 
| 22 #define CDECL __cdecl | 21 #define CDECL __cdecl | 
| 23 #endif | 22 #endif | 
| 24 #define SAMPLE_APP_EXPORT __declspec(dllexport) | 23 #define SAMPLE_APP_EXPORT __declspec(dllexport) | 
| 25 #else | 24 #else | 
| 26 #define CDECL | 25 #define CDECL | 
| 27 #define SAMPLE_APP_EXPORT __attribute__((visibility("default"))) | 26 #define SAMPLE_APP_EXPORT __attribute__((visibility("default"))) | 
| 28 #endif | 27 #endif | 
| 29 | 28 | 
| 30 namespace mojo { | 29 namespace mojo { | 
| 31 namespace examples { | 30 namespace examples { | 
| 32 | 31 | 
| 33 class SampleApp : public Application, public NativeViewportClient { | 32 class SampleApp : public Application, public NativeViewportClient { | 
| 34  public: | 33  public: | 
| 35   explicit SampleApp(MojoHandle shell_handle) : Application(shell_handle) { | 34   explicit SampleApp(MojoHandle shell_handle) : Application(shell_handle) { | 
| 36     AllocationScope scope; |  | 
| 37 |  | 
| 38     ConnectTo("mojo:mojo_native_viewport_service", &viewport_); | 35     ConnectTo("mojo:mojo_native_viewport_service", &viewport_); | 
| 39     viewport_.set_client(this); | 36     viewport_.set_client(this); | 
| 40 | 37 | 
| 41     viewport_->Create(gfx::Rect(10, 10, 800, 600)); | 38     viewport_->Create(Rect::From(gfx::Rect(10, 10, 800, 600))); | 
| 42     viewport_->Show(); | 39     viewport_->Show(); | 
| 43 | 40 | 
| 44     MessagePipe gles2_pipe; | 41     MessagePipe gles2_pipe; | 
| 45     viewport_->CreateGLES2Context(gles2_pipe.handle0.Pass()); | 42     viewport_->CreateGLES2Context(gles2_pipe.handle0.Pass()); | 
| 46     host_.reset(new CompositorHost(gles2_pipe.handle1.Pass())); | 43     host_.reset(new CompositorHost(gles2_pipe.handle1.Pass())); | 
| 47   } | 44   } | 
| 48 | 45 | 
| 49   virtual void OnCreated() OVERRIDE { | 46   virtual void OnCreated() OVERRIDE { | 
| 50   } | 47   } | 
| 51 | 48 | 
| 52   virtual void OnDestroyed() OVERRIDE { | 49   virtual void OnDestroyed() OVERRIDE { | 
| 53     base::MessageLoop::current()->Quit(); | 50     base::MessageLoop::current()->Quit(); | 
| 54   } | 51   } | 
| 55 | 52 | 
| 56   virtual void OnBoundsChanged(const Rect& bounds) OVERRIDE { | 53   virtual void OnBoundsChanged(RectPtr bounds) OVERRIDE { | 
| 57     host_->SetSize(bounds.size()); | 54     host_->SetSize(bounds->size.To<gfx::Size>()); | 
| 58   } | 55   } | 
| 59 | 56 | 
| 60   virtual void OnEvent(const Event& event, | 57   virtual void OnEvent(EventPtr event, | 
| 61                        const mojo::Callback<void()>& callback) OVERRIDE { | 58                        const mojo::Callback<void()>& callback) OVERRIDE { | 
| 62     callback.Run(); | 59     callback.Run(); | 
| 63   } | 60   } | 
| 64 | 61 | 
| 65  private: | 62  private: | 
| 66   NativeViewportPtr viewport_; | 63   NativeViewportPtr viewport_; | 
| 67   scoped_ptr<CompositorHost> host_; | 64   scoped_ptr<CompositorHost> host_; | 
| 68 }; | 65 }; | 
| 69 | 66 | 
| 70 }  // namespace examples | 67 }  // namespace examples | 
| 71 }  // namespace mojo | 68 }  // namespace mojo | 
| 72 | 69 | 
| 73 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain( | 70 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain( | 
| 74     MojoHandle shell_handle) { | 71     MojoHandle shell_handle) { | 
| 75   base::MessageLoop loop; | 72   base::MessageLoop loop; | 
| 76   mojo::GLES2Initializer gles2; | 73   mojo::GLES2Initializer gles2; | 
| 77 | 74 | 
| 78   mojo::examples::SampleApp app(shell_handle); | 75   mojo::examples::SampleApp app(shell_handle); | 
| 79   loop.Run(); | 76   loop.Run(); | 
| 80   return MOJO_RESULT_OK; | 77   return MOJO_RESULT_OK; | 
| 81 } | 78 } | 
| OLD | NEW | 
|---|