Fixed missing code in EnqueueTextureForDeletion....

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 "webkit/glue/webplugin.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 
-AcceleratedSurfaceContainerMac::AcceleratedSurfaceContainerMac()
-    : x_(0),
+AcceleratedSurfaceContainerMac::AcceleratedSurfaceContainerMac(
+    AcceleratedSurfaceContainerManagerMac* manager)
+    : manager_(manager),
+      x_(0),
       y_(0),
       surface_(NULL),
       width_(0),
       height_(0),
       texture_(0),
       texture_needs_upload_(true) {
 }
 
 AcceleratedSurfaceContainerMac::~AcceleratedSurfaceContainerMac() {
+  EnqueueTextureForDeletion();
   ReleaseIOSurface();
 }
 
 void AcceleratedSurfaceContainerMac::ReleaseIOSurface() {
   if (surface_) {
     CFRelease(surface_);
     surface_ = NULL;
   }
 }
 
 void AcceleratedSurfaceContainerMac::SetSizeAndIOSurface(
     int32 width,
     int32 height,
-    uint64 io_surface_identifier,
-    AcceleratedSurfaceContainerManagerMac* manager) {
+    uint64 io_surface_identifier) {
   ReleaseIOSurface();
   IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize();
   if (io_surface_support) {
     surface_ = io_surface_support->IOSurfaceLookup(
         static_cast<uint32>(io_surface_identifier));
-    EnqueueTextureForDeletion(manager);
+    EnqueueTextureForDeletion();
     width_ = width;
     height_ = height;
   }
 }
 
 void AcceleratedSurfaceContainerMac::SetSizeAndTransportDIB(
     int32 width,
     int32 height,
-    TransportDIB::Handle transport_dib,
-    AcceleratedSurfaceContainerManagerMac* manager) {
+    TransportDIB::Handle transport_dib) {
   if (TransportDIB::is_valid(transport_dib)) {
     transport_dib_.reset(TransportDIB::Map(transport_dib));
-    EnqueueTextureForDeletion(manager);
+    EnqueueTextureForDeletion();
     width_ = width;
     height_ = height;
   }
 }
 
 void AcceleratedSurfaceContainerMac::MoveTo(
     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.
@@ skipping 80 matching lines @@
     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);
     glEnd();
     glDisable(target);
   }
 }
 
-void AcceleratedSurfaceContainerMac::EnqueueTextureForDeletion(
-    AcceleratedSurfaceContainerManagerMac* manager) {
-  manager->EnqueueTextureForDeletion(texture_);
-  texture_ = 0;
+void AcceleratedSurfaceContainerMac::EnqueueTextureForDeletion() {
+  if (texture_) {
+    manager_->EnqueueTextureForDeletion(texture_);
+    texture_ = 0;
+  }
 }