Mac Overlays: Clip display and UV rects

cc/output/overlay_strategy_common.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/output/overlay_strategy_common.h"
 
 #include <limits>
 
 #include "cc/base/math_util.h"
 #include "cc/quads/io_surface_draw_quad.h"
@@ skipping 83 matching lines @@
       OverlayCandidate::GetOverlayTransform(
           quad.shared_quad_state->quad_to_target_transform, quad.y_flipped);
   if (quad.background_color != SK_ColorTRANSPARENT ||
       quad.premultiplied_alpha ||
       overlay_transform == gfx::OVERLAY_TRANSFORM_INVALID)
     return false;
   quad_info->resource_id = quad.resource_id();
   quad_info->resource_size_in_pixels = quad.resource_size_in_pixels();
   quad_info->transform = overlay_transform;
   quad_info->uv_rect = BoundingRect(quad.uv_top_left, quad.uv_bottom_right);
-  quad_info->quad_rect_in_target_space = MathUtil::MapEnclosingClippedRect(
-      quad.shared_quad_state->quad_to_target_transform, quad.rect);
-  quad_info->clip_rect = quad.shared_quad_state->clip_rect;
-  quad_info->is_clipped = quad.shared_quad_state->is_clipped;
   return true;
 }
 
 bool OverlayStrategyCommon::GetVideoQuadInfo(const StreamVideoDrawQuad& quad,
                                              OverlayCandidate* quad_info) {
   if (!quad.allow_overlay())
     return false;
   gfx::OverlayTransform overlay_transform =
       OverlayCandidate::GetOverlayTransform(
           quad.shared_quad_state->quad_to_target_transform, false);
   if (overlay_transform == gfx::OVERLAY_TRANSFORM_INVALID)
     return false;
   if (!quad.matrix.IsScaleOrTranslation()) {
     // We cannot handle anything other than scaling & translation for texture
     // coordinates yet.
     return false;
   }
   quad_info->resource_id = quad.resource_id();
   quad_info->resource_size_in_pixels = quad.resource_size_in_pixels();
   quad_info->transform = overlay_transform;
-  quad_info->quad_rect_in_target_space = MathUtil::MapEnclosingClippedRect(
-      quad.shared_quad_state->quad_to_target_transform, quad.rect);
-  quad_info->clip_rect = quad.shared_quad_state->clip_rect;
-  quad_info->is_clipped = quad.shared_quad_state->is_clipped;
 
   gfx::Point3F uv0 = gfx::Point3F(0, 0, 0);
   gfx::Point3F uv1 = gfx::Point3F(1, 1, 0);
   quad.matrix.TransformPoint(&uv0);
   quad.matrix.TransformPoint(&uv1);
   gfx::Vector3dF delta = uv1 - uv0;
   if (delta.x() < 0) {
     quad_info->transform = OverlayCandidate::ModifyTransform(
         quad_info->transform, gfx::OVERLAY_TRANSFORM_FLIP_HORIZONTAL);
     float x0 = uv0.x();
@@ skipping 21 matching lines @@
     return false;
   gfx::OverlayTransform overlay_transform =
       OverlayCandidate::GetOverlayTransform(
           quad.shared_quad_state->quad_to_target_transform, false);
   if (overlay_transform != gfx::OVERLAY_TRANSFORM_NONE)
     return false;
   quad_info->resource_id = quad.io_surface_resource_id();
   quad_info->resource_size_in_pixels = quad.io_surface_size;
   quad_info->transform = overlay_transform;
   quad_info->uv_rect = gfx::RectF(1.f, 1.f);
-  quad_info->quad_rect_in_target_space = MathUtil::MapEnclosingClippedRect(
-      quad.shared_quad_state->quad_to_target_transform, quad.rect);
-  quad_info->clip_rect = quad.shared_quad_state->clip_rect;
-  quad_info->is_clipped = quad.shared_quad_state->is_clipped;
   return true;
 }
 
 bool OverlayStrategyCommon::GetCandidateQuadInfo(const DrawQuad& draw_quad,
                                                  OverlayCandidate* quad_info) {
   // All quad checks.
   if (draw_quad.needs_blending || draw_quad.shared_quad_state->opacity != 1.f ||
       draw_quad.shared_quad_state->blend_mode != SkXfermode::kSrcOver_Mode)
     return false;
 
@@ skipping 13 matching lines @@
       if (!GetIOSurfaceQuadInfo(*quad, quad_info))
         return false;
     } break;
     default:
       return false;
   }
 
   quad_info->format = RGBA_8888;
   quad_info->display_rect = OverlayCandidate::GetOverlayRect(
       draw_quad.shared_quad_state->quad_to_target_transform, draw_quad.rect);
+  quad_info->quad_rect_in_target_space = MathUtil::MapEnclosingClippedRect(
+      draw_quad.shared_quad_state->quad_to_target_transform, draw_quad.rect);
+  quad_info->clip_rect = draw_quad.shared_quad_state->clip_rect;
+  quad_info->is_clipped = draw_quad.shared_quad_state->is_clipped;
   return true;
 }
 
 }  // namespace cc