| Index: cc/test/fake_delegated_renderer_layer_impl.cc
|
| diff --git a/cc/test/fake_delegated_renderer_layer_impl.cc b/cc/test/fake_delegated_renderer_layer_impl.cc
|
| index 5a9bcd50b6a24c5d29d50001bc60a52ebbb0dea2..458641b1c4649022b5d7d5e049f4c886763dcbff 100644
|
| --- a/cc/test/fake_delegated_renderer_layer_impl.cc
|
| +++ b/cc/test/fake_delegated_renderer_layer_impl.cc
|
| @@ -25,17 +25,6 @@ scoped_ptr<LayerImpl> FakeDelegatedRendererLayerImpl::CreateLayerImpl(
|
| return FakeDelegatedRendererLayerImpl::Create(tree_impl, id());
|
| }
|
|
|
| -static ResourceId AddResourceToFrame(ResourceProvider* resource_provider,
|
| - DelegatedFrameData* frame,
|
| - ResourceId resource_id) {
|
| - TransferableResource resource;
|
| - resource.id = resource_id;
|
| - resource.mailbox_holder.texture_target =
|
| - resource_provider->TargetForTesting(resource_id);
|
| - frame->resource_list.push_back(resource);
|
| - return resource_id;
|
| -}
|
| -
|
| ResourceProvider::ResourceIdSet FakeDelegatedRendererLayerImpl::Resources()
|
| const {
|
| return ResourcesForTesting();
|
| @@ -54,15 +43,19 @@ void FakeDelegatedRendererLayerImpl::SetFrameDataForRenderPasses(
|
|
|
| ResourceProvider* resource_provider = layer_tree_impl()->resource_provider();
|
|
|
| - DrawQuad::ResourceIteratorCallback add_resource_to_frame_callback =
|
| - base::Bind(&AddResourceToFrame, resource_provider, delegated_frame.get());
|
| for (const auto& pass : delegated_frame->render_pass_list) {
|
| - for (const auto& quad : pass->quad_list)
|
| - quad->IterateResources(add_resource_to_frame_callback);
|
| + for (const auto& quad : pass->quad_list) {
|
| + for (ResourceId resource_id : quad->resources) {
|
| + TransferableResource resource;
|
| + resource.id = resource_id;
|
| + resource.mailbox_holder.texture_target =
|
| + resource_provider->TargetForTesting(resource_id);
|
| + delegated_frame->resource_list.push_back(resource);
|
| + }
|
| + }
|
| }
|
|
|
| CreateChildIdIfNeeded(base::Bind(&NoopReturnCallback));
|
| SetFrameData(delegated_frame.get(), gfx::RectF());
|
| }
|
| -
|
| } // namespace cc
|
|
|