Use Binding<Interface> in surfaces and gles2 code

mojo/gles2/command_buffer_client_impl.cc

 // Copyright 2014 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.
 
 #include "mojo/gles2/command_buffer_client_impl.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/process/process_handle.h"
@@ skipping 27 matching lines @@
 
   return true;
 }
 
 }  // namespace
 
 CommandBufferDelegate::~CommandBufferDelegate() {}
 
 void CommandBufferDelegate::ContextLost() {}
 
-class CommandBufferClientImpl::SyncClientImpl
-    : public InterfaceImpl<CommandBufferSyncClient> {
+class CommandBufferClientImpl::SyncClientImpl : public CommandBufferSyncClient {
  public:
-  SyncClientImpl() : initialized_successfully_(false) {}
+  SyncClientImpl(CommandBufferSyncClientPtr* ptr,
+                 const MojoAsyncWaiter* async_waiter)
+      : initialized_successfully_(false), binding_(this, ptr, async_waiter) {}
 
   bool WaitForInitialization() {
-    if (!WaitForIncomingMethodCall())
+    if (!binding_.WaitForIncomingMethodCall())
       return false;
     return initialized_successfully_;
   }
 
   CommandBufferStatePtr WaitForProgress() {
-    if (!WaitForIncomingMethodCall())
+    if (!binding_.WaitForIncomingMethodCall())
       return CommandBufferStatePtr();
     return command_buffer_state_.Pass();
   }
 
   gpu::Capabilities GetCapabilities() {
     return capabilities_.To<gpu::Capabilities>();
   }
 
  private:
   // CommandBufferSyncClient methods:
   void DidInitialize(bool success, GpuCapabilitiesPtr capabilities) override {
     initialized_successfully_ = success;
     capabilities_ = capabilities.Pass();
   }
   void DidMakeProgress(CommandBufferStatePtr state) override {
     command_buffer_state_ = state.Pass();
   }
 
   bool initialized_successfully_;
   GpuCapabilitiesPtr capabilities_;
   CommandBufferStatePtr command_buffer_state_;
+  Binding<CommandBufferSyncClient> binding_;
+
+  DISALLOW_COPY_AND_ASSIGN(SyncClientImpl);
 };
 
 CommandBufferClientImpl::CommandBufferClientImpl(
     CommandBufferDelegate* delegate,
     const MojoAsyncWaiter* async_waiter,
     ScopedMessagePipeHandle command_buffer_handle)
     : delegate_(delegate),
       shared_state_(NULL),
       last_put_offset_(-1),
       next_transfer_buffer_id_(0),
@@ skipping 12 matching lines @@
   bool result = CreateMapAndDupSharedBuffer(
       kSharedStateSize, &memory, &shared_state_handle_, &duped);
   if (!result)
     return false;
 
   shared_state_ = static_cast<gpu::CommandBufferSharedState*>(memory);
 
   shared_state()->Initialize();
 
   CommandBufferSyncClientPtr sync_client;
-  sync_client_impl_.reset(
-      WeakBindToProxy(new SyncClientImpl(), &sync_client, async_waiter_));
+  sync_client_impl_.reset(new SyncClientImpl(&sync_client, async_waiter_));
 
   command_buffer_->Initialize(sync_client.Pass(), duped.Pass());
 
   // Wait for DidInitialize to come on the sync client pipe.
   if (!sync_client_impl_->WaitForInitialization()) {
     VLOG(1) << "Channel encountered error while creating command buffer";
     return false;
   }
   capabilities_ = sync_client_impl_->GetCapabilities();
   return true;
@@ skipping 163 matching lines @@
     DidDestroy();
     return;
   }
 
   if (state->generation - last_state_.generation < 0x80000000U)
     last_state_ = state.To<State>();
 }
 
 }  // namespace gles2
 }  // namespace mojo