Cleanse mojo/services/gles2 of InterfaceImpl

mojo/services/gles2/command_buffer_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.
 
 #include "mojo/services/gles2/command_buffer_impl.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "gpu/command_buffer/common/constants.h"
@@ skipping 26 matching lines @@
 
  private:
   ~MemoryTrackerStub() override {}
 
   DISALLOW_COPY_AND_ASSIGN(MemoryTrackerStub);
 };
 
 }  // anonymous namespace
 
 CommandBufferImpl::CommandBufferImpl(
+    InterfaceRequest<CommandBuffer> request,
     gfx::GLShareGroup* share_group,
     gpu::gles2::MailboxManager* mailbox_manager)
-    : widget_(gfx::kNullAcceleratedWidget),
-      size_(1, 1),
-      share_group_(share_group),
-      mailbox_manager_(mailbox_manager) {
+    : CommandBufferImpl(request.Pass(),
+                        gfx::kNullAcceleratedWidget,
+                        gfx::Size(1, 1),
+                        share_group,
+                        mailbox_manager) {
 }
 
 CommandBufferImpl::CommandBufferImpl(
+    InterfaceRequest<CommandBuffer> request,
     gfx::AcceleratedWidget widget,
     const gfx::Size& size,
     gfx::GLShareGroup* share_group,
     gpu::gles2::MailboxManager* mailbox_manager)
     : widget_(widget),
       size_(size),
       share_group_(share_group),
-      mailbox_manager_(mailbox_manager) {
+      mailbox_manager_(mailbox_manager),
+      binding_(this, request.Pass()) {
 }
 
 CommandBufferImpl::~CommandBufferImpl() {
-  client()->DidDestroy();
+  binding_.client()->DidDestroy();
   if (decoder_) {
     bool have_context = decoder_->MakeCurrent();
     decoder_->Destroy(have_context);
   }
 }
 
 void CommandBufferImpl::Initialize(
     CommandBufferSyncClientPtr sync_client,
     mojo::ScopedSharedBufferHandle shared_state) {
   sync_client_ = sync_client.Pass();
@@ skipping 74 matching lines @@
   return true;
 }
 
 void CommandBufferImpl::SetGetBuffer(int32_t buffer) {
   command_buffer_->SetGetBuffer(buffer);
 }
 
 void CommandBufferImpl::Flush(int32_t put_offset) {
   if (!context_->MakeCurrent(surface_.get())) {
     DLOG(WARNING) << "Context lost";
-    client()->LostContext(gpu::error::kUnknown);
+    binding_.client()->LostContext(gpu::error::kUnknown);
     return;
   }
   command_buffer_->Flush(put_offset);
 }
 
 void CommandBufferImpl::MakeProgress(int32_t last_get_offset) {
   // TODO(piman): handle out-of-order.
   sync_client_->DidMakeProgress(
       CommandBufferState::From(command_buffer_->GetLastState()));
 }
@@ skipping 16 matching lines @@
 void CommandBufferImpl::DestroyTransferBuffer(int32_t id) {
   command_buffer_->DestroyTransferBuffer(id);
 }
 
 void CommandBufferImpl::Echo(const Callback<void()>& callback) {
   callback.Run();
 }
 
 void CommandBufferImpl::OnParseError() {
   gpu::CommandBuffer::State state = command_buffer_->GetLastState();
-  client()->LostContext(state.context_lost_reason);
+  binding_.client()->LostContext(state.context_lost_reason);
 }
 
 void CommandBufferImpl::OnResize(gfx::Size size, float scale_factor) {
   surface_->Resize(size);
 }
 
 }  // namespace mojo