Clean up GLSurfaceCGL

content/browser/renderer_host/compositing_iosurface_mac.mm

 // 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.
 
 #include "content/browser/renderer_host/compositing_iosurface_mac.h"
 
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/OpenGL.h>
 
@@ skipping 244 matching lines @@
         offscreen_context_->cgl_context());
     DestroyAllCopyContextsWithinContext();
     UnrefIOSurfaceWithContextCurrent();
   }
   offscreen_context_ = NULL;
   DCHECK(eviction_queue_iterator_ == eviction_queue_.Get().end());
 }
 
 bool CompositingIOSurfaceMac::SetIOSurfaceWithContextCurrent(
     scoped_refptr<CompositingIOSurfaceContext> current_context,
-    uint64 io_surface_handle,
+    IOSurfaceID io_surface_handle,
     const gfx::Size& size,
     float scale_factor) {
   bool result = MapIOSurfaceToTextureWithContextCurrent(
       current_context, size, scale_factor, io_surface_handle);
   EvictionMarkUpdated();
   return result;
 }
 
 int CompositingIOSurfaceMac::GetRendererID() {
   GLint current_renderer_id = -1;
@@ skipping 170 matching lines @@
 
   return CopyToSelectedOutputWithinContext(
       src_pixel_subrect, region_in_frame, called_within_draw,
       NULL, target, callback);
 }
 
 bool CompositingIOSurfaceMac::MapIOSurfaceToTextureWithContextCurrent(
     const scoped_refptr<CompositingIOSurfaceContext>& current_context,
     const gfx::Size pixel_size,
     float scale_factor,
-    uint64 io_surface_handle) {
+    IOSurfaceID io_surface_handle) {
   TRACE_EVENT0("browser", "CompositingIOSurfaceMac::MapIOSurfaceToTexture");
 
   if (!io_surface_ || io_surface_handle != io_surface_handle_)
     UnrefIOSurfaceWithContextCurrent();
 
   pixel_io_surface_size_ = pixel_size;
   scale_factor_ = scale_factor;
   dip_io_surface_size_ = gfx::ToFlooredSize(
       gfx::ScaleSize(pixel_io_surface_size_, 1.0 / scale_factor_));
 
   // Early-out if the IOSurface has not changed. Note that because IOSurface
   // sizes are rounded, the same IOSurface may have two different sizes
   // associated with it.
   if (io_surface_ && io_surface_handle == io_surface_handle_)
     return true;
 
-  io_surface_.reset(IOSurfaceLookup(static_cast<uint32>(io_surface_handle)));
+  io_surface_.reset(IOSurfaceLookup(io_surface_handle));
   // Can fail if IOSurface with that ID was already released by the gpu
   // process.
   if (!io_surface_) {
     UnrefIOSurfaceWithContextCurrent();
     return false;
   }
 
   io_surface_handle_ = io_surface_handle;
 
   // Actual IOSurface size is rounded up to reduce reallocations during window
@@ skipping 477 matching lines @@
 }
 
 // static
 base::LazyInstance<CompositingIOSurfaceMac::EvictionQueue>
     CompositingIOSurfaceMac::eviction_queue_;
 
 // static
 bool CompositingIOSurfaceMac::eviction_scheduled_ = false;
 
 }  // namespace content