Remove maintaing ReadbackRequests for copyFromCompositingSurface.

content/browser/renderer_host/render_widget_host_view_android.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
 
 #include <map>
 #include <queue>
 
@@ skipping 42 matching lines @@
 }
 
 namespace content {
 class ContentViewCoreImpl;
 class OverscrollControllerAndroid;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 struct DidOverscrollParams;
 struct NativeWebKeyboardEvent;
 
-class ReadbackRequest {
- public:
-  explicit ReadbackRequest(float scale,
-                           SkColorType color_type,
-                           gfx::Rect src_subrect,
-                           ReadbackRequestCallback& result_callback);
-  ~ReadbackRequest();
-  float GetScale() { return scale_; }
-  SkColorType GetColorFormat() { return color_type_; }
-  const gfx::Rect GetCaptureRect() { return src_subrect_; }
-  ReadbackRequestCallback& GetResultCallback() { return result_callback_; }
-
- private:
-  ReadbackRequest();
-  float scale_;
-  SkColorType color_type_;
-  gfx::Rect src_subrect_;
-  ReadbackRequestCallback result_callback_;
-};
-
 // -----------------------------------------------------------------------------
 // See comments in render_widget_host_view.h about this class and its members.
 // -----------------------------------------------------------------------------
 class CONTENT_EXPORT RenderWidgetHostViewAndroid
     : public RenderWidgetHostViewBase,
       public cc::DelegatedFrameResourceCollectionClient,
       public cc::SurfaceFactoryClient,
       public ui::GestureProviderClient,
       public ui::WindowAndroidObserver,
       public DelegatedFrameEvictorClient,
@@ skipping 237 matching lines @@
     FLUSH_INPUT = 1 << 0,
     BEGIN_FRAME = 1 << 1,
     PERSISTENT_BEGIN_FRAME = 1 << 2
   };
   void RequestVSyncUpdate(uint32 requests);
   void StartObservingRootWindow();
   void StopObservingRootWindow();
   void SendBeginFrame(base::TimeTicks frame_time, base::TimeDelta vsync_period);
   bool Animate(base::TimeTicks frame_time);
 
-  // Handles all unprocessed and pending readback requests.
-  void AbortPendingReadbackRequests();
-
   // The model object.
   RenderWidgetHostImpl* host_;
 
   bool use_surfaces_;
 
   // Used to control action dispatch at the next |OnVSync()| call.
   uint32 outstanding_vsync_requests_;
 
   bool is_showing_;
 
@@ skipping 58 matching lines @@
                   scoped_ptr<cc::CompositorFrame> output_frame);
     ~LastFrameInfo();
     uint32 output_surface_id;
     scoped_ptr<cc::CompositorFrame> frame;
   };
 
   scoped_ptr<LastFrameInfo> last_frame_info_;
 
   TextSurroundingSelectionCallback text_surrounding_selection_callback_;
 
-  // List of readbackrequests waiting for arrival of a valid frame.
-  std::queue<ReadbackRequest> readbacks_waiting_for_frame_;
-
   // The last scroll offset of the view.
   gfx::Vector2dF last_scroll_offset_;
 
   base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_