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

Unified Diff: cc/surfaces/surface_hittest_unittest.cc

Issue 2449853004: Getting rid of DelegatedFrameData (Closed)
Patch Set: nit 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
« no previous file with comments | « cc/surfaces/surface_hittest.cc ('k') | cc/surfaces/surfaces_pixeltest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_hittest_unittest.cc
diff --git a/cc/surfaces/surface_hittest_unittest.cc b/cc/surfaces/surface_hittest_unittest.cc
index 5038188e4ac56a1a724f1d57a28fe23ce18f4293..2c04b2a731c695e3ea1bb05edcb5599d1115d62b 100644
--- a/cc/surfaces/surface_hittest_unittest.cc
+++ b/cc/surfaces/surface_hittest_unittest.cc
@@ -398,7 +398,8 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
// Create a CompostiorFrame with two RenderPasses.
gfx::Rect root_rect(300, 300);
- RenderPassList render_pass_list;
+ CompositorFrame root_frame;
+ RenderPassList& render_pass_list = root_frame.render_pass_list;
// Create a child RenderPass.
RenderPassId child_render_pass_id(1, 3);
@@ -417,9 +418,7 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
&render_pass_list);
RenderPass* root_pass = nullptr;
- CompositorFrame root_frame =
- CreateCompositorFrameWithRenderPassList(&render_pass_list);
- root_pass = root_frame.delegated_frame_data->render_pass_list.back().get();
+ root_pass = root_frame.render_pass_list.back().get();
// Create a RenderPassDrawQuad.
gfx::Rect render_pass_quad_rect(100, 100);
@@ -430,8 +429,7 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
child_render_pass_id);
// Add a solid quad in the child render pass.
- RenderPass* child_render_pass =
- root_frame.delegated_frame_data->render_pass_list.front().get();
+ RenderPass* child_render_pass = root_frame.render_pass_list.front().get();
gfx::Rect child_solid_quad_rect(100, 100);
CreateSolidColorDrawQuad(child_render_pass,
gfx::Transform(),
« no previous file with comments | « cc/surfaces/surface_hittest.cc ('k') | cc/surfaces/surfaces_pixeltest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698