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

content/browser/renderer_host/accelerated_surface_container_manager_mac.cc

Index: content/browser/renderer_host/accelerated_surface_container_manager_mac.cc
diff --git a/content/browser/renderer_host/accelerated_surface_container_manager_mac.cc b/content/browser/renderer_host/accelerated_surface_container_manager_mac.cc
index b31a4834e6bf617f15952524a5d553567a066630..d0d6fc98c8aec6453ccd419f194784504d1d31d3 100644
--- a/content/browser/renderer_host/accelerated_surface_container_manager_mac.cc
+++ b/content/browser/renderer_host/accelerated_surface_container_manager_mac.cc
@@ -138,23 +138,23 @@ void AcceleratedSurfaceContainerManagerMac::ForceTextureReload() {
 }
 
 void AcceleratedSurfaceContainerManagerMac::SetSurfaceWasPaintedTo(
-    gfx::PluginWindowHandle id, uint64 surface_id) {
+    gfx::PluginWindowHandle id, uint64 surface_handle) {
   base::AutoLock lock(lock_);
 
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   if (container)
-    container->set_was_painted_to(surface_id);
+    container->set_was_painted_to(surface_handle);
 }
 
 void AcceleratedSurfaceContainerManagerMac::SetSurfaceWasPaintedTo(
     gfx::PluginWindowHandle id,
-    uint64 surface_id,
+    uint64 surface_handle,
     const gfx::Rect& update_rect) {
   base::AutoLock lock(lock_);
 
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   if (container)
-    container->set_was_painted_to(surface_id, update_rect);
+    container->set_was_painted_to(surface_handle, update_rect);
 }
 
 void AcceleratedSurfaceContainerManagerMac::SetRootSurfaceInvalid() {