Index: cc/test/compositor_frame_helpers.cc |
diff --git a/cc/test/compositor_frame_helpers.cc b/cc/test/compositor_frame_helpers.cc |
index 4cccf85caed05489cfe379e1598ff7c08257e183..0d90c5a36dfb074e3af7c8fdb4bfe05ad5c89daa 100644 |
--- a/cc/test/compositor_frame_helpers.cc |
+++ b/cc/test/compositor_frame_helpers.cc |
@@ -3,6 +3,7 @@ |
// found in the LICENSE file. |
#include "cc/test/compositor_frame_helpers.h" |
+ |
#include "cc/output/compositor_frame.h" |
namespace cc { |
@@ -16,5 +17,49 @@ CompositorFrame MakeCompositorFrame() { |
return frame; |
} |
+CompositorFrame MakeCompositorFrame(std::vector<SurfaceId> embedded_surfaces) { |
+ return MakeCompositorFrame(embedded_surfaces, embedded_surfaces, |
danakj
2017/05/03 16:08:39
You could copy once to a local, and move both, ins
Alex Z.
2017/05/03 18:07:37
This function is removed.
|
+ TransferableResourceArray()); |
+} |
+ |
+CompositorFrame MakeCompositorFrame( |
+ std::vector<SurfaceId> embedded_surfaces, |
+ std::vector<SurfaceId> referenced_surfaces) { |
+ return MakeCompositorFrame(std::move(embedded_surfaces), |
+ std::move(referenced_surfaces), |
+ TransferableResourceArray()); |
+} |
+ |
+CompositorFrame MakeCompositorFrameWithResources( |
+ std::vector<SurfaceId> embedded_surfaces, |
+ TransferableResourceArray resource_list) { |
+ return MakeCompositorFrame(embedded_surfaces, embedded_surfaces, |
+ std::move(resource_list)); |
+} |
+ |
+TransferableResource MakeResource(ResourceId id, |
+ ResourceFormat format, |
+ uint32_t filter, |
+ const gfx::Size& size) { |
+ TransferableResource resource; |
+ resource.id = id; |
+ resource.format = format; |
+ resource.filter = filter; |
+ resource.size = size; |
+ return resource; |
+} |
+ |
+CompositorFrame MakeCompositorFrame(std::vector<SurfaceId> embedded_surfaces, |
+ std::vector<SurfaceId> referenced_surfaces, |
+ TransferableResourceArray resource_list) { |
+ CompositorFrame compositor_frame; |
+ compositor_frame.metadata.begin_frame_ack = BeginFrameAck(0, 1, 1, true); |
+ compositor_frame.metadata.embedded_surfaces = std::move(embedded_surfaces); |
+ compositor_frame.metadata.referenced_surfaces = |
+ std::move(referenced_surfaces); |
+ compositor_frame.resource_list = std::move(resource_list); |
+ return compositor_frame; |
+} |
+ |
} // namespace test |
} // namespace cc |