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

Unified Diff: cc/output/overlay_strategy_common.cc

Issue 1311013002: [Ozone] Fix SingleOnTop issue by checking if the quad is clipped. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/output/overlay_strategy_common.cc
diff --git a/cc/output/overlay_strategy_common.cc b/cc/output/overlay_strategy_common.cc
index 5d79cd09878555a375dd715f0421b92079738617..3cfdf841747691740cf7e2628eeed2d8af1c1a0d 100644
--- a/cc/output/overlay_strategy_common.cc
+++ b/cc/output/overlay_strategy_common.cc
@@ -6,6 +6,7 @@
#include <limits>
+#include "cc/base/math_util.h"
#include "cc/quads/io_surface_draw_quad.h"
#include "cc/quads/solid_color_draw_quad.h"
#include "cc/quads/stream_video_draw_quad.h"
@@ -87,6 +88,10 @@ bool OverlayStrategyCommon::GetTextureQuadInfo(const TextureDrawQuad& quad,
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;
}
@@ -105,6 +110,10 @@ bool OverlayStrategyCommon::GetVideoQuadInfo(const StreamVideoDrawQuad& quad,
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);
@@ -144,6 +153,10 @@ bool OverlayStrategyCommon::GetIOSurfaceQuadInfo(const IOSurfaceDrawQuad& quad,
quad_info->resource_size_in_pixels = quad.io_surface_size;
quad_info->transform = overlay_transform;
quad_info->uv_rect = gfx::Rect(0, 0, 1, 1);
+ 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;
}

Powered by Google App Engine
This is Rietveld 408576698