Run all LayerTreeHost tests with a delegating renderer.

cc/resources/video_resource_updater.cc

 // Copyright 2013 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 "cc/resources/video_resource_updater.h"
 
 #include "base/bind.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/resources/resource_provider.h"
 #include "gpu/GLES2/gl2extchromium.h"
@@ skipping 12 matching lines @@
     : type(NONE), hardware_resource(0) {}
 
 VideoFrameExternalResources::~VideoFrameExternalResources() {}
 
 VideoResourceUpdater::VideoResourceUpdater(ResourceProvider* resource_provider)
     : resource_provider_(resource_provider) {
 }
 
 VideoResourceUpdater::~VideoResourceUpdater() {
   while (!recycled_resources_.empty()) {
     resource_provider_->DeleteResource(recycled_resources_.back().resource_id);

[piman, 2013/05/09 20:38:47]

Don't you need to delete all resources here, rather than just the ones that came
back?

[danakj, 2013/05/09 22:42:37]

Oh gosh, yes, thanks. Since the early out in Recycle now..

Also noticed that we should have the same early out in ReturnResource. That path
just isn't hit by the unit tests yet until we have mailbox videoframes.

I added all_resources_ to the VRU, and delete everything on destruction now.

     recycled_resources_.pop_back();
   }
 }
 
 bool VideoResourceUpdater::VerifyFrame(
     const scoped_refptr<media::VideoFrame>& video_frame) {
   // If these fail, we'll have to add logic that handles offset bitmap/texture
   // UVs. For now, just expect (0, 0) offset, since all our decoders so far
   // don't offset.
   DCHECK_EQ(video_frame->visible_rect().x(), 0);
@@ skipping 304 matching lines @@
   resource_provider->DeleteResource(resource_id);
 }
 
 // static
 void VideoResourceUpdater::RecycleResource(
     base::WeakPtr<VideoResourceUpdater> updater,
     ResourceProvider* resource_provider,
     RecycleResourceData data,
     unsigned sync_point,
     bool lost_resource) {
+  if (!updater) {
+    // Resource was already deleted.
+    return;
+  }
+
   WebKit::WebGraphicsContext3D* context =
       resource_provider->GraphicsContext3D();
   if (context && sync_point)
-      GLC(context, context->waitSyncPoint(sync_point));
+    GLC(context, context->waitSyncPoint(sync_point));
   if (context && !lost_resource) {
     ResourceProvider::ScopedWriteLockGL lock(resource_provider,
                                              data.resource_id);
     GLC(context, context->bindTexture(GL_TEXTURE_2D, lock.texture_id()));
     GLC(context, context->consumeTextureCHROMIUM(GL_TEXTURE_2D,
                                                  data.mailbox.name));
     GLC(context, context->bindTexture(GL_TEXTURE_2D, 0));
   }
 
-  if (!updater || lost_resource) {
+  if (lost_resource) {
     resource_provider->DeleteResource(data.resource_id);
     return;
   }
 
   // Drop recycled resources that are the wrong format.
   while (!updater->recycled_resources_.empty() &&
          updater->recycled_resources_.back().resource_format !=
          data.resource_format) {
     resource_provider->DeleteResource(
         updater->recycled_resources_.back().resource_id);
     updater->recycled_resources_.pop_back();
   }
 
   PlaneResource recycled_resource(data.resource_id,
                                   data.resource_size,
                                   data.resource_format,
                                   sync_point);
   updater->recycled_resources_.push_back(recycled_resource);
 }
 
 }  // namespace cc