Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / mojo / examples / compositor_app / compositor_app.cc

diff --git a/src/mojo/examples/compositor_app/compositor_app.cc b/src/mojo/examples/compositor_app/compositor_app.cc
index 513379e..0a7607b 100644 (file)
--- a/src/mojo/examples/compositor_app/compositor_app.cc
+++ b/src/mojo/examples/compositor_app/compositor_app.cc
@@ -6,11 +6,14 @@
 #include <string>
 
 #include "base/macros.h"
+#include "mojo/application/application_runner_chromium.h"
 #include "mojo/examples/compositor_app/compositor_host.h"
+#include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
+#include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h"
 #include "ui/gfx/rect.h"
 
@@ -25,25 +28,26 @@ class SampleApp : public ApplicationDelegate, public NativeViewportClient {
   virtual void Initialize(ApplicationImpl* app) OVERRIDE {
     app->ConnectToService("mojo:mojo_native_viewport_service", &viewport_);
     viewport_.set_client(this);
-    viewport_->Create(Rect::From(gfx::Rect(10, 10, 800, 600)));
+    viewport_->Create(Size::From(gfx::Size(800, 600)));
     viewport_->Show();
 
-    MessagePipe pipe;
-    viewport_->CreateGLES2Context(
-        MakeRequest<CommandBuffer>(pipe.handle0.Pass()));
-    host_.reset(new CompositorHost(pipe.handle1.Pass()));
+    // TODO(jamesr): Should be mojo:mojo_gpu_service
+    app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_);
   }
 
-  virtual void OnCreated() OVERRIDE {
+  virtual void OnCreated(uint64_t native_viewport_id) OVERRIDE {
+    CommandBufferPtr cb;
+    // TODO(jamesr): Output to a surface instead.
+    gpu_service_->CreateOnscreenGLES2Context(
+        native_viewport_id, Size::From(gfx::Size(800, 600)), Get(&cb));
+    host_.reset(new CompositorHost(cb.PassMessagePipe()));
   }
 
-  virtual void OnDestroyed(const mojo::Callback<void()>& callback) OVERRIDE {
-    base::MessageLoop::current()->Quit();
-    callback.Run();
-  }
+  virtual void OnDestroyed() OVERRIDE { base::MessageLoop::current()->Quit(); }
 
-  virtual void OnBoundsChanged(RectPtr bounds) OVERRIDE {
-    host_->SetSize(gfx::Size(bounds->width, bounds->height));
+  virtual void OnBoundsChanged(SizePtr bounds) OVERRIDE {
+    if (host_)
+      host_->SetSize(bounds.To<gfx::Size>());
   }
 
   virtual void OnEvent(EventPtr event,
@@ -53,15 +57,15 @@ class SampleApp : public ApplicationDelegate, public NativeViewportClient {
 
  private:
   NativeViewportPtr viewport_;
+  GpuPtr gpu_service_;
   scoped_ptr<CompositorHost> host_;
   DISALLOW_COPY_AND_ASSIGN(SampleApp);
 };
 
 }  // namespace examples
+}  // namespace mojo
 
-// static
-ApplicationDelegate* ApplicationDelegate::Create() {
-  return new examples::SampleApp();
+MojoResult MojoMain(MojoHandle shell_handle) {
+  mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp);
+  return runner.Run(shell_handle);
 }
-
-}  // namespace mojo