Mac: Well-behaved accelerated plugins, preparation

chrome/browser/renderer_host/accelerated_surface_container_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_mac.h"
 
 #include "app/surface/io_surface_support_mac.h"
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 #include "webkit/glue/plugins/webplugin.h"
 
 AcceleratedSurfaceContainerMac::AcceleratedSurfaceContainerMac(
     AcceleratedSurfaceContainerManagerMac* manager,
     bool opaque)
     : manager_(manager),
       opaque_(opaque),
-      x_(0),
-      y_(0),
       surface_(NULL),
       width_(0),
       height_(0),
       texture_(0),
       texture_needs_upload_(true) {
 }
 
 AcceleratedSurfaceContainerMac::~AcceleratedSurfaceContainerMac() {
   EnqueueTextureForDeletion();
   ReleaseIOSurface();
@@ skipping 26 matching lines @@
     int32 height,
     TransportDIB::Handle transport_dib) {
   if (TransportDIB::is_valid(transport_dib)) {
     transport_dib_.reset(TransportDIB::Map(transport_dib));
     EnqueueTextureForDeletion();
     width_ = width;
     height_ = height;
   }
 }
 
 void AcceleratedSurfaceContainerMac::MoveTo(

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

MoveTo is a poor name for this function at this point, since it has no concept
of position any more. SetGeometry?

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

Will rename.

     const webkit_glue::WebPluginGeometry& geom) {
-  x_ = geom.window_rect.x();
-  y_ = geom.window_rect.y();
   // TODO(kbr): may need to pay attention to cutout rects.
   if (geom.visible)
     clipRect_ = geom.clip_rect;
   else
     clipRect_ = gfx::Rect();
 }
 
 void AcceleratedSurfaceContainerMac::Draw(CGLContextObj context) {
   IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize();
   GLenum target = GL_TEXTURE_RECTANGLE_ARB;
@@ skipping 59 matching lines @@
   }
 
   if (texture_) {
     // TODO(kbr): convert this to use only OpenGL ES 2.0 functionality.
 
     // TODO(kbr): may need to pay attention to cutout rects.
     int clipX = clipRect_.x();
     int clipY = clipRect_.y();
     int clipWidth = clipRect_.width();
     int clipHeight = clipRect_.height();
-    int x = x_ + clipX;
-    int y = y_ + clipY;
 
     if (opaque_) {
       // Pepper 3D's output is currently considered opaque even if the
       // program draws pixels with alpha less than 1. In order to have
       // this effect, we need to drop the alpha channel of the input,
       // replacing it with alpha = 1.
 
       // First fill the rectangle with alpha=1.
       glColorMask(false, false, false, true);
       glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
       glBegin(GL_TRIANGLE_STRIP);
-      glVertex3f(x, y, 0);
-      glVertex3f(x + clipWidth, y, 0);
-      glVertex3f(x, y + clipHeight, 0);
-      glVertex3f(x + clipWidth, y + clipHeight, 0);
+      glVertex3f(0, 0, 0);
+      glVertex3f(clipWidth, 0, 0);
+      glVertex3f(0, clipHeight, 0);
+      glVertex3f(clipWidth, clipHeight, 0);
       glEnd();
 
       // Now draw the color channels from the incoming texture.
       glColorMask(true, true, true, false);
       // This call shouldn't be necessary -- we are using the GL_REPLACE
       // texture environment mode -- but it appears to be.
       glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     } else {
       glColorMask(true, true, true, true);
     }
 
     // Draw the color channels from the incoming texture.
     glBindTexture(target, texture_);
     glEnable(target);
     glBegin(GL_TRIANGLE_STRIP);
-    glTexCoord2f(clipX, height_ - clipY);
-    glVertex3f(x, y, 0);
-    glTexCoord2f(clipX + clipWidth, height_ - clipY);
-    glVertex3f(x + clipWidth, y, 0);
-    glTexCoord2f(clipX, height_ - clipY - clipHeight);
-    glVertex3f(x, y + clipHeight, 0);
-    glTexCoord2f(clipX + clipWidth, height_ - clipY - clipHeight);
-    glVertex3f(x + clipWidth, y + clipHeight, 0);
+
+      glTexCoord2f(clipX, height_ - clipY);
+      glVertex3f(0, 0, 0);
+
+      glTexCoord2f(clipX + clipWidth, height_ - clipY);
+      glVertex3f(clipWidth, 0, 0);
+
+      glTexCoord2f(clipX, height_ - clipY - clipHeight);
+      glVertex3f(0, clipHeight, 0);
+
+      glTexCoord2f(clipX + clipWidth, height_ - clipY - clipHeight);
+      glVertex3f(clipWidth, clipHeight, 0);
+
     glEnd();
     glDisable(target);
   }
 }
 
 void AcceleratedSurfaceContainerMac::EnqueueTextureForDeletion() {
   if (texture_) {
     manager_->EnqueueTextureForDeletion(texture_);
     texture_ = 0;
   }
 }