Clean up Mac swap acknowledgement code

ui/accelerated_widget_mac/accelerated_widget_mac.h

 // 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.
 
 #ifndef UI_ACCELERATED_WIDGET_MAC_ACCELERATED_WIDGET_MAC_H_
 #define UI_ACCELERATED_WIDGET_MAC_ACCELERATED_WIDGET_MAC_H_
 
 #include <IOSurface/IOSurface.h>
 #include <vector>
 
 #include "base/mac/scoped_cftyperef.h"
+#include "base/time/time.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac_export.h"
 #include "ui/accelerated_widget_mac/surface_handle_types.h"
-#include "ui/events/latency_info.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(__OBJC__)
 #import <Cocoa/Cocoa.h>
 #import "base/mac/scoped_nsobject.h"
 #include "ui/base/cocoa/remote_layer_api.h"
 #endif  // __OBJC__
 
 class SkCanvas;
 
 namespace cc {
 class SoftwareFrameData;
 }
 
 namespace ui {
 
 class AcceleratedWidgetMac;
 
 // A class through which an AcceleratedWidget may be bound to draw the contents
 // of an NSView. An AcceleratedWidget may be bound to multiple different views
 // throughout its lifetime (one at a time, though).
 class AcceleratedWidgetMacNSView {
  public:
   virtual NSView* AcceleratedWidgetGetNSView() const = 0;
-  virtual bool AcceleratedWidgetShouldIgnoreBackpressure() const = 0;
   virtual void AcceleratedWidgetGetVSyncParameters(
     base::TimeTicks* timebase, base::TimeDelta* interval) const = 0;
-  virtual void AcceleratedWidgetSwapCompleted(
-      const std::vector<ui::LatencyInfo>& latency_info) = 0;
-  virtual void AcceleratedWidgetHitError() = 0;
+  virtual void AcceleratedWidgetSwapCompleted() = 0;
 };
 
 #if defined(__OBJC__)
 
 // AcceleratedWidgetMac owns a tree of CALayers. The widget may be passed
 // to a ui::Compositor, which will cause, through its output surface, calls to
 // GotAcceleratedFrame and GotSoftwareFrame. The CALayers may be installed
 // in an NSView by setting the AcceleratedWidgetMacNSView for the helper.
 class ACCELERATED_WIDGET_MAC_EXPORT AcceleratedWidgetMac {
  public:
   explicit AcceleratedWidgetMac(bool needs_gl_finish_workaround);
   virtual ~AcceleratedWidgetMac();
 
   gfx::AcceleratedWidget accelerated_widget() { return native_widget_; }
 
   void SetNSView(AcceleratedWidgetMacNSView* view);
   void ResetNSView();
 
   // Return true if the last frame swapped has a size in DIP of |dip_size|.
   bool HasFrameOfSize(const gfx::Size& dip_size) const;
 
-  // Return the CGL renderer ID for the surface, if one is available.
-  int GetRendererID() const;
-
   // Populate the vsync parameters for the surface's display.
   void GetVSyncParameters(
       base::TimeTicks* timebase, base::TimeDelta* interval) const;
 
-  // Return true if the renderer should not be throttled by GPU back-pressure.
-  bool IsRendererThrottlingDisabled() const;
+  void GotFrame(CAContextID ca_context_id,
+                base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
+                const gfx::Size& pixel_size,
+                float scale_factor);
 
-  // Mark a bracket in which new frames are being pumped in a restricted nested
-  // run loop.
-  void BeginPumpingFrames();
-  void EndPumpingFrames();
-
-  void GotAcceleratedFrame(CAContextID ca_context_id,
-                           base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
-                           const std::vector<ui::LatencyInfo>& latency_info,
-                           const gfx::Size& pixel_size,
-                           float scale_factor,
-                           const gfx::Rect& pixel_damage_rect,
-                           const base::Closure& drawn_callback);
+ private:
+  void GotCAContextFrame(CAContextID ca_context_id,
+                         const gfx::Size& pixel_size,
+                         float scale_factor);
 
   void GotIOSurfaceFrame(base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
                          const gfx::Size& pixel_size,
-                         float scale_factor,
-                         bool flip_y);
-
- private:
-  void GotAcceleratedCAContextFrame(CAContextID ca_context_id,
-                                    const gfx::Size& pixel_size,
-                                    float scale_factor);
-
-  void GotAcceleratedIOSurfaceFrame(
-      base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
-      const gfx::Size& pixel_size,
-      float scale_factor);
-
-  void AcknowledgeAcceleratedFrame();
+                         float scale_factor);
 
   // Remove a layer from the heirarchy and destroy it. Because the accelerated
   // layer types may be replaced by a layer of the same type, the layer to
   // destroy is parameterized, and, if it is the current layer, the current
   // layer is reset.
   void DestroyCAContextLayer(
       base::scoped_nsobject<CALayerHost> ca_context_layer);
   void DestroyLocalLayer();
   void EnsureLocalLayer();
 
@@ skipping 11 matching lines @@
   // |background_layer_| of RenderWidgetHostViewCocoa) leads to unpredictable
   // behavior.
   base::scoped_nsobject<CALayer> flipped_layer_;
 
   // The accelerated CoreAnimation layer hosted by the GPU process.
   base::scoped_nsobject<CALayerHost> ca_context_layer_;
 
   // The locally drawn layer, which has its contents set to an IOSurface.
   base::scoped_nsobject<CALayer> local_layer_;
 
-  // If an accelerated frame has come in which has not yet been drawn and acked
-  // then this is the latency info and the callback to make when the frame is
-  // drawn. If there is no such frame then the callback is null.
-  std::vector<ui::LatencyInfo> accelerated_latency_info_;
-  base::Closure accelerated_frame_drawn_callback_;
-
   // The size in DIP of the last swap received from |compositor_|.
   gfx::Size last_swap_size_dip_;
 
   // Whether surfaces created by the widget should use the glFinish() workaround
   // after compositing.
   bool needs_gl_finish_workaround_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratedWidgetMac);
 };
 
 #endif  // __OBJC__
 
 ACCELERATED_WIDGET_MAC_EXPORT
-void AcceleratedWidgetMacGotAcceleratedFrame(
+void AcceleratedWidgetMacGotFrame(
     gfx::AcceleratedWidget widget,
     CAContextID ca_context_id,
     base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
-    const std::vector<ui::LatencyInfo>& latency_info,
     const gfx::Size& pixel_size,
     float scale_factor,
-    const gfx::Rect& pixel_damage_rect,
-    const base::Closure& drawn_callback,
-    bool* disable_throttling,
-    int* renderer_id,
     base::TimeTicks* vsync_timebase,
     base::TimeDelta* vsync_interval);
 
-ACCELERATED_WIDGET_MAC_EXPORT
-void AcceleratedWidgetMacGotIOSurfaceFrame(
-    gfx::AcceleratedWidget widget,
-    base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
-    const gfx::Size& pixel_size,
-    float scale_factor,
-    bool flip_y);
-
 }  // namespace ui
 
 #endif  // UI_ACCELERATED_WIDGET_MAC_ACCELERATED_WIDGET_MAC_H_