aura: Allow delegated frames to be used by more than one impl layer.

cc/trees/layer_tree_host_unittest_delegated.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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
+#include "cc/layers/delegated_frame_provider.h"
+#include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/layers/delegated_renderer_layer_client.h"
 #include "cc/layers/delegated_renderer_layer_impl.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/returned_resource.h"
@@ skipping 157 matching lines @@
                  false,  // is_replica
                  0,  // mask_resource_id
                  damage_rect,
                  gfx::Rect(0, 0, 1, 1),  // mask_uv_rect
                  filters,
                  background_filters);
     frame->render_pass_list[0]->shared_quad_state_list.push_back(sqs.Pass());
     frame->render_pass_list[0]->quad_list.push_back(quad.PassAs<DrawQuad>());
   }
 
-  scoped_ptr<DelegatedFrameData> CreateEmptyFrameData() {
-    scoped_ptr<DelegatedFrameData> frame(new DelegatedFrameData);
-    return frame.Pass();
-  }
-
-
   static ResourceProvider::ResourceId AppendResourceId(
       std::vector<ResourceProvider::ResourceId>* resources_in_last_sent_frame,
       ResourceProvider::ResourceId resource_id) {
     resources_in_last_sent_frame->push_back(resource_id);
     return resource_id;
   }
 
   void ReturnUnusedResourcesFromParent(LayerTreeHostImpl* host_impl) {
     DelegatedFrameData* delegated_frame_data =
         output_surface()->last_sent_frame().delegated_frame_data.get();
     if (!delegated_frame_data)
       return;
 
     std::vector<ResourceProvider::ResourceId> resources_in_last_sent_frame;
-    for (size_t i = 0; i < delegated_frame_data->render_pass_list.size(); ++i) {
-      RenderPass* pass = delegated_frame_data->render_pass_list.at(i);
-      for (size_t j = 0; j < pass->quad_list.size(); ++j) {
-        DrawQuad* quad = pass->quad_list[j];
-        quad->IterateResources(base::Bind(&AppendResourceId,
-                                          &resources_in_last_sent_frame));
-      }
+    for (size_t i = 0; i < delegated_frame_data->resource_list.size(); ++i) {
+      resources_in_last_sent_frame.push_back(
+          delegated_frame_data->resource_list[i].id);
     }
 
     std::vector<ResourceProvider::ResourceId> resources_to_return;
 
     const TransferableResourceArray& resources_held_by_parent =
         output_surface()->resources_held_by_parent();
     for (size_t i = 0; i < resources_held_by_parent.size(); ++i) {
       ResourceProvider::ResourceId resource_in_parent =
           resources_held_by_parent[i].id;
       bool resource_in_parent_is_not_part_of_frame =
@@ skipping 10 matching lines @@
     CompositorFrameAck ack;
     for (size_t i = 0; i < resources_to_return.size(); ++i)
       output_surface()->ReturnResource(resources_to_return[i], &ack);
     host_impl->ReclaimResources(&ack);
     host_impl->OnSwapBuffersComplete();
   }
 };
 
 class LayerTreeHostDelegatedTestCaseSingleDelegatedLayer
     : public LayerTreeHostDelegatedTest,
-      public DelegatedRendererLayerClient {
+      public DelegatedRendererLayerClient,
+      public DelegatedFrameResourceCollectionClient {
  public:
-  LayerTreeHostDelegatedTestCaseSingleDelegatedLayer() : available_(false) {}
+  LayerTreeHostDelegatedTestCaseSingleDelegatedLayer()
+      : resource_collection_(
+            make_scoped_ptr(new DelegatedFrameResourceCollection(this))),
+        available_(false) {}
 
   virtual void SetupTree() OVERRIDE {
     root_ = Layer::Create();
     root_->SetAnchorPoint(gfx::PointF());
     root_->SetBounds(gfx::Size(10, 10));
 
-    delegated_ = FakeDelegatedRendererLayer::Create(this);
-    delegated_->SetAnchorPoint(gfx::PointF());
-    delegated_->SetBounds(gfx::Size(10, 10));
-    delegated_->SetIsDrawable(true);
-
-    root_->AddChild(delegated_);
     layer_tree_host()->SetRootLayer(root_);
     LayerTreeHostDelegatedTest::SetupTree();
   }
 
   virtual void BeginTest() OVERRIDE {
     PostSetNeedsCommitToMainThread();
   }
 
+  void SetFrameData(scoped_ptr<DelegatedFrameData> frame_data) {
+    RenderPass* root_pass = frame_data->render_pass_list.back();
+    gfx::Size frame_size = root_pass->output_rect.size();
+
+    if (frame_provider_ && frame_size == frame_provider_->frame_size()) {
+      frame_provider_->SetFrameData(frame_data.Pass());
+      return;
+    }
+
+    if (delegated_.get()) {
+      delegated_->RemoveFromParent();
+      delegated_ = NULL;
+      frame_provider_.reset();
+    }
+
+    frame_provider_ = make_scoped_ptr(new DelegatedFrameProvider(
+        resource_collection_.get(), frame_data.Pass()));
+
+    CreateDelegatedLayer(frame_provider_.get());
+  }
+
+  void CreateDelegatedLayer(DelegatedFrameProvider* frame_provider) {
+    delegated_ = FakeDelegatedRendererLayer::Create(this, frame_provider);
+    delegated_->SetAnchorPoint(gfx::PointF());
+    delegated_->SetBounds(gfx::Size(10, 10));
+    delegated_->SetIsDrawable(true);
+
+    root_->AddChild(delegated_);
+  }
+
   virtual void AfterTest() OVERRIDE {}
 
   // DelegatedRendererLayerClient implementation.
   virtual void DidCommitFrameData() OVERRIDE {}
+
+  // DelegatedFrameProviderClient implementation.
   virtual void UnusedResourcesAreAvailable() OVERRIDE { available_ = true; }
 
   bool TestAndResetAvailable() {
     bool available = available_;
     available_ = false;
     return available;
   }
 
  protected:
+  scoped_ptr<DelegatedFrameResourceCollection> resource_collection_;
+  scoped_ptr<DelegatedFrameProvider> frame_provider_;
   scoped_refptr<Layer> root_;
   scoped_refptr<DelegatedRendererLayer> delegated_;
   bool available_;
 };
 
 class LayerTreeHostDelegatedTestClientDidCommitCallback
     : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
  public:
   LayerTreeHostDelegatedTestClientDidCommitCallback()
       : LayerTreeHostDelegatedTestCaseSingleDelegatedLayer(),
         num_did_commit_frame_data_(0) {}
 
   virtual void DidCommit() OVERRIDE {
     if (TestEnded())
       return;
 
     EXPECT_EQ(1, num_did_commit_frame_data_);
     EndTest();
   }
 
   virtual void BeginTest() OVERRIDE {
-    delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 1, 1),
-                                             gfx::Rect(0, 0, 1, 1)));
+    SetFrameData(CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1)));
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DidCommitFrameData() OVERRIDE {
     num_did_commit_frame_data_++;
   }
 
  protected:
   int num_did_commit_frame_data_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostDelegatedTestClientDidCommitCallback);
 
 class LayerTreeHostDelegatedTestCreateChildId
     : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
  public:
   LayerTreeHostDelegatedTestCreateChildId()
       : LayerTreeHostDelegatedTestCaseSingleDelegatedLayer(),
         num_activates_(0),
         did_reset_child_id_(false) {}
 
   virtual void DidCommit() OVERRIDE {
     if (TestEnded())
       return;
-    delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 1, 1),
-                                             gfx::Rect(0, 0, 1, 1)));
+    SetFrameData(CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1)));
   }
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+    if (host_impl->active_tree()->source_frame_number() < 1)
+      return;
+
     LayerImpl* root_impl = host_impl->active_tree()->root_layer();
     FakeDelegatedRendererLayerImpl* delegated_impl =
         static_cast<FakeDelegatedRendererLayerImpl*>(root_impl->children()[0]);
 
     ContextProvider* context_provider =
         host_impl->output_surface()->context_provider();
 
     ++num_activates_;
     switch (num_activates_) {
       case 2:
@@ skipping 37 matching lines @@
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestCreateChildId);
 
 class LayerTreeHostDelegatedTestOffscreenContext_NoFilters
     : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
  protected:
   virtual void BeginTest() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame =
         CreateFrameData(gfx::Rect(0, 0, 1, 1),
                         gfx::Rect(0, 0, 1, 1));
