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

Unified Diff: cc/surfaces/surface_aggregator.cc

Issue 1175113010: cc: Rename visible_content_rect and content stuff on quads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename-visible-content-rect: comment Created 5 years, 6 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
Index: cc/surfaces/surface_aggregator.cc
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
index a6af98eae0102a015b0cd25c825d751f5751199d..e1ee987af2cd2a765af74930862ca819096e06cb 100644
--- a/cc/surfaces/surface_aggregator.cc
+++ b/cc/surfaces/surface_aggregator.cc
@@ -259,7 +259,7 @@ void SurfaceAggregator::HandleSurfaceQuad(
// transform of the surface quad into account to update their transform to
// the root surface.
copy_pass->transform_to_root_target.ConcatTransform(
- surface_quad->shared_quad_state->content_to_target_transform);
+ surface_quad->shared_quad_state->quad_to_target_transform);
copy_pass->transform_to_root_target.ConcatTransform(target_transform);
copy_pass->transform_to_root_target.ConcatTransform(
dest_pass->transform_to_root_target);
@@ -280,14 +280,14 @@ void SurfaceAggregator::HandleSurfaceQuad(
const QuadList& quads = last_pass.quad_list;
gfx::Transform surface_transform =
- surface_quad->shared_quad_state->content_to_target_transform;
+ surface_quad->shared_quad_state->quad_to_target_transform;
surface_transform.ConcatTransform(target_transform);
// Intersect the transformed visible rect and the clip rect to create a
// smaller cliprect for the quad.
ClipData surface_quad_clip_rect(
true, MathUtil::MapEnclosingClippedRect(
- surface_quad->shared_quad_state->content_to_target_transform,
+ surface_quad->shared_quad_state->quad_to_target_transform,
surface_quad->visible_rect));
if (surface_quad->shared_quad_state->is_clipped) {
surface_quad_clip_rect.rect.Intersect(
@@ -324,7 +324,7 @@ void SurfaceAggregator::HandleSurfaceQuad(
dest_pass->damage_rect = gfx::UnionRects(
dest_pass->damage_rect,
MathUtil::MapEnclosingClippedRect(
- surface_quad->shared_quad_state->content_to_target_transform,
+ surface_quad->shared_quad_state->quad_to_target_transform,
surface_damage));
referenced_surfaces_.erase(it);
@@ -344,7 +344,7 @@ void SurfaceAggregator::CopySharedQuadState(
// target space of the pass. This will be identity except when copying the
// root draw pass from a surface into a pass when the surface draw quad's
// transform is not identity.
- copy_shared_quad_state->content_to_target_transform.ConcatTransform(
+ copy_shared_quad_state->quad_to_target_transform.ConcatTransform(
target_transform);
ClipData new_clip_rect = CalculateClipRect(
@@ -404,7 +404,7 @@ void SurfaceAggregator::CopyQuadsToPass(
dest_pass->damage_rect = gfx::UnionRects(
dest_pass->damage_rect,
MathUtil::MapEnclosingClippedRect(
- dest_quad->shared_quad_state->content_to_target_transform,
+ dest_quad->shared_quad_state->quad_to_target_transform,
pass_damage));
} else {
dest_quad = dest_pass->CopyFromAndAppendDrawQuad(

Powered by Google App Engine
This is Rietveld 408576698