summaryrefslogtreecommitdiffstats
path: root/cc/surfaces/surface_aggregator_unittest.cc
diff options
context:
space:
mode:
authorccameron <ccameron@chromium.org>2015-10-08 13:23:46 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-08 20:24:49 +0000
commit268c09fdae64b08957aba9b31797adb93525c90f (patch)
treef20a976b0b530e6338c631e8cd8cb6f29147458f /cc/surfaces/surface_aggregator_unittest.cc
parent0cd4698d5a49b556b859909210287b5019e84542 (diff)
downloadchromium_src-268c09fdae64b08957aba9b31797adb93525c90f.zip
chromium_src-268c09fdae64b08957aba9b31797adb93525c90f.tar.gz
chromium_src-268c09fdae64b08957aba9b31797adb93525c90f.tar.bz2
cc: Remove redundant overlay arguments
Whether or not a quad can be made into an overlay is dependent on whether there is a GLImage backing the texture resources that the quad uses. Prior to this patch, this information was passed along to the layer or quad via a side-channel, in the form of a "allow overlay" argument. Now, store this information in the cc::Resource, in particular, through the cc::TextureMailbox that it is created from, and have the overlay strategy query the property of the cc::Resource. Add appropriate plumbing of the parameters from the cc::TextureMailbox, through the cc::Resource, to cc::TransferableResource, and finally to a cc::Resource in other compositors. R=reveman,fsamuel,dcheng TBR=danakj BUG=533690 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1387283002 Cr-Commit-Position: refs/heads/master@{#353128}
Diffstat (limited to 'cc/surfaces/surface_aggregator_unittest.cc')
-rw-r--r--cc/surfaces/surface_aggregator_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc
index b2476d9..bfec6e6 100644
--- a/cc/surfaces/surface_aggregator_unittest.cc
+++ b/cc/surfaces/surface_aggregator_unittest.cc
@@ -1582,9 +1582,9 @@ void SubmitCompositorFrameWithResources(ResourceId* resource_ids,
bool flipped = false;
bool nearest_neighbor = false;
quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
- resource_ids[i], gfx::Size(), false, premultiplied_alpha,
- uv_top_left, uv_bottom_right, background_color, vertex_opacity,
- flipped, nearest_neighbor);
+ resource_ids[i], gfx::Size(), premultiplied_alpha, uv_top_left,
+ uv_bottom_right, background_color, vertex_opacity, flipped,
+ nearest_neighbor);
}
frame_data->render_pass_list.push_back(pass.Pass());
scoped_ptr<CompositorFrame> frame(new CompositorFrame);