-    delegated_->SetFrameData(frame.Pass());
+    SetFrameData(frame.Pass());
 
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     EXPECT_FALSE(host_impl->offscreen_context_provider());
     EndTest();
   }
 
   virtual void AfterTest() OVERRIDE {}
@@ skipping 11 matching lines @@
                         gfx::Rect(0, 0, 1, 1));
 
     FilterOperations filters;
     filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f));
     AddRenderPass(frame.get(),
                   RenderPass::Id(2, 1),
                   gfx::Rect(0, 0, 1, 1),
                   gfx::Rect(0, 0, 1, 1),
                   filters,
                   FilterOperations());
-    delegated_->SetFrameData(frame.Pass());
+    SetFrameData(frame.Pass());
 
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     bool expect_context = !delegating_renderer();
     EXPECT_EQ(expect_context, !!host_impl->offscreen_context_provider());
     EndTest();
   }
 
@@ skipping 12 matching lines @@
                         gfx::Rect(0, 0, 1, 1));
 
     FilterOperations filters;
     filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f));
     AddRenderPass(frame.get(),
                   RenderPass::Id(2, 1),
                   gfx::Rect(0, 0, 1, 1),
                   gfx::Rect(0, 0, 1, 1),
                   FilterOperations(),
                   filters);
