Mac: Well-behaved accelerated plugins, preparation

chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc

 // Copyright (c) 2010 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 "chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_mac.h"
 #include "webkit/glue/plugins/webplugin.h"
 
@@ skipping 20 matching lines @@
     gfx::PluginWindowHandle id) {
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   if (container) {
     if (container == root_container_)
       root_container_ = NULL;
     delete container;
   }
   plugin_window_to_container_map_.erase(id);
 }
 
-bool AcceleratedSurfaceContainerManagerMac::HasRootContainer() {
-  return root_container_ != NULL;
+bool AcceleratedSurfaceContainerManagerMac::IsRootContainer(
+    gfx::PluginWindowHandle id) {
+  AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
+  return root_container_ == container;
 }
 
 void AcceleratedSurfaceContainerManagerMac::SetSizeAndIOSurface(
     gfx::PluginWindowHandle id,
     int32 width,
     int32 height,
     uint64 io_surface_identifier) {
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   if (container) {
     container->SetSizeAndIOSurface(width, height, io_surface_identifier);
-    if (container == root_container_) {
-      // Fake up a WebPluginGeometry for the root window to set the
-      // container's size; we will never get a notification from the
-      // browser about the root window, only plugins.
-      webkit_glue::WebPluginGeometry geom;
-      gfx::Rect rect(0, 0, width, height);
-      geom.window_rect = rect;
-      geom.clip_rect = rect;
-      geom.visible = true;
-      container->MoveTo(geom);
-    }
   }
 }
 
 void AcceleratedSurfaceContainerManagerMac::SetSizeAndTransportDIB(
     gfx::PluginWindowHandle id,
     int32 width,
     int32 height,
     TransportDIB::Handle transport_dib) {
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   if (container)
     container->SetSizeAndTransportDIB(width, height, transport_dib);
 }
 
 void AcceleratedSurfaceContainerManagerMac::MovePluginContainer(
     const webkit_glue::WebPluginGeometry& move) {
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(move.window);
   if (container)
     container->MoveTo(move);
 }
 
 void AcceleratedSurfaceContainerManagerMac::Draw(CGLContextObj context,
+                                                 gfx::PluginWindowHandle id,
                                                  bool draw_root_container) {
   // Clean up old texture objects. This is essentially a pre-emptive
   // cleanup, as the resources will be released when the OpenGL
   // context associated with the CAOpenGLLayer is destroyed. However,

[stuartmorgan, 2010/08/11 16:40:44]

Comment is no longer right.

[Ken Russell (switch to Gerrit), 2010/08/14 02:12:11]

Actually, because each container is rendered into its own OpenGL context, the
logic isn't right any more either. Will fix this.

   // if we render many plugins in the same layer, we should try to
   // eagerly reclaim their resources. Note also that the OpenGL
   // context must be current when performing the deletion, and it
   // seems risky to make the OpenGL context current at an arbitrary
   // point in time, which is why the deletion does not occur in the
   // container's destructor.
   for (std::vector<GLuint>::iterator iter =
            textures_pending_deletion_.begin();
        iter != textures_pending_deletion_.end();
        ++iter) {
     GLuint texture = *iter;
     glDeleteTextures(1, &texture);
   }
   textures_pending_deletion_.clear();
 
   glColorMask(true, true, true, true);

[stuartmorgan, 2010/08/11 16:40:44]

The division between this method and Draw seems pretty arbitrary now that it's
only painting one thing. Is there a reason not to push all this GL code into
Draw()?

[Ken Russell (switch to Gerrit), 2010/08/14 02:12:11]

I'd rather leave it structured like this in case we ever get back to a situation
where more than one accelerated plugin at a time. More likely, though, we'll
move to a model where the compositor handles everything, and this entire class
will go away.

   glClearColor(0, 0, 0, 0);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glDisable(GL_DEPTH_TEST);
   glDisable(GL_BLEND);
 
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 
-  // Draw the root container, if any, first.
-  if (draw_root_container && root_container_) {
-    root_container_->Draw(context);
-  }
-
-  for (PluginWindowToContainerMap::const_iterator i =
-          plugin_window_to_container_map_.begin();
-       i != plugin_window_to_container_map_.end(); ++i) {
-    AcceleratedSurfaceContainerMac* container = i->second;
-    if (container != root_container_) {
-      container->Draw(context);
-    }
-  }
+  AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
+  CHECK(container);
+  container->Draw(context);
 
   // Unbind any texture from the texture target to ensure that the
   // next time through we will have to re-bind the texture and thereby
   // pick up modifications from the other process.
   GLenum target = GL_TEXTURE_RECTANGLE_ARB;
   glBindTexture(target, 0);
 
   glFlush();
 }
 
@@ skipping 18 matching lines @@
         gfx::PluginWindowHandle id) {
   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;
 }