Revert of Add ClientNativePixmap multi-planar support.

gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.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 "gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
@@ skipping 17 matching lines @@
     gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     gfx::BufferFormat format,
     const DestructionCallback& callback,
     std::unique_ptr<ui::ClientNativePixmap> pixmap,
     const std::vector<gfx::NativePixmapPlane>& planes,
     base::ScopedFD fd)
     : GpuMemoryBufferImpl(id, size, format, callback),
       pixmap_(std::move(pixmap)),
       planes_(planes),
-      fd_(std::move(fd)) {}
+      fd_(std::move(fd)),
+      data_(nullptr) {}
 
 GpuMemoryBufferImplOzoneNativePixmap::~GpuMemoryBufferImplOzoneNativePixmap() {}
 
 // static
 std::unique_ptr<GpuMemoryBufferImplOzoneNativePixmap>
 GpuMemoryBufferImplOzoneNativePixmap::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage,
@@ skipping 44 matching lines @@
           ->GetSurfaceFactoryOzone()
           ->CreateNativePixmap(gfx::kNullAcceleratedWidget, size, format,
                                usage);
   handle->type = gfx::OZONE_NATIVE_PIXMAP;
   handle->native_pixmap_handle = pixmap->ExportHandle();
   return base::Bind(&FreeNativePixmapForTesting, pixmap);
 }
 
 bool GpuMemoryBufferImplOzoneNativePixmap::Map() {
   DCHECK(!mapped_);
-  mapped_ = pixmap_->Map();
+  DCHECK(!data_);
+  data_ = pixmap_->Map();
+  if (!data_)
+    return false;
+  mapped_ = true;
   return mapped_;
 }
 
 void* GpuMemoryBufferImplOzoneNativePixmap::memory(size_t plane) {
   DCHECK(mapped_);
-  return pixmap_->GetMemoryAddress(plane);
+  DCHECK_LT(plane, gfx::NumberOfPlanesForBufferFormat(format_));
+  return data_;
 }
 
 void GpuMemoryBufferImplOzoneNativePixmap::Unmap() {
   DCHECK(mapped_);
+  DCHECK(data_);
   pixmap_->Unmap();
   mapped_ = false;
+  data_ = nullptr;
 }
 
 int GpuMemoryBufferImplOzoneNativePixmap::stride(size_t plane) const {
   DCHECK_LT(plane, gfx::NumberOfPlanesForBufferFormat(format_));
-  return pixmap_->GetStride(plane);
+  int stride;
+  pixmap_->GetStride(&stride);
+  return stride;
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplOzoneNativePixmap::GetHandle()
     const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::OZONE_NATIVE_PIXMAP;
   handle.id = id_;
   handle.native_pixmap_handle.fds.emplace_back(fd_.get(),
                                                false /* auto_close */);
   handle.native_pixmap_handle.planes = planes_;
   return handle;
 }
 
 }  // namespace gpu