-    delegated_->SetFrameData(frame.Pass());
+    SetFrameData(frame.Pass());
 
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     bool expect_context = !delegating_renderer();
     EXPECT_EQ(expect_context, !!host_impl->offscreen_context_provider());
     EndTest();
   }
 
   virtual void AfterTest() OVERRIDE {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostDelegatedTestOffscreenContext_BackgroundFilters);
 
 class LayerTreeHostDelegatedTestOffscreenContext_Filters_AddedToTree
     : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
  protected:
   virtual void BeginTest() OVERRIDE {
-    scoped_ptr<DelegatedFrameData> frame =
-        CreateFrameData(gfx::Rect(0, 0, 1, 1),
-                        gfx::Rect(0, 0, 1, 1));
+    scoped_ptr<DelegatedFrameData> frame_no_filters =
+        CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
+
+    scoped_ptr<DelegatedFrameData> frame_with_filters =
+        CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
 
     FilterOperations filters;
     filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f));
-    AddRenderPass(frame.get(),
+    AddRenderPass(frame_with_filters.get(),
                   RenderPass::Id(2, 1),
                   gfx::Rect(0, 0, 1, 1),
                   gfx::Rect(0, 0, 1, 1),
                   filters,
                   FilterOperations());
 
+    SetFrameData(frame_no_filters.Pass());
     delegated_->RemoveFromParent();
-    delegated_->SetFrameData(frame.Pass());
+    SetFrameData(frame_with_filters.Pass());
     layer_tree_host()->root_layer()->AddChild(delegated_);
 
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     bool expect_context = !delegating_renderer();
     EXPECT_EQ(expect_context, !!host_impl->offscreen_context_provider());
     EndTest();
   }
@@ skipping 10 matching lines @@
   LayerTreeHostDelegatedTestLayerUsesFrameDamage()
       : LayerTreeHostDelegatedTestCaseSingleDelegatedLayer(),
         first_draw_for_source_frame_(true) {}
 
   virtual void DidCommit() OVERRIDE {
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // The first time the layer gets a frame the whole layer should be
         // damaged.
-        delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 1, 1),
-                                                 gfx::Rect(0, 0, 1, 1)));
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1)));
         break;
       case 2:
+        // A different frame size will damage the whole layer.
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 20, 20), gfx::Rect(0, 0, 0, 0)));
+        break;
+      case 3:
         // Should create a total amount of gfx::Rect(2, 2, 10, 6) damage.
         // The frame size is 20x20 while the layer is 10x10, so this should
         // produce a gfx::Rect(1, 1, 5, 3) damage rect.
-        delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 20, 20),
-                                                 gfx::Rect(2, 2, 5, 5)));
-        delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 20, 20),
-                                                 gfx::Rect(7, 2, 5, 6)));
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 20, 20), gfx::Rect(2, 2, 5, 5)));
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 20, 20), gfx::Rect(7, 2, 5, 6)));
         break;
-      case 3:
+      case 4:
         // Should create zero damage.
         layer_tree_host()->SetNeedsCommit();
         break;
-      case 4:
+      case 5:
         // Should damage the full viewport.
         delegated_->SetBounds(gfx::Size(2, 2));
         break;
-      case 5:
+      case 6:
         // Should create zero damage.
         layer_tree_host()->SetNeedsCommit();
         break;
-      case 6:
-        // Should damage the full layer.
+      case 7:
+        // Should damage the full layer, tho the frame size is not changing.
         delegated_->SetBounds(gfx::Size(6, 6));
-        delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 5, 5),
-                                                 gfx::Rect(1, 1, 2, 2)));
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 20, 20), gfx::Rect(1, 1, 2, 2)));
         break;
-      case 7:
+      case 8:
         // Should create zero damage.
         layer_tree_host()->SetNeedsCommit();
         break;
-      case 8:
+      case 9:
         // Should damage the full layer.
         delegated_->SetDisplaySize(gfx::Size(10, 10));
         break;
