Remove swap ack throttling.

content/browser/renderer_host/render_widget_host_view_mac.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_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <list>
 #include <map>
@@ skipping 196 matching lines @@
 //    "The lifetime of the RenderWidgetHost* is tied to the render process.
 //     If the render process dies, the RenderWidgetHost* goes away and all
 //     references to it must become NULL."
 //
 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h.
 class CONTENT_EXPORT RenderWidgetHostViewMac
     : public RenderWidgetHostViewBase,
       public DelegatedFrameHostClient,
       public IPC::Sender,
       public SoftwareFrameManagerClient,
-      public BrowserCompositorViewMacClient,
       public CompositingIOSurfaceLayerClient {
  public:
   // The view will associate itself with the given widget. The native view must
   // be hooked up immediately to the view hierarchy, or else when it is
   // deleted it will delete this out from under the caller.
   explicit RenderWidgetHostViewMac(RenderWidgetHost* widget);
   virtual ~RenderWidgetHostViewMac();
 
   RenderWidgetHostViewCocoa* cocoa_view() const { return cocoa_view_; }
 
@@ skipping 110 matching lines @@
   // IPC::Sender implementation.
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
   // SoftwareFrameManagerClient implementation:
   virtual void SoftwareFrameWasFreed(
       uint32 output_surface_id, unsigned frame_id) OVERRIDE;
   virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE;
 
   virtual SkBitmap::Config PreferredReadbackFormat() OVERRIDE;
 
-  // BrowserCompositorViewMacHelper implementation.
-  virtual void BrowserCompositorDidDrawFrame() OVERRIDE;
-
   // CompositingIOSurfaceLayerClient implementation.
   virtual void AcceleratedLayerDidDrawFrame(bool succeeded) OVERRIDE;
 
   // Forwards the mouse event to the renderer.
   void ForwardMouseEvent(const blink::WebMouseEvent& event);
 
   void KillSelf();
 
   void SetTextInputActive(bool active);
 
@@ skipping 71 matching lines @@
   // destroyed together in Create/DestroyCompositedIOSurfaceAndLayer.
   base::scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_;
   scoped_refptr<CompositingIOSurfaceMac> compositing_iosurface_;
   scoped_refptr<CompositingIOSurfaceContext> compositing_iosurface_context_;
 
   // Delegated frame management and compositior.
   base::scoped_nsobject<BrowserCompositorViewMac> browser_compositor_view_;
   scoped_ptr<DelegatedFrameHost> delegated_frame_host_;
   scoped_ptr<ui::Layer> root_layer_;
 
-  // This lock is taken when the browser compositor produces a frame, and is
-  // released when that frame is displayed. It is by this mechanism that the
-  // browser compositor can exert GPU backpressure on the renderer compositor.
-  scoped_refptr<ui::CompositorLock> browser_compositor_lock_;
-  bool browser_compositor_damaged_during_lock_;
-
   // This holds the current software compositing framebuffer, if any.
   scoped_ptr<SoftwareFrameManager> software_frame_manager_;
 
   // Latency info to send back when the next frame appears on the
   // screen.
   std::vector<ui::LatencyInfo> pending_latency_info_;
 
   // When taking a screenshot when using CoreAnimation, add a delay of
   // a few frames to ensure that the contents have reached the screen
   // before reporting latency info.
@@ skipping 44 matching lines @@
   // all of them using this function when any of those parameters changes. Also
   // update the scale factor of the layers.
   void LayoutLayers();
 
   // DelegatedFrameHostClient implementation.
   virtual ui::Compositor* GetCompositor() const OVERRIDE;
   virtual ui::Layer* GetLayer() OVERRIDE;
   virtual RenderWidgetHostImpl* GetHost() OVERRIDE;
   virtual void SchedulePaintInRect(
       const gfx::Rect& damage_rect_in_dip) OVERRIDE;
-  virtual void DelegatedCompositorDidSwapBuffers() OVERRIDE;
-  virtual void DelegatedCompositorAbortedSwapBuffers() OVERRIDE;
   virtual bool IsVisible() OVERRIDE;
   virtual scoped_ptr<ResizeLock> CreateResizeLock(
       bool defer_compositor_lock) OVERRIDE;
   virtual gfx::Size DesiredFrameSize() OVERRIDE;
   virtual float CurrentDeviceScaleFactor() OVERRIDE;
   virtual gfx::Size ConvertViewSizeToPixel(const gfx::Size& size) OVERRIDE;
   virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE;
 
  private:
   friend class RenderWidgetHostViewMacTest;
@@ skipping 44 matching lines @@
   void OnDidChangeScrollbarsForMainFrame(bool has_horizontal_scrollbar,
                                          bool has_vertical_scrollbar);
 
   // Convert |rect| from the views coordinate (upper-left origin) into
   // the OpenGL coordinate (lower-left origin) and scale for HiDPI displays.
   gfx::Rect GetScaledOpenGLPixelRect(const gfx::Rect& rect);
 
   // Send updated vsync parameters to the renderer.
   void SendVSyncParametersToRenderer();
 
-  // Release the browser compositor lock, and request another frame from the
-  // browser compositor. Because this can be requested from inside compositor
-  // calbacks, post it as task instead of calling it directly.
-  void PostReleaseBrowserCompositorLock();
-  void ReleaseBrowserCompositorLock();
-
   // The associated view. This is weak and is inserted into the view hierarchy
   // to own this RenderWidgetHostViewMac object. Set to nil at the start of the
   // destructor.
   RenderWidgetHostViewCocoa* cocoa_view_;
 
   // Indicates if the page is loading.
   bool is_loading_;
 
   // The text to be shown in the tooltip, supplied by the renderer.
   base::string16 tooltip_text_;
@@ skipping 41 matching lines @@
   scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
 
   base::WeakPtrFactory<RenderWidgetHostViewMac>
       software_frame_weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_