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

Unified Diff: cc/surfaces/surface_hittest_unittest.cc

Issue 2485473003: Remove SurfaceFactory::Create and SurfaceFactory::Destroy (Closed)
Patch Set: up Created 4 years, 1 month 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_hittest_unittest.cc
diff --git a/cc/surfaces/surface_hittest_unittest.cc b/cc/surfaces/surface_hittest_unittest.cc
index df46846d0a36225ecd7b2f93ba15a71522563064..cf59d49ae7089ca797d978d0052f427d5ecb087c 100644
--- a/cc/surfaces/surface_hittest_unittest.cc
+++ b/cc/surfaces/surface_hittest_unittest.cc
@@ -85,7 +85,6 @@ TEST(SurfaceHittestTest, Hittest_BadCompositorFrameDoesNotCrash) {
SurfaceIdAllocator root_allocator;
LocalFrameId root_local_frame_id = root_allocator.GenerateId();
SurfaceId root_surface_id(root_frame_sink_id, root_local_frame_id);
- root_factory.Create(root_local_frame_id);
root_factory.SubmitCompositorFrame(root_local_frame_id, std::move(root_frame),
SurfaceFactory::DrawCallback());
@@ -97,8 +96,6 @@ TEST(SurfaceHittestTest, Hittest_BadCompositorFrameDoesNotCrash) {
hittest.GetTargetSurfaceAtPoint(
root_surface_id, gfx::Point(100, 100), &transform));
}
-
- root_factory.Destroy(root_local_frame_id);
}
TEST(SurfaceHittestTest, Hittest_SingleSurface) {
@@ -118,7 +115,6 @@ TEST(SurfaceHittestTest, Hittest_SingleSurface) {
SurfaceIdAllocator root_allocator;
LocalFrameId root_local_frame_id = root_allocator.GenerateId();
SurfaceId root_surface_id(root_frame_sink_id, root_local_frame_id);
- root_factory.Create(root_local_frame_id);
root_factory.SubmitCompositorFrame(root_local_frame_id, std::move(root_frame),
SurfaceFactory::DrawCallback());
TestCase tests[] = {
@@ -131,8 +127,6 @@ TEST(SurfaceHittestTest, Hittest_SingleSurface) {
};
RunTests(nullptr, &manager, tests, arraysize(tests));
-
- root_factory.Destroy(root_local_frame_id);
}
TEST(SurfaceHittestTest, Hittest_ChildSurface) {
@@ -171,7 +165,6 @@ TEST(SurfaceHittestTest, Hittest_ChildSurface) {
SurfaceIdAllocator root_allocator;
LocalFrameId root_local_frame_id = root_allocator.GenerateId();
SurfaceId root_surface_id(root_frame_sink_id, root_local_frame_id);
- root_factory.Create(root_local_frame_id);
root_factory.SubmitCompositorFrame(root_local_frame_id, std::move(root_frame),
SurfaceFactory::DrawCallback());
@@ -190,7 +183,6 @@ TEST(SurfaceHittestTest, Hittest_ChildSurface) {
root_rect, child_solid_quad_rect);
// Submit the frame.
- child_factory.Create(child_local_frame_id);
child_factory.SubmitCompositorFrame(child_local_frame_id,
std::move(child_frame),
SurfaceFactory::DrawCallback());
@@ -270,9 +262,6 @@ TEST(SurfaceHittestTest, Hittest_ChildSurface) {
EXPECT_NE(transform, target_transform);
EXPECT_EQ(gfx::Point(25, 25), point_in_target_space);
}
-
- root_factory.Destroy(root_local_frame_id);
- child_factory.Destroy(child_local_frame_id);
}
// This test verifies that hit testing will progress to the next quad if it
@@ -320,7 +309,6 @@ TEST(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
SurfaceIdAllocator root_allocator;
LocalFrameId root_local_frame_id = root_allocator.GenerateId();
SurfaceId root_surface_id(root_frame_sink_id, root_local_frame_id);
- root_factory.Create(root_local_frame_id);
root_factory.SubmitCompositorFrame(root_local_frame_id, std::move(root_frame),
SurfaceFactory::DrawCallback());
@@ -339,7 +327,6 @@ TEST(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
child_solid_quad_rect);
// Submit the frame.
- child_factory.Create(child_local_frame_id);
child_factory.SubmitCompositorFrame(child_local_frame_id,
std::move(child_frame),
SurfaceFactory::DrawCallback());
@@ -384,9 +371,6 @@ TEST(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
};
RunTests(nullptr, &manager, tests, arraysize(tests));
-
- root_factory.Destroy(root_local_frame_id);
- child_factory.Destroy(child_local_frame_id);
}
TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
@@ -439,7 +423,6 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
SurfaceIdAllocator root_allocator;
LocalFrameId root_local_frame_id = root_allocator.GenerateId();
SurfaceId root_surface_id(root_frame_sink_id, root_local_frame_id);
- factory.Create(root_local_frame_id);
factory.SubmitCompositorFrame(root_local_frame_id, std::move(root_frame),
SurfaceFactory::DrawCallback());
@@ -488,8 +471,6 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
};
RunTests(nullptr, &manager, tests, arraysize(tests));
-
- factory.Destroy(root_local_frame_id);
}
TEST(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
@@ -527,7 +508,6 @@ TEST(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
SurfaceIdAllocator root_allocator;
LocalFrameId root_local_frame_id = root_allocator.GenerateId();
SurfaceId root_surface_id(root_frame_sink_id, root_local_frame_id);
- root_factory.Create(root_local_frame_id);
root_factory.SubmitCompositorFrame(root_local_frame_id, std::move(root_frame),
SurfaceFactory::DrawCallback());
@@ -544,7 +524,6 @@ TEST(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
root_rect, child_solid_quad_rect);
// Submit the frame.
- child_factory.Create(child_local_frame_id);
child_factory.SubmitCompositorFrame(child_local_frame_id,
std::move(child_frame),
SurfaceFactory::DrawCallback());
@@ -625,9 +604,6 @@ TEST(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
// Verify that insets have affected hit targeting.
EXPECT_EQ(0, accept_delegate.reject_target_overrides());
EXPECT_EQ(2, accept_delegate.accept_target_overrides());
-
- root_factory.Destroy(root_local_frame_id);
- child_factory.Destroy(child_local_frame_id);
}
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698