-      case 9:
+      case 10:
         // Should create zero damage.
         layer_tree_host()->SetNeedsCommit();
         break;
-      case 10:
-        // Setting an empty frame should damage the whole layer the
-        // first time.
-        delegated_->SetFrameData(CreateEmptyFrameData());
-        break;
       case 11:
-        // Setting an empty frame shouldn't damage anything after the
-        // first time.
-        delegated_->SetFrameData(CreateEmptyFrameData());
+        // Changing the frame size damages the full layer.
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 5, 5), gfx::Rect(4, 4, 1, 1)));
         break;
       case 12:
-        // Having valid content to display agains should damage the whole layer.
-        delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 10, 10),
-                                                 gfx::Rect(5, 5, 1, 1)));
+        // An invalid frame isn't used, so it should not cause damage.
+        SetFrameData(CreateInvalidFrameData(gfx::Rect(0, 0, 5, 5),
+                                            gfx::Rect(4, 4, 1, 1)));
         break;
       case 13:
-        // An invalid frame isn't used, so it should not cause damage.
-        delegated_->SetFrameData(CreateInvalidFrameData(gfx::Rect(0, 0, 10, 10),
-                                                        gfx::Rect(5, 5, 1, 1)));
-        break;
-      case 14:
         // Should create gfx::Rect(1, 1, 2, 2) of damage. The frame size is
         // 5x5 and the display size is now set to 10x10, so this should result
         // in a gfx::Rect(2, 2, 4, 4) damage rect.
-        delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 5, 5),
-                                                 gfx::Rect(1, 1, 2, 2)));
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 5, 5), gfx::Rect(1, 1, 2, 2)));
         break;
-      case 15:
+      case 14:
         // Should create zero damage.
         layer_tree_host()->SetNeedsCommit();
         break;
-      case 16:
+      case 15:
         // Moving the layer out of the tree and back in will damage the whole
         // impl layer.
         delegated_->RemoveFromParent();
         layer_tree_host()->root_layer()->AddChild(delegated_);
         break;
-      case 17:
+      case 16:
         // Make a larger frame with lots of damage. Then a frame smaller than
         // the first frame's damage. The entire layer should be damaged, but
         // nothing more.
-        delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 10, 10),
-                                                 gfx::Rect(0, 0, 10, 10)));
-        delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 5, 5),
-                                                 gfx::Rect(1, 1, 2, 2)));
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 10, 10), gfx::Rect(0, 0, 10, 10)));
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 5, 5), gfx::Rect(1, 1, 2, 2)));
         break;
-      case 18:
-        // Make a frame with lots of damage. Then replace it with an empty
-        // frame. The entire layer should be damaged, but nothing more.
-        delegated_->SetFrameData(CreateFrameData(gfx::Rect(0, 0, 10, 10),
-                                                 gfx::Rect(0, 0, 10, 10)));
-        delegated_->SetFrameData(CreateEmptyFrameData());
+      case 17:
+        // Make a frame with lots of damage. Then replace it with a frame with
+        // no damage. The entire layer should be damaged, but nothing more.
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 10, 10), gfx::Rect(0, 0, 10, 10)));
+        SetFrameData(
+            CreateFrameData(gfx::Rect(0, 0, 10, 10), gfx::Rect(0, 0, 0, 0)));
         break;
     }
     first_draw_for_source_frame_ = true;
   }
 
   virtual bool PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                      LayerTreeHostImpl::FrameData* frame,
                                      bool result) OVERRIDE {
     EXPECT_TRUE(result);
 
@@ skipping 12 matching lines @@
       case 0:
         // First frame is damaged because of viewport resize.
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 10.f, 10.f).ToString(),
                   damage_rect.ToString());
         break;
       case 1:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 10.f, 10.f).ToString(),
                   damage_rect.ToString());
         break;
       case 2:
