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

content/browser/renderer_host/accelerated_surface_container_manager_mac.cc

 // 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.
 
 #include "content/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/accelerated_surface_container_mac.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "ui/gfx/rect.h"
@@ skipping 120 matching lines @@
 
   for (PluginWindowToContainerMap::const_iterator i =
           plugin_window_to_container_map_.begin();
        i != plugin_window_to_container_map_.end(); ++i) {
     AcceleratedSurfaceContainerMac* container = i->second;
     container->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() {
   base::AutoLock lock(lock_);
   if (root_container_)
     root_container_->set_surface_invalid();
 }
 
 bool AcceleratedSurfaceContainerManagerMac::SurfaceShouldBeVisible(
     gfx::PluginWindowHandle id) const {
@@ skipping 11 matching lines @@
         gfx::PluginWindowHandle id) const {
   PluginWindowToContainerMap::const_iterator i =
       plugin_window_to_container_map_.find(id);
   if (i != plugin_window_to_container_map_.end())
     return i->second;
 
   LOG(ERROR) << "Request for plugin container for unknown window id " << id;
 
   return NULL;
 }