Revert of Support impl-side painting in Mandoline.

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"
 #include "components/view_manager/gles2/command_buffer_type_conversions.h"
 #include "components/view_manager/gles2/mojo_buffer_backing.h"
-#include "components/view_manager/gles2/mojo_gpu_memory_buffer.h"
-#include "gpu/command_buffer/service/image_factory.h"
-#include "mojo/platform_handle/platform_handle_functions.h"
 
 namespace gles2 {
 
 namespace {
 
 bool CreateMapAndDupSharedBuffer(size_t size,
                                  void** memory,
                                  mojo::ScopedSharedBufferHandle* handle,
                                  mojo::ScopedSharedBufferHandle* duped) {
   MojoResult result = mojo::CreateSharedBuffer(NULL, size, handle);
@@ skipping 90 matching lines @@
 
 CommandBufferClientImpl::CommandBufferClientImpl(
     CommandBufferDelegate* delegate,
     const MojoAsyncWaiter* async_waiter,
     mojo::ScopedMessagePipeHandle command_buffer_handle)
     : delegate_(delegate),
       observer_binding_(this),
       shared_state_(NULL),
       last_put_offset_(-1),
       next_transfer_buffer_id_(0),
-      next_image_id_(0),
       async_waiter_(async_waiter) {
   command_buffer_.Bind(mojo::InterfacePtrInfo<mojo::CommandBuffer>(
                            command_buffer_handle.Pass(), 0u),
                        async_waiter);
   command_buffer_.set_error_handler(this);
 }
 
 CommandBufferClientImpl::~CommandBufferClientImpl() {}
 
 bool CommandBufferClientImpl::Initialize() {
@@ skipping 105 matching lines @@
 }
 
 gpu::Capabilities CommandBufferClientImpl::GetCapabilities() {
   return capabilities_;
 }
 
 int32_t CommandBufferClientImpl::CreateImage(ClientBuffer buffer,
                                              size_t width,
                                              size_t height,
                                              unsigned internalformat) {
-  int32 new_id = ++next_image_id_;
-
-  mojo::SizePtr size = mojo::Size::New();
-  size->width = width;
-  size->height = height;
-
-  MojoGpuMemoryBufferImpl* gpu_memory_buffer =
-      MojoGpuMemoryBufferImpl::FromClientBuffer(buffer);
-  gfx::GpuMemoryBufferHandle handle = gpu_memory_buffer->GetHandle();
-
-  bool requires_sync_point = false;
-  base::SharedMemoryHandle dupd_handle =
-      base::SharedMemory::DuplicateHandle(handle.handle);
-#if defined(OS_WIN)
-  HANDLE platform_handle = dupd_handle;
-#else
-  int platform_handle = dupd_handle.fd;
-#endif
-
-  if (handle.type != gfx::SHARED_MEMORY_BUFFER) {
-    requires_sync_point = true;
-    NOTIMPLEMENTED();
-    return -1;
-  }
-
-  MojoHandle mojo_handle = MOJO_HANDLE_INVALID;
-  MojoResult create_result = MojoCreatePlatformHandleWrapper(
-      platform_handle, &mojo_handle);
-  if (create_result != MOJO_RESULT_OK) {
-    NOTIMPLEMENTED();
-    return -1;
-  }
-  mojo::ScopedHandle scoped_handle;
-  scoped_handle.reset(mojo::Handle(mojo_handle));
-  command_buffer_->CreateImage(new_id,
-                               scoped_handle.Pass(),
-                               handle.type,
-                               size.Pass(),
-                               gpu_memory_buffer->GetFormat(),
-                               internalformat);
-  if (requires_sync_point) {
-    NOTIMPLEMENTED();
-    // TODO(jam): need to support this if we support types other than
-    // SHARED_MEMORY_BUFFER.
-    //gpu_memory_buffer_manager->SetDestructionSyncPoint(gpu_memory_buffer,
-    //                                                   InsertSyncPoint());
-  }
-
-  return new_id;
+  // TODO(piman)
+  NOTIMPLEMENTED();
+  return -1;
 }
 
 void CommandBufferClientImpl::DestroyImage(int32 id) {
-  command_buffer_->DestroyImage(id);
+  // TODO(piman)
+  NOTIMPLEMENTED();
 }
 
 int32_t CommandBufferClientImpl::CreateGpuMemoryBufferImage(
     size_t width,
     size_t height,
     unsigned internalformat,
     unsigned usage) {
-  scoped_ptr<gfx::GpuMemoryBuffer> buffer(MojoGpuMemoryBufferImpl::Create(
-      gfx::Size(width, height),
-      gpu::ImageFactory::ImageFormatToGpuMemoryBufferFormat(internalformat),
-      gpu::ImageFactory::ImageUsageToGpuMemoryBufferUsage(usage)));
-  if (!buffer)
-    return -1;
-
-  return CreateImage(buffer->AsClientBuffer(), width, height, internalformat);
+  // TODO(piman)
+  NOTIMPLEMENTED();
+  return -1;
 }
 
 uint32_t CommandBufferClientImpl::InsertSyncPoint() {
   command_buffer_->InsertSyncPoint(true);
   return sync_point_client_impl_->WaitForInsertSyncPoint();
 }
 
 uint32_t CommandBufferClientImpl::InsertFutureSyncPoint() {
   command_buffer_->InsertSyncPoint(false);
   return sync_point_client_impl_->WaitForInsertSyncPoint();
@@ skipping 58 matching lines @@
 
 void CommandBufferClientImpl::SetLock(base::Lock* lock) {
 }
 
 bool CommandBufferClientImpl::IsGpuChannelLost() {
   // This is only possible for out-of-process command buffers.
   return false;
 }
 
 }  // namespace gles2