+        EXPECT_EQ(gfx::RectF(0.f, 0.f, 10.f, 10.f).ToString(),
+                  damage_rect.ToString());
+        break;
+      case 3:
         EXPECT_EQ(gfx::RectF(1.f, 1.f, 5.f, 3.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 3:
+      case 4:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 0.f, 0.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 4:
+      case 5:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 10.f, 10.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 5:
+      case 6:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 0.f, 0.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 6:
+      case 7:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 6.f, 6.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 7:
+      case 8:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 0.f, 0.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 8:
+      case 9:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 6.f, 6.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 9:
+      case 10:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 0.f, 0.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 10:
-        EXPECT_EQ(gfx::RectF(0.f, 0.f, 6.f, 6.f).ToString(),
+      case 11:
+        EXPECT_EQ(gfx::RectF(0.f, 0.f, 10.f, 10.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 11:
+      case 12:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 0.f, 0.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 12:
-        EXPECT_EQ(gfx::RectF(0.f, 0.f, 6.f, 6.f).ToString(),
+      case 13:
+        EXPECT_EQ(gfx::RectF(2.f, 2.f, 4.f, 4.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 13:
+      case 14:
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 0.f, 0.f).ToString(),
                   damage_rect.ToString());
         break;
-      case 14:
-        EXPECT_EQ(gfx::RectF(2.f, 2.f, 4.f, 4.f).ToString(),
-                  damage_rect.ToString());
-        break;
       case 15:
-        EXPECT_EQ(gfx::RectF(0.f, 0.f, 0.f, 0.f).ToString(),
+        EXPECT_EQ(gfx::RectF(0.f, 0.f, 10.f, 10.f).ToString(),
                   damage_rect.ToString());
         break;
       case 16:
-        EXPECT_EQ(gfx::RectF(0.f, 0.f, 6.f, 6.f).ToString(),
+        EXPECT_EQ(gfx::RectF(0.f, 0.f, 10.f, 10.f).ToString(),
                   damage_rect.ToString());
         break;
       case 17:
-        EXPECT_EQ(gfx::RectF(0.f, 0.f, 6.f, 6.f).ToString(),
-                  damage_rect.ToString());
-        break;
-      case 18:
-        EXPECT_EQ(gfx::RectF(0.f, 0.f, 6.f, 6.f).ToString(),
+        EXPECT_EQ(gfx::RectF(0.f, 0.f, 10.f, 10.f).ToString(),
                   damage_rect.ToString());
         EndTest();
         break;
     }
 
     return result;
   }
 
  protected:
   bool first_draw_for_source_frame_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestLayerUsesFrameDamage);
 
 class LayerTreeHostDelegatedTestMergeResources
     : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
  public:
   virtual void BeginTest() OVERRIDE {
     // Push two frames to the delegated renderer layer with no commit between.
 
     // The first frame has resource 999.
     scoped_ptr<DelegatedFrameData> frame1 =
         CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
     AddTextureQuad(frame1.get(), 999);
     AddTransferableResource(frame1.get(), 999);
-    delegated_->SetFrameData(frame1.Pass());
+    SetFrameData(frame1.Pass());
 
     // The second frame uses resource 999 still, but also adds 555.
     scoped_ptr<DelegatedFrameData> frame2 =
         CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
     AddTextureQuad(frame2.get(), 999);
     AddTransferableResource(frame2.get(), 999);
     AddTextureQuad(frame2.get(), 555);
     AddTransferableResource(frame2.get(), 555);
-    delegated_->SetFrameData(frame2.Pass());
+    SetFrameData(frame2.Pass());
 
     // The resource 999 from frame1 is returned since it is still on the main
     // thread.
     ReturnedResourceArray returned_resources;
-    delegated_->TakeUnusedResourcesForChildCompositor(&returned_resources);
+    resource_collection_->TakeUnusedResourcesForChildCompositor(
+        &returned_resources);
     {
       unsigned expected[] = {999};
       EXPECT_RESOURCES(expected, returned_resources);
       EXPECT_TRUE(TestAndResetAvailable());
     }
 
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
@@ skipping 26 matching lines @@
     : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
  public:
   virtual void BeginTest() OVERRIDE {
     // Generate a frame with two resources in it.
     scoped_ptr<DelegatedFrameData> frame =
         CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
     AddTextureQuad(frame.get(), 999);
     AddTransferableResource(frame.get(), 999);
     AddTextureQuad(frame.get(), 555);
     AddTransferableResource(frame.get(), 555);
-    delegated_->SetFrameData(frame.Pass());
+    SetFrameData(frame.Pass());
 
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     LayerImpl* root_impl = host_impl->active_tree()->root_layer();
     FakeDelegatedRendererLayerImpl* delegated_impl =
         static_cast<FakeDelegatedRendererLayerImpl*>(root_impl->children()[0]);
 
     const ResourceProvider::ResourceIdMap& map =
@@ skipping 39 matching lines @@
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with two resources in it.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 2:
         // All of the resources are in use.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // Keep using 999 but stop using 555.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 444);
         AddTransferableResource(frame.get(), 444);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 3:
         // 555 is no longer in use.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {555};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
 
         // Stop using any resources.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 4:
         // Postpone collecting resources for a frame. They should still be there
         // the next frame.
         layer_tree_host()->SetNeedsCommit();
         return;
       case 5:
         // 444 and 999 are no longer in use. We sent two refs to 999, so we
         // should get two back.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {444, 999, 999};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
         EndTest();
         break;
     }
 
     // Resources are never immediately released.
     ReturnedResourceArray empty_resources;
-    delegated_->TakeUnusedResourcesForChildCompositor(&empty_resources);
+    resource_collection_->TakeUnusedResourcesForChildCompositor(
+        &empty_resources);
     EXPECT_EQ(0u, empty_resources.size());
     EXPECT_FALSE(TestAndResetAvailable());
   }
 
   virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
                                    bool result) OVERRIDE {
     ReturnUnusedResourcesFromParent(host_impl);
   }
 
   virtual void AfterTest() OVERRIDE {}
@@ skipping 17 matching lines @@
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with some resources in it.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
         AddTextureQuad(frame.get(), 444);
         AddTransferableResource(frame.get(), 444);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 2:
         // All of the resources are in use.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // Keep using 999 but stop using 555 and 444.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
 
         // Resource are not immediately released.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // Now using 555 and 444 again, but not 999.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
         AddTextureQuad(frame.get(), 444);
         AddTransferableResource(frame.get(), 444);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 3:
         // The 999 resource is the only unused one. Two references were sent, so
         // two should be returned.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {999, 999};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
         EndTest();
         break;
     }
   }
 
@@ skipping 22 matching lines @@
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with some resources in it.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
         AddTextureQuad(frame.get(), 444);
         AddTransferableResource(frame.get(), 444);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 2:
         // All of the resources are in use.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // Keep using 999 but stop using 555 and 444.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
 
         // Resource are not immediately released.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // The parent compositor (this one) does a commit.
         break;
       case 3:
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {444, 555};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
 
         // The child compositor sends a frame referring to resources not in the
         // frame.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTextureQuad(frame.get(), 444);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
     }
   }
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     if (host_impl->active_tree()->source_frame_number() != 3)
       return;
 
     LayerImpl* root_impl = host_impl->active_tree()->root_layer();
     FakeDelegatedRendererLayerImpl* delegated_impl =
@@ skipping 46 matching lines @@
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with some resources in it.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
         AddTextureQuad(frame.get(), 444);
         AddTransferableResource(frame.get(), 444);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 2:
         // All of the resources are in use.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // Keep using 999 but stop using 555 and 444.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
 
         // Resource are not immediately released.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // The parent compositor (this one) does a commit.
         break;
       case 3:
         // The child compositor sends a frame before taking resources back
         // from the previous commit. This frame makes use of the resources 555
         // and 444, which were just released during commit.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
         AddTextureQuad(frame.get(), 444);
         AddTransferableResource(frame.get(), 444);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
 
         // The resources are used by the new frame but are returned anyway since
         // we passed them again.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {444, 555};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
         break;
       case 4:
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
         EndTest();
         break;
     }
   }
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     if (host_impl->active_tree()->source_frame_number() != 3)
       return;
