Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1663)

Unified Diff: cc/surfaces/surface_aggregator.cc

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/video_resource_updater.h ('k') | cc/surfaces/surface_aggregator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_aggregator.cc
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
index a6f15f018c7735c2e05fe57e1c19855a74facb65..4f00ff34ba738a02154bb0c8b8f8d40a314daae2 100644
--- a/cc/surfaces/surface_aggregator.cc
+++ b/cc/surfaces/surface_aggregator.cc
@@ -251,12 +251,12 @@ void SurfaceAggregator::HandleSurfaceQuad(
// Contributing passes aggregated in to the pass list need to take the
// transform of the surface quad into account to update their transform to
// the root surface.
- // TODO(jamesr): Make sure this is sufficient for surfaces nested several
- // levels deep and add tests.
copy_pass->transform_to_root_target.ConcatTransform(
surface_quad->quadTransform());
copy_pass->transform_to_root_target.ConcatTransform(
content_to_target_transform);
+ copy_pass->transform_to_root_target.ConcatTransform(
+ dest_pass->transform_to_root_target);
CopyQuadsToPass(source.quad_list, source.shared_quad_state_list,
gfx::Transform(), ClipData(), copy_pass.get(), surface_id);
« no previous file with comments | « cc/resources/video_resource_updater.h ('k') | cc/surfaces/surface_aggregator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698