summaryrefslogtreecommitdiffstats
path: root/cc/quads/render_pass_unittest.cc
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-08-18 13:23:12 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-18 20:23:57 +0000
commit7e605b6664746adde53199318ff97128291adab6 (patch)
tree3ed88255c4df03e56aee5879416ba71bff0455ec /cc/quads/render_pass_unittest.cc
parentfee9aece5a851a834adeb4b2b4a93fda3704a881 (diff)
downloadchromium_src-7e605b6664746adde53199318ff97128291adab6.zip
chromium_src-7e605b6664746adde53199318ff97128291adab6.tar.gz
chromium_src-7e605b6664746adde53199318ff97128291adab6.tar.bz2
cc: Remove render_pass_test_common, move to render_pass_test_utils.
The common file had a single method, while the utils has 6. Move that one method over to the utils file, and drop the TestRenderPass type. R=enne, vmpstr, weiliangc CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1291363003 Cr-Commit-Position: refs/heads/master@{#344014}
Diffstat (limited to 'cc/quads/render_pass_unittest.cc')
-rw-r--r--cc/quads/render_pass_unittest.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc
index 5661aa0..dea89cc 100644
--- a/cc/quads/render_pass_unittest.cc
+++ b/cc/quads/render_pass_unittest.cc
@@ -10,13 +10,10 @@
#include "cc/quads/render_pass_draw_quad.h"
#include "cc/quads/solid_color_draw_quad.h"
#include "cc/test/geometry_test_utils.h"
-#include "cc/test/render_pass_test_common.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/effects/SkBlurImageFilter.h"
#include "ui/gfx/transform.h"
-using cc::TestRenderPass;
-
namespace cc {
namespace {
@@ -73,7 +70,7 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
gfx::Rect damage_rect(56, 123, 19, 43);
bool has_transparent_background = true;
- scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
+ scoped_ptr<RenderPass> pass = RenderPass::Create();
pass->SetAll(id,
output_rect,
damage_rect,
@@ -125,7 +122,7 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
gfx::Rect damage_rect(56, 123, 19, 43);
bool has_transparent_background = true;
- scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
+ scoped_ptr<RenderPass> pass = RenderPass::Create();
pass->SetAll(id,
output_rect,
damage_rect,
@@ -186,7 +183,7 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
gfx::Rect contrib_damage_rect(11, 16, 10, 15);
bool contrib_has_transparent_background = true;
- scoped_ptr<TestRenderPass> contrib = TestRenderPass::Create();
+ scoped_ptr<RenderPass> contrib = RenderPass::Create();
contrib->SetAll(contrib_id,
contrib_output_rect,
contrib_damage_rect,
@@ -244,7 +241,7 @@ TEST(RenderPassTest, CopyAllWithCulledQuads) {
gfx::Rect damage_rect(56, 123, 19, 43);
bool has_transparent_background = true;
- scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
+ scoped_ptr<RenderPass> pass = RenderPass::Create();
pass->SetAll(id,
output_rect,
damage_rect,