@@ skipping 55 matching lines @@
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with some resources in it.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 2:
         // All of the resources are in use.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // Generate a bad frame with a resource the layer doesn't have. The
         // 885 and 775 resources are unknown, while ownership of the legit 444
         // resource is passed in here. The bad frame does not use any of the
         // previous resources, 999 or 555.
         // A bad quad is present both before and after the good quad.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 885);
         AddTextureQuad(frame.get(), 444);
         AddTransferableResource(frame.get(), 444);
         AddTextureQuad(frame.get(), 775);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
 
         // The parent compositor (this one) does a commit.
         break;
       case 3:
         // The bad frame's resource is given back to the child compositor.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {444};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
 
         // Now send a good frame with 999 again.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 4:
         // The unused 555 from the last good frame is now released.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {555};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
 
         EndTest();
         break;
     }
   }
@@ skipping 92 matching lines @@
     ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // This frame includes two resources in it, but only uses one.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 2:
         // The unused resource should be returned.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {999};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
 
         EndTest();
         break;
     }
   }
@@ skipping 36 matching lines @@
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // This frame includes two resources in it.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
 
         // But then we immediately stop using 999.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 2:
         // The unused resources should be returned. 555 is still used, but it's
         // returned once to account for the first frame.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {555, 999};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
         // Send a frame with no resources in it.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 3:
         // The now unused resource 555 should be returned.
         resources.clear();
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {555};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
         EndTest();
         break;
     }
   }
 
