Revert of Add logic to ResourceProvider to correctly lock GpuMemoryBuffer Resources.

cc/output/gl_renderer.h

 // Copyright 2010 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.
 
 #ifndef CC_OUTPUT_GL_RENDERER_H_
 #define CC_OUTPUT_GL_RENDERER_H_
 
 #include <deque>
 #include <vector>
 
@@ skipping 240 matching lines @@
   void RestoreGLState();
   void RestoreFramebuffer(DrawingFrame* frame);
 
   void DiscardBackbuffer() override;
   void EnsureBackbuffer() override;
   void EnforceMemoryPolicy();
 
   void ScheduleCALayers(DrawingFrame* frame);
   void ScheduleOverlays(DrawingFrame* frame);
 
-  using OverlayResourceLock =
-      std::unique_ptr<ResourceProvider::ScopedReadLockGpuMemoryBuffer>;
-  using OverlayResourceLockList = std::vector<OverlayResourceLock>;
-
-  // Resources that have been sent to the GPU process, but not yet swapped.
+  using OverlayResourceLockList =
+      std::vector<std::unique_ptr<ResourceProvider::ScopedReadLockGL>>;
   OverlayResourceLockList pending_overlay_resources_;
-
-  // Resources that should be shortly swapped by the GPU process.
-  std::deque<OverlayResourceLockList> swapping_overlay_resources_;
-
-  // Resources that the GPU process has finished swapping.
-  std::map<ResourceId, OverlayResourceLock>
-      swapped_and_acked_overlay_resources_;
+  std::deque<OverlayResourceLockList> swapped_overlay_resources_;
 
   RendererCapabilitiesImpl capabilities_;
 
   unsigned offscreen_framebuffer_id_;
 
   std::unique_ptr<StaticGeometryBinding> shared_geometry_;
   std::unique_ptr<DynamicGeometryBinding> clipped_geometry_;
   gfx::QuadF shared_geometry_quad_;
 
   // This block of bindings defines all of the programs used by the compositor
@@ skipping 247 matching lines @@
 
   SkBitmap on_demand_tile_raster_bitmap_;
   ResourceId on_demand_tile_raster_resource_id_;
   BoundGeometry bound_geometry_;
   DISALLOW_COPY_AND_ASSIGN(GLRenderer);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_GL_RENDERER_H_