Mojo C++ bindings: Generate InterfaceHandle<> instead of InterfacePtr<>.

examples/spinning_cube/gles2_client_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include "examples/spinning_cube/gles2_client_impl.h"
 
 #include <math.h>
 #include <stdlib.h>
 #include <cmath>
+#include <utility>
 
 #include "mojo/public/c/gpu/MGL/mgl.h"
 #include "mojo/public/c/gpu/MGL/mgl_onscreen.h"
+#include "mojo/public/cpp/bindings/interface_handle.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 
 namespace examples {
 namespace {
 
 // TODO(johngro) : investigate extending mojom with a formal flags type which it
 // generates good bindings for, so we don't need to resort to this.
 static inline constexpr bool operator &(const mojo::EventFlags& f1,
                                         const mojo::EventFlags& f2) {
@@ skipping 22 matching lines @@
                       : (current.y - last.y);
   return delta > 0 ? -1 : 1;
 }
 }  // namespace
 
 GLES2ClientImpl::GLES2ClientImpl(mojo::ContextProviderPtr context_provider)
     : last_time_(mojo::GetTimeTicksNow()),
       waiting_to_draw_(false),
       context_provider_(context_provider.Pass()),
       context_(nullptr) {
-  context_provider_->Create(nullptr,
-                            [this](mojo::CommandBufferPtr command_buffer) {
-                              ContextCreated(command_buffer.Pass());
-                            });
+  context_provider_->Create(
+      nullptr,
+      [this](mojo::InterfaceHandle<mojo::CommandBuffer> command_buffer) {
+        ContextCreated(std::move(command_buffer));
+      });
 }
 
 GLES2ClientImpl::~GLES2ClientImpl() {
   MGLDestroyContext(context_);
 }
 
 void GLES2ClientImpl::SetSize(const mojo::Size& size) {
   size_ = size;
   cube_.set_size(size_.width, size_.height);
   if (size_.width == 0 || size_.height == 0 || !context_)
@@ skipping 52 matching lines @@
 
       capture_point_ = last_drag_point_ = mojo::PointF();
       WantToDraw();
       break;
     }
     default:
       break;
   }
 }
 
-void GLES2ClientImpl::ContextCreated(mojo::CommandBufferPtr command_buffer) {
-  context_ = MGLCreateContext(
-      MGL_API_VERSION_GLES2,
-      command_buffer.PassInterfaceHandle().PassHandle().release().value(),
-      MGL_NO_CONTEXT, &ContextLostThunk, this,
-      mojo::Environment::GetDefaultAsyncWaiter());
+void GLES2ClientImpl::ContextCreated(
+    mojo::InterfaceHandle<mojo::CommandBuffer> command_buffer) {
+  context_ = MGLCreateContext(MGL_API_VERSION_GLES2,
+                              command_buffer.PassHandle().release().value(),
+                              MGL_NO_CONTEXT, &ContextLostThunk, this,
+                              mojo::Environment::GetDefaultAsyncWaiter());
   MGLMakeCurrent(context_);
   cube_.Init();
   WantToDraw();
 }
 
 void GLES2ClientImpl::ContextLost() {
   cube_.OnGLContextLost();
   MGLDestroyContext(context_);
   context_ = nullptr;
-  context_provider_->Create(nullptr,
-                            [this](mojo::CommandBufferPtr command_buffer) {
-                              ContextCreated(command_buffer.Pass());
-                            });
+  context_provider_->Create(
+      nullptr,
+      [this](mojo::InterfaceHandle<mojo::CommandBuffer> command_buffer) {
+        ContextCreated(std::move(command_buffer));
+      });
 }
 
 void GLES2ClientImpl::ContextLostThunk(void* closure) {
   static_cast<GLES2ClientImpl*>(closure)->ContextLost();
 }
 
 void GLES2ClientImpl::WantToDraw() {
   if (waiting_to_draw_ || !context_)
     return;
   waiting_to_draw_ = true;
@@ skipping 10 matching lines @@
   float delta = static_cast<float>(offset) / 1000000.;
   last_time_ = now;
   cube_.UpdateForTimeDelta(delta);
   cube_.Draw();
 
   MGLSwapBuffers();
   WantToDraw();
 }
 
 }  // namespace examples