@@ skipping 36 matching lines @@
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // This frame includes two resources in it.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 2:
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // 999 is in use in the grandparent compositor, generate a frame without
         // it present.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 3:
         // Since 999 is in the grandparent it is not returned.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // The impl side will get back the resource at some point.
         ImplThreadTaskRunner()->PostTask(FROM_HERE,
                                          receive_resource_on_thread_);
         break;
     }
   }
 
@@ skipping 12 matching lines @@
     host_impl->ReclaimResources(&ack);
     host_impl->OnSwapBuffersComplete();
   }
 
   virtual void UnusedResourcesAreAvailable() OVERRIDE {
     EXPECT_EQ(3, layer_tree_host()->source_frame_number());
 
     ReturnedResourceArray resources;
 
     // 999 was returned from the grandparent and could be released.
-    delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+    resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
     {
       unsigned expected[] = {999};
       EXPECT_RESOURCES(expected, resources);
     }
 
     EndTest();
   }
 
   virtual void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     if (host_impl->active_tree()->source_frame_number() < 1)
@@ skipping 71 matching lines @@
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
         AddTextureQuad(frame.get(), 444);
         AddTransferableResource(frame.get(), 444);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 2:
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(0u, resources.size());
         EXPECT_FALSE(TestAndResetAvailable());
 
         // Stop using 999 and 444 in this frame and commit.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         // 999 and 444 will be returned for frame 1, but not 555 since it's in
         // the current frame.
         break;
       case 3:
         // Don't take resources here, but set a new frame that uses 999 again.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 999);
         AddTransferableResource(frame.get(), 999);
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         break;
       case 4:
         // 555 from frame 1 and 2 isn't returned since it's still in use. 999
         // from frame 1 is returned though.
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {444, 999};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
 
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         // 555 will be returned 3 times for frames 1 2 and 3, and 999 will be
         // returned once for frame 3.
         break;
       case 5:
-        delegated_->TakeUnusedResourcesForChildCompositor(&resources);
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
         {
           unsigned expected[] = {555, 555, 555, 999};
           EXPECT_RESOURCES(expected, resources);
           EXPECT_TRUE(TestAndResetAvailable());
         }
 
         EndTest();
         break;
     }
   }
@@ skipping 54 matching lines @@
     wait_thread_.Start();
   }
 
   virtual void BeginTest() OVERRIDE {
     activate_count_ = 0;
 
     scoped_ptr<DelegatedFrameData> frame =
         CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
     AddTextureQuad(frame.get(), 999);
     AddTransferableResource(frame.get(), 999);
-    delegated_->SetFrameData(frame.Pass());
+    SetFrameData(frame.Pass());
 
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void WillActivateTreeOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     // Slow down activation so the main thread DidCommit() will run if
     // not blocked.
     wait_thread_.message_loop()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal,
@@ skipping 17 matching lines @@
   void DidActivate() {
     base::AutoLock lock(activate_lock_);
     switch (activate_count_) {
       case 1: {
         // The first frame has been activated. Set a new frame, and
         // expect the next commit to finish *after* it is activated.
         scoped_ptr<DelegatedFrameData> frame =
             CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
         AddTextureQuad(frame.get(), 555);
         AddTransferableResource(frame.get(), 555);
-        delegated_->SetFrameData(frame.Pass());
+        SetFrameData(frame.Pass());
         // So this commit number should complete after the second activate.
         EXPECT_EQ(1, layer_tree_host()->source_frame_number());
         break;
       }
       case 2:
         // The second frame has been activated. Remove the layer from
         // the tree to cause another commit/activation. The commit should
         // finish *after* the layer is removed from the active tree.
         delegated_->RemoveFromParent();
         // So this commit number should complete after the third activate.
@@ skipping 10 matching lines @@
       case 2: {
         // The activate for the 2nd frame should have happened before now.
         base::AutoLock lock(activate_lock_);
         EXPECT_EQ(2, activate_count_);
         break;
       }
       case 3: {
         // The activate to remove the layer should have happened before now.
         base::AutoLock lock(activate_lock_);
         EXPECT_EQ(3, activate_count_);
+
+        ReturnedResourceArray resources;
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
+        {
+          unsigned expected[] = {999, 555};
+          EXPECT_RESOURCES(expected, resources);
+          EXPECT_TRUE(TestAndResetAvailable());
+        }
         break;
       }
     }
   }
 
 
   virtual void AfterTest() OVERRIDE {}
 
   base::Thread wait_thread_;
   base::WaitableEvent wait_event_;
   base::Lock activate_lock_;
   int activate_count_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     DelegatedFrameIsActivatedDuringCommit);
 
