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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/surfaces/surfaces_pixeltest.cc

Issue 368403003: Use RenderPass to create DrawQuad in unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@layerrawptrDQ
Patch Set: actually fix error this time Created 6 years, 5 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
« cc/quads/render_pass.h ('K') | « cc/surfaces/surface_aggregator_unittest.cc ('k') | cc/test/render_pass_test_common.h » ('j') | cc/trees/layer_tree_host_unittest_delegated.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surfaces_pixeltest.cc
diff --git a/cc/surfaces/surfaces_pixeltest.cc b/cc/surfaces/surfaces_pixeltest.cc
index c814aafbea06f07a6a10c1b547828ebeeeee8ea8..c9c7a46eaaa35b2e2a8ac6efcbba493d12e4aaaf 100644
--- a/cc/surfaces/surfaces_pixeltest.cc
+++ b/cc/surfaces/surfaces_pixeltest.cc
@@ -70,14 +70,14 @@ TEST_F(SurfacesPixelTest, DrawSimpleFrame) {
CreateAndAppendTestSharedQuadState(
pass.get(), gfx::Transform(), device_viewport_size_);
- scoped_ptr<SolidColorDrawQuad> color_quad = SolidColorDrawQuad::Create();
+ SolidColorDrawQuad* color_quad =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
bool force_anti_aliasing_off = false;
color_quad->SetNew(pass->shared_quad_state_list.back(),
rect,
rect,
SK_ColorGREEN,
force_anti_aliasing_off);
- pass->quad_list.push_back(color_quad.PassAs<DrawQuad>());
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
delegated_frame_data->render_pass_list.push_back(pass.Pass());
@@ -119,21 +119,21 @@ TEST_F(SurfacesPixelTest, DrawSimpleAggregatedFrame) {
CreateAndAppendTestSharedQuadState(
pass.get(), gfx::Transform(), device_viewport_size_);
- scoped_ptr<SurfaceDrawQuad> surface_quad = SurfaceDrawQuad::Create();
+ SurfaceDrawQuad* surface_quad =
+ pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
surface_quad->SetNew(pass->shared_quad_state_list.back(),
gfx::Rect(child_size),
gfx::Rect(child_size),
child_surface_id);
- pass->quad_list.push_back(surface_quad.PassAs<DrawQuad>());
- scoped_ptr<SolidColorDrawQuad> color_quad = SolidColorDrawQuad::Create();
+ SolidColorDrawQuad* color_quad =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
bool force_anti_aliasing_off = false;
color_quad->SetNew(pass->shared_quad_state_list.back(),
rect,
rect,
SK_ColorYELLOW,
force_anti_aliasing_off);
- pass->quad_list.push_back(color_quad.PassAs<DrawQuad>());
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
delegated_frame_data->render_pass_list.push_back(pass.Pass());
@@ -153,14 +153,14 @@ TEST_F(SurfacesPixelTest, DrawSimpleAggregatedFrame) {
CreateAndAppendTestSharedQuadState(
pass.get(), gfx::Transform(), child_size);
- scoped_ptr<SolidColorDrawQuad> color_quad = SolidColorDrawQuad::Create();
+ SolidColorDrawQuad* color_quad =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
bool force_anti_aliasing_off = false;
color_quad->SetNew(pass->shared_quad_state_list.back(),
rect,
rect,
SK_ColorBLUE,
force_anti_aliasing_off);
- pass->quad_list.push_back(color_quad.PassAs<DrawQuad>());
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
delegated_frame_data->render_pass_list.push_back(pass.Pass());
@@ -214,23 +214,23 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
CreateAndAppendTestSharedQuadState(
pass.get(), surface_transform, device_viewport_size_);
- scoped_ptr<SurfaceDrawQuad> left_surface_quad = SurfaceDrawQuad::Create();
+ SurfaceDrawQuad* left_surface_quad =
+ pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
left_surface_quad->SetNew(pass->shared_quad_state_list.back(),
gfx::Rect(child_size),
gfx::Rect(child_size),
left_child_id);
- pass->quad_list.push_back(left_surface_quad.PassAs<DrawQuad>());
surface_transform.Translate(100, 0);
CreateAndAppendTestSharedQuadState(
pass.get(), surface_transform, device_viewport_size_);
- scoped_ptr<SurfaceDrawQuad> right_surface_quad = SurfaceDrawQuad::Create();
+ SurfaceDrawQuad* right_surface_quad =
+ pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
right_surface_quad->SetNew(pass->shared_quad_state_list.back(),
gfx::Rect(child_size),
gfx::Rect(child_size),
right_child_id);
- pass->quad_list.push_back(right_surface_quad.PassAs<DrawQuad>());
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
delegated_frame_data->render_pass_list.push_back(pass.Pass());
@@ -250,24 +250,22 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
CreateAndAppendTestSharedQuadState(
pass.get(), gfx::Transform(), child_size);
- scoped_ptr<SolidColorDrawQuad> top_color_quad =
- SolidColorDrawQuad::Create();
+ SolidColorDrawQuad* top_color_quad =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
bool force_anti_aliasing_off = false;
top_color_quad->SetNew(pass->shared_quad_state_list.back(),
gfx::Rect(quad_size),
gfx::Rect(quad_size),
SK_ColorGREEN,
force_anti_aliasing_off);
- pass->quad_list.push_back(top_color_quad.PassAs<DrawQuad>());
- scoped_ptr<SolidColorDrawQuad> bottom_color_quad =
- SolidColorDrawQuad::Create();
+ SolidColorDrawQuad* bottom_color_quad =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
bottom_color_quad->SetNew(pass->shared_quad_state_list.back(),
gfx::Rect(0, 100, 100, 100),
gfx::Rect(0, 100, 100, 100),
SK_ColorBLUE,
force_anti_aliasing_off);
- pass->quad_list.push_back(bottom_color_quad.PassAs<DrawQuad>());
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
delegated_frame_data->render_pass_list.push_back(pass.Pass());
@@ -287,24 +285,22 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
CreateAndAppendTestSharedQuadState(
pass.get(), gfx::Transform(), child_size);
- scoped_ptr<SolidColorDrawQuad> top_color_quad =
- SolidColorDrawQuad::Create();
+ SolidColorDrawQuad* top_color_quad =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
bool force_anti_aliasing_off = false;
top_color_quad->SetNew(pass->shared_quad_state_list.back(),
gfx::Rect(quad_size),
gfx::Rect(quad_size),
SK_ColorBLUE,
force_anti_aliasing_off);
- pass->quad_list.push_back(top_color_quad.PassAs<DrawQuad>());
- scoped_ptr<SolidColorDrawQuad> bottom_color_quad =
- SolidColorDrawQuad::Create();
+ SolidColorDrawQuad* bottom_color_quad =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
bottom_color_quad->SetNew(pass->shared_quad_state_list.back(),
gfx::Rect(0, 100, 100, 100),
gfx::Rect(0, 100, 100, 100),
SK_ColorGREEN,
force_anti_aliasing_off);
- pass->quad_list.push_back(bottom_color_quad.PassAs<DrawQuad>());
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
delegated_frame_data->render_pass_list.push_back(pass.Pass());
« cc/quads/render_pass.h ('K') | « cc/surfaces/surface_aggregator_unittest.cc ('k') | cc/test/render_pass_test_common.h » ('j') | cc/trees/layer_tree_host_unittest_delegated.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698