Clean up GLSurfaceCGL

content/browser/compositor/browser_compositor_view_mac.mm

 // 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.
 
 #include "content/browser/compositor/browser_compositor_view_mac.h"
 
 #include "base/debug/trace_event.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "content/browser/compositor/gpu_process_transport_factory.h"
 #include "content/browser/renderer_host/compositing_iosurface_context_mac.h"
@@ skipping 30 matching lines @@
   BrowserCompositorViewMac* view_;
 };
 
 }  // namespace content
 
 
 // The default implementation of additions to the NSView interface for browser
 // compositing should never be called. Log an error if they are.
 @implementation NSView (BrowserCompositorView)
 
-- (void)gotAcceleratedIOSurfaceFrame:(uint64)surface_handle
+- (void)gotAcceleratedIOSurfaceFrame:(IOSurfaceID)surface_handle
                  withOutputSurfaceID:(int)surface_id
                        withPixelSize:(gfx::Size)pixel_size
                      withScaleFactor:(float)scale_factor {
   DLOG(ERROR) << "-[NSView gotAcceleratedIOSurfaceFrame] called on "
               << "non-overriden class.";
 }
 
 - (void)gotSoftwareFrame:(cc::SoftwareFrameData*)frame_data
          withScaleFactor:(float)scale_factor
               withCanvas:(SkCanvas*)canvas {
@@ skipping 79 matching lines @@
 }
 
 - (void)resetClient {
   [accelerated_layer_ resetClient];
 }
 
 - (ui::Compositor*)compositor {
   return compositor_.get();
 }
 
-- (void)gotAcceleratedIOSurfaceFrame:(uint64)surface_handle
+- (void)gotAcceleratedIOSurfaceFrame:(IOSurfaceID)surface_handle
                  withOutputSurfaceID:(int)surface_id
                        withPixelSize:(gfx::Size)pixel_size
                      withScaleFactor:(float)scale_factor {
   DCHECK(!accelerated_layer_output_surface_id_);
   accelerated_layer_output_surface_id_ = surface_id;
 
   ScopedCAActionDisabler disabler;
 
   // If there is already an accelerated layer, but it has the wrong scale
   // factor or it was poisoned, remove the old layer and replace it.
@@ skipping 85 matching lines @@
 - (void)layerDidDrawFrame {
   if (!accelerated_layer_output_surface_id_)
     return;
 
   content::ImageTransportFactory::GetInstance()->OnSurfaceDisplayed(
       accelerated_layer_output_surface_id_);
   accelerated_layer_output_surface_id_ = 0;
 }
 
 @end  // BrowserCompositorViewMac