Skip to content

GitLab

T
tangled
Commit 7f4ec987 authored by Chris Blume's avatar Chris Blume Committed by Commit Bot
Browse files
Options

SurfaceHittest unit tests to use alloctor's copy 

The LSI allocators previously did not store a copy of the last generated
LSI. As a result, many call sites would have to keep their own copies.

Now that the LSI allocators have their own copies, the call sites can be
updated to no longer store a separate copy.

SurfaceHittest unit tests some such call site.

BUG=759031

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Change-Id: I2d15885b14805d230f8ee67d1dfa453d3f46804f
Reviewed-on: https://chromium-review.googlesource.com/1034388Reviewed-by: default avatarFady Samuel <fsamuel@chromium.org>
Commit-Queue: Chris Blume <cblume@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554802}
parent 5623bac2
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 44 deletions
components/viz/service/surfaces/surface_hittest_unittest.cc
View file @ 7f4ec987
...@@ -121,10 +121,11 @@ TEST_F(SurfaceHittestTest, Hittest_BadCompositorFrameDoesNotCrash) { ...@@ -121,10 +121,11 @@ TEST_F(SurfaceHittestTest, Hittest_BadCompositorFrameDoesNotCrash) {
// Submit the root frame. // Submit the root frame.
ParentLocalSurfaceIdAllocator root_allocator; ParentLocalSurfaceIdAllocator root_allocator;
LocalSurfaceId root_local_surface_id = root_allocator.GenerateId(); root_allocator.GenerateId();
SurfaceId root_surface_id(kRootFrameSink, root_local_surface_id); SurfaceId root_surface_id(kRootFrameSink,
root_support().SubmitCompositorFrame(root_local_surface_id, root_allocator.GetCurrentLocalSurfaceId());
std::move(root_frame)); root_support().SubmitCompositorFrame(
root_allocator.GetCurrentLocalSurfaceId(), std::move(root_frame));
{ {
SurfaceHittest hittest(nullptr, surface_manager()); SurfaceHittest hittest(nullptr, surface_manager());
...@@ -145,10 +146,11 @@ TEST_F(SurfaceHittestTest, Hittest_SingleSurface) { ...@@ -145,10 +146,11 @@ TEST_F(SurfaceHittestTest, Hittest_SingleSurface) {
// Submit the root frame. // Submit the root frame.
ParentLocalSurfaceIdAllocator root_allocator; ParentLocalSurfaceIdAllocator root_allocator;
LocalSurfaceId root_local_surface_id = root_allocator.GenerateId(); root_allocator.GenerateId();
SurfaceId root_surface_id(kRootFrameSink, root_local_surface_id); SurfaceId root_surface_id(kRootFrameSink,
root_support().SubmitCompositorFrame(root_local_surface_id, root_allocator.GetCurrentLocalSurfaceId());
std::move(root_frame)); root_support().SubmitCompositorFrame(
root_allocator.GetCurrentLocalSurfaceId(), std::move(root_frame));
TestCase tests[] = { TestCase tests[] = {
{root_surface_id, gfx::Point(100, 100), root_surface_id, {root_surface_id, gfx::Point(100, 100), root_surface_id,
gfx::Point(100, 100), false}, gfx::Point(100, 100), false},
...@@ -165,8 +167,9 @@ TEST_F(SurfaceHittestTest, Hittest_ChildSurface) { ...@@ -165,8 +167,9 @@ TEST_F(SurfaceHittestTest, Hittest_ChildSurface) {
// Add a reference to the child surface on the root surface. // Add a reference to the child surface on the root surface.
ParentLocalSurfaceIdAllocator child_allocator; ParentLocalSurfaceIdAllocator child_allocator;
LocalSurfaceId child_local_surface_id = child_allocator.GenerateId(); child_allocator.GenerateId();
SurfaceId child_surface_id(kChildFrameSink, child_local_surface_id); SurfaceId child_surface_id(kChildFrameSink,
child_allocator.GetCurrentLocalSurfaceId());
gfx::Rect child_rect(200, 200); gfx::Rect child_rect(200, 200);
CreateSurfaceDrawQuad( CreateSurfaceDrawQuad(
root_pass, root_pass,
...@@ -176,10 +179,11 @@ TEST_F(SurfaceHittestTest, Hittest_ChildSurface) { ...@@ -176,10 +179,11 @@ TEST_F(SurfaceHittestTest, Hittest_ChildSurface) {
// Submit the root frame. // Submit the root frame.
ParentLocalSurfaceIdAllocator root_allocator; ParentLocalSurfaceIdAllocator root_allocator;
LocalSurfaceId root_local_surface_id = root_allocator.GenerateId(); root_allocator.GenerateId();
SurfaceId root_surface_id(kRootFrameSink, root_local_surface_id); SurfaceId root_surface_id(kRootFrameSink,
root_support().SubmitCompositorFrame(root_local_surface_id, root_allocator.GetCurrentLocalSurfaceId());
std::move(root_frame)); root_support().SubmitCompositorFrame(
root_allocator.GetCurrentLocalSurfaceId(), std::move(root_frame));
// Creates a child surface. // Creates a child surface.
RenderPass* child_pass = nullptr; RenderPass* child_pass = nullptr;
...@@ -194,8 +198,8 @@ TEST_F(SurfaceHittestTest, Hittest_ChildSurface) { ...@@ -194,8 +198,8 @@ TEST_F(SurfaceHittestTest, Hittest_ChildSurface) {
root_rect, child_solid_quad_rect); root_rect, child_solid_quad_rect);
// Submit the frame. // Submit the frame.
child_support().SubmitCompositorFrame(child_local_surface_id, child_support().SubmitCompositorFrame(
std::move(child_frame)); child_allocator.GetCurrentLocalSurfaceId(), std::move(child_frame));
TestCase tests[] = {{root_surface_id, gfx::Point(10, 10), root_surface_id, TestCase tests[] = {{root_surface_id, gfx::Point(10, 10), root_surface_id,
gfx::Point(10, 10), false}, gfx::Point(10, 10), false},
...@@ -219,8 +223,8 @@ TEST_F(SurfaceHittestTest, Hittest_ChildSurface) { ...@@ -219,8 +223,8 @@ TEST_F(SurfaceHittestTest, Hittest_ChildSurface) {
gfx::Transform(1.0f, 0.0f, 0.0f, 75.0f, 0.0f, 1.0f, 0.0f, 75.0f, 0.0f, gfx::Transform(1.0f, 0.0f, 0.0f, 75.0f, 0.0f, 1.0f, 0.0f, 75.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f), 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f),
root_rect, child_rect, child_surface_id); root_rect, child_rect, child_surface_id);
root_support().SubmitCompositorFrame(root_local_surface_id, root_support().SubmitCompositorFrame(
std::move(root_frame)); root_allocator.GetCurrentLocalSurfaceId(), std::move(root_frame));
// Verify that point (100, 100) no longer falls on the child surface. // Verify that point (100, 100) no longer falls on the child surface.
// Verify that the transform to the child surface's space has also shifted. // Verify that the transform to the child surface's space has also shifted.
...@@ -263,8 +267,9 @@ TEST_F(SurfaceHittestTest, Hittest_OccludedChildSurface) { ...@@ -263,8 +267,9 @@ TEST_F(SurfaceHittestTest, Hittest_OccludedChildSurface) {
// Add a reference to the child surface on the root surface. // Add a reference to the child surface on the root surface.
ParentLocalSurfaceIdAllocator child_allocator; ParentLocalSurfaceIdAllocator child_allocator;
LocalSurfaceId child_local_surface_id = child_allocator.GenerateId(); child_allocator.GenerateId();
SurfaceId child_surface_id(kChildFrameSink, child_local_surface_id); SurfaceId child_surface_id(kChildFrameSink,
child_allocator.GetCurrentLocalSurfaceId());
gfx::Rect child_rect(200, 200); gfx::Rect child_rect(200, 200);
CreateSurfaceDrawQuad( CreateSurfaceDrawQuad(
root_pass, root_pass,
...@@ -274,10 +279,11 @@ TEST_F(SurfaceHittestTest, Hittest_OccludedChildSurface) { ...@@ -274,10 +279,11 @@ TEST_F(SurfaceHittestTest, Hittest_OccludedChildSurface) {
// Submit the root frame. // Submit the root frame.
ParentLocalSurfaceIdAllocator root_allocator; ParentLocalSurfaceIdAllocator root_allocator;
LocalSurfaceId root_local_surface_id = root_allocator.GenerateId(); root_allocator.GenerateId();
SurfaceId root_surface_id(kRootFrameSink, root_local_surface_id); SurfaceId root_surface_id(kRootFrameSink,
root_support().SubmitCompositorFrame(root_local_surface_id, root_allocator.GetCurrentLocalSurfaceId());
std::move(root_frame)); root_support().SubmitCompositorFrame(
root_allocator.GetCurrentLocalSurfaceId(), std::move(root_frame));
// Creates a child surface. // Creates a child surface.
RenderPass* child_pass = nullptr; RenderPass* child_pass = nullptr;
...@@ -292,8 +298,8 @@ TEST_F(SurfaceHittestTest, Hittest_OccludedChildSurface) { ...@@ -292,8 +298,8 @@ TEST_F(SurfaceHittestTest, Hittest_OccludedChildSurface) {
root_rect, child_solid_quad_rect); root_rect, child_solid_quad_rect);
// Submit the frame. // Submit the frame.
child_support().SubmitCompositorFrame(child_local_surface_id, child_support().SubmitCompositorFrame(
std::move(child_frame)); child_allocator.GetCurrentLocalSurfaceId(), std::move(child_frame));
TestCase tests[] = {{root_surface_id, gfx::Point(10, 10), root_surface_id, TestCase tests[] = {{root_surface_id, gfx::Point(10, 10), root_surface_id,
gfx::Point(10, 10), false}, gfx::Point(10, 10), false},
...@@ -337,10 +343,11 @@ TEST_F(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) { ...@@ -337,10 +343,11 @@ TEST_F(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
// Submit the root frame. // Submit the root frame.
ParentLocalSurfaceIdAllocator root_allocator; ParentLocalSurfaceIdAllocator root_allocator;
LocalSurfaceId root_local_surface_id = root_allocator.GenerateId(); root_allocator.GenerateId();
SurfaceId root_surface_id(kRootFrameSink, root_local_surface_id); SurfaceId root_surface_id(kRootFrameSink,
root_support().SubmitCompositorFrame(root_local_surface_id, root_allocator.GetCurrentLocalSurfaceId());
std::move(root_frame)); root_support().SubmitCompositorFrame(
root_allocator.GetCurrentLocalSurfaceId(), std::move(root_frame));
// Creates a child surface. // Creates a child surface.
RenderPass* child_pass = nullptr; RenderPass* child_pass = nullptr;
...@@ -355,8 +362,8 @@ TEST_F(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) { ...@@ -355,8 +362,8 @@ TEST_F(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
root_rect, child_solid_quad_rect); root_rect, child_solid_quad_rect);
// Submit the frame. // Submit the frame.
child_support().SubmitCompositorFrame(child_local_surface_id, child_support().SubmitCompositorFrame(
std::move(child_frame)); child_allocator.GetCurrentLocalSurfaceId(), std::move(child_frame));
TestCase tests[] = {{root_surface_id, gfx::Point(10, 10), root_surface_id, TestCase tests[] = {{root_surface_id, gfx::Point(10, 10), root_surface_id,
gfx::Point(10, 10), false}, gfx::Point(10, 10), false},
...@@ -409,10 +416,11 @@ TEST_F(SurfaceHittestTest, Hittest_RenderPassDrawQuad) { ...@@ -409,10 +416,11 @@ TEST_F(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
// Submit the root frame. // Submit the root frame.
ParentLocalSurfaceIdAllocator root_allocator; ParentLocalSurfaceIdAllocator root_allocator;
LocalSurfaceId root_local_surface_id = root_allocator.GenerateId(); root_allocator.GenerateId();
SurfaceId root_surface_id(kRootFrameSink, root_local_surface_id); SurfaceId root_surface_id(kRootFrameSink,
root_support().SubmitCompositorFrame(root_local_surface_id, root_allocator.GetCurrentLocalSurfaceId());
std::move(root_frame)); root_support().SubmitCompositorFrame(
root_allocator.GetCurrentLocalSurfaceId(), std::move(root_frame));
TestCase tests[] = {// These tests just miss the RenderPassDrawQuad. TestCase tests[] = {// These tests just miss the RenderPassDrawQuad.
{root_surface_id, gfx::Point(49, 49), root_surface_id, {root_surface_id, gfx::Point(49, 49), root_surface_id,
...@@ -443,8 +451,9 @@ TEST_F(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) { ...@@ -443,8 +451,9 @@ TEST_F(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
// Add a reference to the child surface on the root surface. // Add a reference to the child surface on the root surface.
ParentLocalSurfaceIdAllocator child_allocator; ParentLocalSurfaceIdAllocator child_allocator;
LocalSurfaceId child_local_surface_id = child_allocator.GenerateId(); child_allocator.GenerateId();
SurfaceId child_surface_id(kChildFrameSink, child_local_surface_id); SurfaceId child_surface_id(kChildFrameSink,
child_allocator.GetCurrentLocalSurfaceId());
gfx::Rect child_rect(200, 200); gfx::Rect child_rect(200, 200);
CreateSurfaceDrawQuad( CreateSurfaceDrawQuad(
root_pass, root_pass,
...@@ -454,10 +463,11 @@ TEST_F(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) { ...@@ -454,10 +463,11 @@ TEST_F(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
// Submit the root frame. // Submit the root frame.
ParentLocalSurfaceIdAllocator root_allocator; ParentLocalSurfaceIdAllocator root_allocator;
LocalSurfaceId root_local_surface_id = root_allocator.GenerateId(); root_allocator.GenerateId();
SurfaceId root_surface_id(kRootFrameSink, root_local_surface_id); SurfaceId root_surface_id(kRootFrameSink,
root_support().SubmitCompositorFrame(root_local_surface_id, root_allocator.GetCurrentLocalSurfaceId());
std::move(root_frame)); root_support().SubmitCompositorFrame(
root_allocator.GetCurrentLocalSurfaceId(), std::move(root_frame));
// Creates a child surface. // Creates a child surface.
RenderPass* child_pass = nullptr; RenderPass* child_pass = nullptr;
...@@ -472,8 +482,8 @@ TEST_F(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) { ...@@ -472,8 +482,8 @@ TEST_F(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
root_rect, child_solid_quad_rect); root_rect, child_solid_quad_rect);
// Submit the frame. // Submit the frame.
child_support().SubmitCompositorFrame(child_local_surface_id, child_support().SubmitCompositorFrame(
std::move(child_frame)); child_allocator.GetCurrentLocalSurfaceId(), std::move(child_frame));
TestCase test_expectations_without_insets[] = { TestCase test_expectations_without_insets[] = {
{root_surface_id, gfx::Point(55, 55), child_surface_id, gfx::Point(5, 5), {root_surface_id, gfx::Point(55, 55), child_surface_id, gfx::Point(5, 5),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment