Remove remaining traces of CreateGpuMemoryBufferImageCHROMIUM

media/renderers/video_overlay_factory.cc

 // Copyright 2015 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 "media/renderers/video_overlay_factory.h"
 
 #include "base/single_thread_task_runner.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "media/base/video_frame.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 
 namespace media {
 
 class VideoOverlayFactory::Texture {
  public:
   explicit Texture(GpuVideoAcceleratorFactories* gpu_factories)
       : gpu_factories_(gpu_factories), image_id_(0), texture_id_(0) {
     DCHECK(gpu_factories_);
     DCHECK(gpu_factories_->GetTaskRunner()->BelongsToCurrentThread());
 
     std::unique_ptr<GpuVideoAcceleratorFactories::ScopedGLContextLock> lock(
         gpu_factories_->GetGLContextLock());
     if (lock) {
       gpu::gles2::GLES2Interface* gl = lock->ContextGL();
-      image_id_ = gl->CreateGpuMemoryBufferImageCHROMIUM(
-          1, 1, GL_RGBA, GL_READ_WRITE_CHROMIUM);
+      gpu_memory_buffer_ = gpu_factories_->CreateGpuMemoryBuffer(
+          gfx::Size(1, 1), gfx::BufferFormat::RGBA_8888,
+          gfx::BufferUsage::SCANOUT);
+      if (gpu_memory_buffer_) {
+        image_id_ = gl->CreateImageCHROMIUM(
+            gpu_memory_buffer_->AsClientBuffer(), 1, 1, GL_RGBA);
+      }
       if (image_id_) {
         gl->GenTextures(1, &texture_id_);
         gl->BindTexture(GL_TEXTURE_2D, texture_id_);
         gl->BindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id_);
 
         gl->GenMailboxCHROMIUM(mailbox_.name);
         gl->ProduceTextureDirectCHROMIUM(texture_id_, GL_TEXTURE_2D,
                                          mailbox_.name);
 
         const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
@@ skipping 18 matching lines @@
       }
     }
   }
 
   bool IsValid() const { return image_id_ != 0; }
 
  private:
   friend class VideoOverlayFactory;
   GpuVideoAcceleratorFactories* gpu_factories_;
 
+  std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
   GLuint image_id_;
   GLuint texture_id_;
   gpu::Mailbox mailbox_;
   gpu::SyncToken sync_token_;
 };
 
 VideoOverlayFactory::VideoOverlayFactory(
     GpuVideoAcceleratorFactories* gpu_factories)
     : gpu_factories_(gpu_factories) {}
 
@@ skipping 34 matching lines @@
     return nullptr;
 
   // Lazily create overlay texture.
   if (!texture_)
     texture_.reset(new Texture(gpu_factories_));
 
   return texture_->IsValid() ? texture_.get() : nullptr;
 }
 
 }  // namespace media