Unobfuscate RWHVMac accelerated compositing code path by separating it from plugin code

content/browser/renderer_host/accelerated_surface_container_manager_mac.cc

 // 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/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"
 
 AcceleratedSurfaceContainerManagerMac::AcceleratedSurfaceContainerManagerMac()
-    : current_id_(0),
-      root_container_(NULL),
-      root_container_handle_(gfx::kNullPluginWindow),
-      gpu_rendering_active_(false) {
+    : current_id_(0) {
 }
 
 AcceleratedSurfaceContainerManagerMac::
     ~AcceleratedSurfaceContainerManagerMac() {}
 
 gfx::PluginWindowHandle
 AcceleratedSurfaceContainerManagerMac::AllocateFakePluginWindowHandle(
     bool opaque, bool root) {
   base::AutoLock lock(lock_);
 
   AcceleratedSurfaceContainerMac* container =
       new AcceleratedSurfaceContainerMac(this, opaque);
   gfx::PluginWindowHandle res =
       static_cast<gfx::PluginWindowHandle>(++current_id_);
   plugin_window_to_container_map_.insert(std::make_pair(res, container));
-  if (root) {
-    root_container_ = container;
-    root_container_handle_ = res;
-  }
+  DCHECK(!root);
   return res;
 }
 
 void AcceleratedSurfaceContainerManagerMac::DestroyFakePluginWindowHandle(
     gfx::PluginWindowHandle id) {
   base::AutoLock lock(lock_);
 
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
-  if (container) {
-    if (container == root_container_) {
-      root_container_ = NULL;
-      root_container_handle_ = gfx::kNullPluginWindow;
-    }
+  if (container)
     delete container;
-  }
   plugin_window_to_container_map_.erase(id);
 }
 
-bool AcceleratedSurfaceContainerManagerMac::IsRootContainer(
-    gfx::PluginWindowHandle id) const {
-  return root_container_handle_ != gfx::kNullPluginWindow &&
-      root_container_handle_ == id;
-}
-
-void AcceleratedSurfaceContainerManagerMac::
-    set_gpu_rendering_active(bool active) {
-  if (gpu_rendering_active_ && !active)
-    SetRootSurfaceInvalid();
-  gpu_rendering_active_ = active;
-}
-
 void AcceleratedSurfaceContainerManagerMac::SetSizeAndIOSurface(
     gfx::PluginWindowHandle id,
     int32 width,
     int32 height,
     uint64 io_surface_identifier) {
   base::AutoLock lock(lock_);
 
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   if (container) {
     container->SetSizeAndIOSurface(width, height, io_surface_identifier);
@@ skipping 73 matching lines @@
     gfx::PluginWindowHandle 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_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 {
   base::AutoLock lock(lock_);
 
-  if (IsRootContainer(id) && !gpu_rendering_active_)
-    return false;
-
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   return container && container->ShouldBeVisible();
 }
 
 AcceleratedSurfaceContainerMac*
     AcceleratedSurfaceContainerManagerMac::MapIDToContainer(
         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;
 }