+class LayerTreeHostDelegatedTestTwoImplLayers
+    : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
+ public:
+  virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
+
+  virtual void DidCommitAndDrawFrame() OVERRIDE {
+    scoped_ptr<DelegatedFrameData> frame;
+    ReturnedResourceArray resources;
+
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
+    switch (next_source_frame_number) {
+      case 1:
+        frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
+        AddTextureQuad(frame.get(), 999);
+        AddTransferableResource(frame.get(), 999);
+        AddTextureQuad(frame.get(), 555);
+        AddTransferableResource(frame.get(), 555);
+        SetFrameData(frame.Pass());
+        break;
+      case 2:
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
+        EXPECT_EQ(0u, resources.size());
+        EXPECT_FALSE(TestAndResetAvailable());
+
+        // Remove the delegated layer and replace it with a new one. Use the
+        // same frame and resources for it.
+        delegated_->RemoveFromParent();
+        delegated_ = NULL;
+        CreateDelegatedLayer(frame_provider_.get());
+        break;
+      case 3:
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
+        EXPECT_EQ(0u, resources.size());
+        EXPECT_FALSE(TestAndResetAvailable());
+
+        // Use a frame with no resources in it.
+        frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
+        SetFrameData(frame.Pass());
+        break;
+      case 4:
+        // We gave one frame to the frame provider, so we should get one
+        // ref back for each resource.
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
+        {
+          unsigned expected[] = {555, 999};
+          EXPECT_RESOURCES(expected, resources);
+          EXPECT_TRUE(TestAndResetAvailable());
+        }
+        EndTest();
+        break;
+    }
+  }
+
+  virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
+                                   bool result) OVERRIDE {
+    ReturnUnusedResourcesFromParent(host_impl);
+  }
+
+  virtual void AfterTest() OVERRIDE {}
+};
+
+SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestTwoImplLayers);
+
+class LayerTreeHostDelegatedTestTwoImplLayersTwoFrames
+    : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
+ public:
+  virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
+
+  virtual void DidCommitAndDrawFrame() OVERRIDE {
+    scoped_ptr<DelegatedFrameData> frame;
+    ReturnedResourceArray resources;
+
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
+    switch (next_source_frame_number) {
+      case 1:
+        frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
+        AddTextureQuad(frame.get(), 999);
+        AddTransferableResource(frame.get(), 999);
+        AddTextureQuad(frame.get(), 555);
+        AddTransferableResource(frame.get(), 555);
+        SetFrameData(frame.Pass());
+        break;
+      case 2:
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
+        EXPECT_EQ(0u, resources.size());
+        EXPECT_FALSE(TestAndResetAvailable());
+
+        frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
+        AddTextureQuad(frame.get(), 999);
+        AddTransferableResource(frame.get(), 999);
+        AddTextureQuad(frame.get(), 555);
+        AddTransferableResource(frame.get(), 555);
+
+        // Remove the delegated layer and replace it with a new one. Make a new
+        // frame but with the same resources for it.
+        delegated_->RemoveFromParent();
+        delegated_ = NULL;
+        frame_provider_->SetFrameData(frame.Pass());
+        CreateDelegatedLayer(frame_provider_.get());
+        break;
+      case 3:
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
+        EXPECT_EQ(0u, resources.size());
+        EXPECT_FALSE(TestAndResetAvailable());
+
+        // Use a frame with no resources in it.
+        frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
+        SetFrameData(frame.Pass());
+        break;
+      case 4:
+        // We gave two frames to the frame provider, so we should get two
+        // refs back for each resource.
+        resource_collection_->TakeUnusedResourcesForChildCompositor(&resources);
+        {
+          unsigned expected[] = {555, 555, 999, 999};
+          EXPECT_RESOURCES(expected, resources);
+          EXPECT_TRUE(TestAndResetAvailable());
+        }
+        EndTest();
+        break;
+    }
+  }
+
+  virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
+                                   bool result) OVERRIDE {
+    ReturnUnusedResourcesFromParent(host_impl);
+  }
+
+  virtual void AfterTest() OVERRIDE {}
+};
+
+SINGLE_AND_MULTI_THREAD_TEST_F(
+    LayerTreeHostDelegatedTestTwoImplLayersTwoFrames);

[piman, 2013/10/04 23:42:25]

Could we add one test that tries to put a layer in the tree, commit, remove it,
commit, put it again, and check that we didn't lose the frame/resources in the
process?

[danakj, 2013/10/07 21:57:39]

Done. The main thread needs to hold a reference, so I've made the
DelegatedFrameProvider hold a ref on the last resources given to it.

+
 }  // namespace
 }  // namespace cc