diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-19 00:42:45 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-19 00:42:45 +0000 |
| commit | e00bab02826a261b4b0d1434671802d311b56a5b (patch) | |
| tree | 0bdce7835d16fd551fdccedfb2dd2ec28c6a33b4 /cc/test | |
| parent | b77ae7511ca2aa803ae279855bd43acae3eebf84 (diff) | |
| download | chromium_src-e00bab02826a261b4b0d1434671802d311b56a5b.zip chromium_src-e00bab02826a261b4b0d1434671802d311b56a5b.tar.gz chromium_src-e00bab02826a261b4b0d1434671802d311b56a5b.tar.bz2 | |
cc: return resources via a ReturnedResource struct rather than TransferableResource
This allows us to return a count, as well as reducing the size significantly
since we don't need to return the mailbox.
This is built on top of https://codereview.chromium.org/23023005
BUG=263068
Review URL: https://chromiumcodereview.appspot.com/23097005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/fake_delegated_renderer_layer_impl.cc | 3 | ||||
| -rw-r--r-- | cc/test/fake_output_surface.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cc/test/fake_delegated_renderer_layer_impl.cc b/cc/test/fake_delegated_renderer_layer_impl.cc index c6a639e..782bc1c 100644 --- a/cc/test/fake_delegated_renderer_layer_impl.cc +++ b/cc/test/fake_delegated_renderer_layer_impl.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "cc/output/delegated_frame_data.h" #include "cc/quads/draw_quad.h" +#include "cc/resources/returned_resource.h" namespace cc { @@ -45,7 +46,7 @@ void FakeDelegatedRendererLayerImpl::SetFrameDataForRenderPasses( pass->quad_list[j]->IterateResources(add_resource_to_frame_callback); } - TransferableResourceArray resources_for_ack; + ReturnedResourceArray resources_for_ack; SetFrameData(delegated_frame.Pass(), gfx::RectF()); CollectUnusedResources(&resources_for_ack); } diff --git a/cc/test/fake_output_surface.cc b/cc/test/fake_output_surface.cc index 32367fd..bc94f19 100644 --- a/cc/test/fake_output_surface.cc +++ b/cc/test/fake_output_surface.cc @@ -8,6 +8,7 @@ #include "base/message_loop/message_loop.h" #include "cc/output/compositor_frame_ack.h" #include "cc/output/output_surface_client.h" +#include "cc/resources/returned_resource.h" #include "testing/gtest/include/gtest/gtest.h" namespace cc { @@ -126,7 +127,7 @@ void FakeOutputSurface::ReturnResource(unsigned id, CompositorFrameAck* ack) { break; } DCHECK(it != resources_held_by_parent_.end()); - ack->resources.push_back(*it); + ack->resources.push_back(it->ToReturnedResource()); resources_held_by_parent_.erase(it); } |