Revert 151932 (caused gpu_throughput_tests to start failing on Mac GPU bots) - Hook up Mac OSX VSyn…

content/browser/renderer_host/compositing_iosurface_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_ACCELERATED_COMPOSITING_VIEW_MAC_H
 #define CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_COMPOSITING_VIEW_MAC_H
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/CVDisplayLink.h>
 #include <QuartzCore/QuartzCore.h>
@@ skipping 56 matching lines @@
 
   const gfx::Size& pixel_io_surface_size() const {
     return pixel_io_surface_size_;
   }
   // In cocoa view units / DIPs.
   const gfx::Size& io_surface_size() const { return io_surface_size_; }
 
   bool is_vsync_disabled() const { return is_vsync_disabled_; }
 
   // Get vsync scheduling parameters.
-  // |interval_numerator/interval_denominator| equates to fractional number of
-  // seconds between vsyncs.
   void GetVSyncParameters(base::TimeTicks* timebase,
                           uint32* interval_numerator,
                           uint32* interval_denominator);
 
  private:
   friend CVReturn DisplayLinkCallback(CVDisplayLinkRef,
                                       const CVTimeStamp*,
                                       const CVTimeStamp*,
                                       CVOptionFlags,
                                       CVOptionFlags*,
@@ skipping 64 matching lines @@
 
   // Returns true if IOSurface is ready to render. False otherwise.
   bool MapIOSurfaceToTexture(uint64 io_surface_handle);
 
   void UnrefIOSurfaceWithContextCurrent();
 
   void DrawQuad(const SurfaceQuad& quad);
 
   // Called on display-link thread.
   void DisplayLinkTick(CVDisplayLinkRef display_link,
-                       const CVTimeStamp* time);
+                       const CVTimeStamp* output_time);
 
   void CalculateVsyncParametersLockHeld(const CVTimeStamp* time);
 
   // Prevent from spinning on CGLFlushDrawable when it fails to throttle to
   // VSync frequency.
   void RateLimitDraws();
 
   void StartOrContinueDisplayLink();
   void StopDisplayLink();
 
@@ skipping 43 matching lines @@
 
   // Vsync timing data.
   base::TimeTicks vsync_timebase_;
   uint32 vsync_interval_numerator_;
   uint32 vsync_interval_denominator_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_COMPOSITING_VIEW_MAC_H