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

content/browser/renderer_host/accelerated_surface_container_manager_mac.h

Index: content/browser/renderer_host/accelerated_surface_container_manager_mac.h
diff --git a/content/browser/renderer_host/accelerated_surface_container_manager_mac.h b/content/browser/renderer_host/accelerated_surface_container_manager_mac.h
index a1130530f7ca07c58d69ea32338e4c6f5abe186e..f7fb6ba22011b6f8926285dd82271a5bb31862bc 100644
--- a/content/browser/renderer_host/accelerated_surface_container_manager_mac.h
+++ b/content/browser/renderer_host/accelerated_surface_container_manager_mac.h
@@ -41,20 +41,6 @@ class AcceleratedSurfaceContainerManagerMac {
   // Destroys a fake PluginWindowHandle and associated storage.
   void DestroyFakePluginWindowHandle(gfx::PluginWindowHandle id);
 
-  // Indicates whether the given PluginWindowHandle is "root", which
-  // means that we are using accelerated compositing and that this one
-  // contains the compositor's output.
-  bool IsRootContainer(gfx::PluginWindowHandle id) const;
-
-  // Returns the handle of the compositor surface, or kNullPluginWindow if no
-  // compositor surface is active.
-  gfx::PluginWindowHandle root_container_handle() const {
-    return root_container_handle_;
-  }
-
-  // Informs the manager if gpu rendering is active.
-  void set_gpu_rendering_active(bool active);
-
   // Sets the size and backing store of the plugin instance.  There are two
   // versions: the IOSurface version is used on systems where the IOSurface
   // API is supported (Mac OS X 10.6 and later); the TransportDIB is used on
@@ -88,9 +74,6 @@ class AcceleratedSurfaceContainerManagerMac {
                               uint64 surface_handle,
                               const gfx::Rect& update_rect);
 
-  // Notifies the root container that its surface is invalid.
-  void SetRootSurfaceInvalid();
-
   // Returns if a given surface should be shown.
   bool SurfaceShouldBeVisible(gfx::PluginWindowHandle id) const;
  private:
@@ -105,23 +88,6 @@ class AcceleratedSurfaceContainerManagerMac {
       PluginWindowToContainerMap;
   PluginWindowToContainerMap plugin_window_to_container_map_;
 
-  // The "root" container, which is only used to draw the output of
-  // the accelerated compositor if it is active. Currently,
-  // accelerated plugins (Core Animation and Pepper 3D) are drawn on
-  // top of the page's contents rather than transformed and composited
-  // with the rest of the page. At some point we would like them to be
-  // treated uniformly with other page elements; when this is done,
-  // the separate treatment of the root container can go away because
-  // there will only be one container active when the accelerated
-  // compositor is active.
-  AcceleratedSurfaceContainerMac* root_container_;
-  gfx::PluginWindowHandle root_container_handle_;
-
-  // True if gpu rendering is active. The root container is created on demand
-  // and destroyed only when a renderer process exits. When the compositor was
-  // created, this is set to |false| while the compositor is not needed.
-  bool gpu_rendering_active_;
-
   // Both |plugin_window_to_container_map_| and the
   // AcceleratedSurfaceContainerMac in it are not threadsafe, but accessed from
   // multiple threads. All these accesses are guarded by this lock.