gpu: reference target surfaces through a globally unique surface id.

content/browser/renderer_host/accelerated_surface_container_mac.h

 // Copyright (c) 2011 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_SURFACE_CONTAINER_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_SURFACE_CONTAINER_MAC_H_
 #pragma once
 
 // The "GPU plugin" is currently implemented as a special kind of
 // NPAPI plugin to provide high-performance on-screen 3D rendering for
@@ skipping 64 matching lines @@
   void Draw(CGLContextObj context);
 
   // Causes the next Draw call to trigger a texture upload. Should be called any
   // time the drawing context has changed.
   void ForceTextureReload() { texture_needs_upload_ = true; }
 
   // Returns if the surface should be shown.
   bool ShouldBeVisible() const;
 
   // Notifies the the container that its surface was painted to.
-  void set_was_painted_to(uint64 surface_id);
-  void set_was_painted_to(uint64 surface_id,
+  void set_was_painted_to(uint64 surface_handle);
+  void set_was_painted_to(uint64 surface_handle,
                           const gfx::Rect& update_rect);
 
   // Notifies the container that its surface is invalid.
   void set_surface_invalid() { was_painted_to_ = false; }
  private:
   // Enqueue our texture for later deletion.
   void EnqueueTextureForDeletion();
 
-  void set_was_painted_to_common(uint64 surface_id);
+  void set_was_painted_to_common(uint64 surface_handle);
 
   // The manager of this accelerated surface container.
   AcceleratedSurfaceContainerManagerMac* manager_;
 
   // Whether this accelerated surface's content is supposed to be opaque.
   bool opaque_;
 
   // The IOSurfaceRef, if any, that has been handed from the GPU
   // plugin process back to the browser process for drawing.
   // This is held as a CFTypeRef because we can't refer to the
   // IOSurfaceRef type when building on 10.5.
   base::mac::ScopedCFTypeRef<CFTypeRef> surface_;
 
-  // The id of |surface_|, or 0 if |surface_| is NULL.
-  uint64 surface_id_;
+  // The handle of |surface_|, or 0 if |surface_| is NULL.
+  uint64 surface_handle_;
 
   // The width and height of the io surface. During resizing, this is different
   // from |width_| and |height_|.
   int32 surface_width_;
   int32 surface_height_;
 
   // The TransportDIB which is used in pre-10.6 systems where the IOSurface
   // API is not supported.  This is a weak reference to the actual TransportDIB
   // whic is owned by the GPU process.
   scoped_ptr<TransportDIB> transport_dib_;
@@ skipping 27 matching lines @@
   bool visible_;
 
   // Stores if the plugin's IOSurface has been swapped before. Used to not show
   // it before it hasn't been painted to at least once.
   bool was_painted_to_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerMac);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_SURFACE_CONTAINER_MAC_H_