cc: Rework overlays to not use the ResourceProvider and pass texture size

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/quads/solid_color_draw_quad.h"
 #include "cc/quads/stream_video_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "ui/gfx/geometry/point3_f.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
-OverlayStrategyCommon::OverlayStrategyCommon(
-    OverlayCandidateValidator* capability_checker,
-    ResourceProvider* resource_provider)
-    : capability_checker_(capability_checker),
-      resource_provider_(resource_provider) {
+OverlayStrategyCommon::OverlayStrategyCommon() {
 }
 
 OverlayStrategyCommon::~OverlayStrategyCommon() {
 }
 
 bool OverlayStrategyCommon::IsOverlayQuad(const DrawQuad* draw_quad) {
-  unsigned int resource_id;
   switch (draw_quad->material) {
     case DrawQuad::TEXTURE_CONTENT:
-      resource_id = TextureDrawQuad::MaterialCast(draw_quad)->resource_id;
+      return TextureDrawQuad::MaterialCast(draw_quad)->allow_overlay;
       break;
     case DrawQuad::STREAM_VIDEO_CONTENT:
-      resource_id = StreamVideoDrawQuad::MaterialCast(draw_quad)->resource_id;
+      return StreamVideoDrawQuad::MaterialCast(draw_quad)->allow_overlay;
       break;
     default:
       return false;
   }
-  return resource_provider_->AllowOverlay(resource_id);
 }
 
 bool OverlayStrategyCommon::IsInvisibleQuad(const DrawQuad* draw_quad) {
   if (draw_quad->material == DrawQuad::SOLID_COLOR) {
     const SolidColorDrawQuad* solid_quad =
         SolidColorDrawQuad::MaterialCast(draw_quad);
     SkColor color = solid_quad->color;
     float opacity = solid_quad->opacity();
     float alpha = (SkColorGetA(color) * (1.0f / 255.0f)) * opacity;
     return solid_quad->ShouldDrawWithBlending() &&
            alpha < std::numeric_limits<float>::epsilon();
   }
   return false;
 }
 
 bool OverlayStrategyCommon::GetTextureQuadInfo(const TextureDrawQuad& quad,
                                                OverlayCandidate* quad_info) {
   gfx::OverlayTransform overlay_transform =
       OverlayCandidate::GetOverlayTransform(quad.quadTransform(),
                                             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 = quad.resource_size;
   quad_info->transform = overlay_transform;
   quad_info->uv_rect = BoundingRect(quad.uv_top_left, quad.uv_bottom_right);
   return true;
 }
 
 bool OverlayStrategyCommon::GetVideoQuadInfo(const StreamVideoDrawQuad& quad,
                                              OverlayCandidate* quad_info) {
   gfx::OverlayTransform overlay_transform =
       OverlayCandidate::GetOverlayTransform(quad.quadTransform(), 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 = quad.resource_size;
   quad_info->transform = overlay_transform;
 
   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);
@@ skipping 34 matching lines @@
       return false;
   }
 
   quad_info->format = RGBA_8888;
   quad_info->display_rect = OverlayCandidate::GetOverlayRect(
       draw_quad.quadTransform(), draw_quad.rect);
   return true;
 }
 
 }  // namespace cc