summaryrefslogtreecommitdiffstats
path: root/cc/output/renderer_pixeltest.cc
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-09 12:31:23 +0000
committertkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-09 12:31:23 +0000
commit076ab382f8ff91227ea592edbb25550ce48b3b10 (patch)
tree0e72ca535801517359e6d56648baa631c87ec041 /cc/output/renderer_pixeltest.cc
parentc9c75bbffaba8517e11dba929fb60cd9e14dc19a (diff)
downloadchromium_src-076ab382f8ff91227ea592edbb25550ce48b3b10.zip
chromium_src-076ab382f8ff91227ea592edbb25550ce48b3b10.tar.gz
chromium_src-076ab382f8ff91227ea592edbb25550ce48b3b10.tar.bz2
Revert 205076 "cc: Enable AntiAliasing for sub-pixel translation..."
It broke virtual/softwarecompositing/color-matching/ image-color-matching.html and virtual/softwarecompositing/culling/ tile-occlusion-boundaries.html on Linux Release and XP Release. http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20Chromium&showLargeExpectations=true&tests=virtual%2Fsoftwarecompositing%2Fcolor-matching%2Fimage-color-matching.html%2Cvirtual%2Fsoftwarecompositing%2Fculling%2Ftile-occlusion-boundaries.html > cc: Enable AntiAliasing for sub-pixel translations in software renderer > > While here, make the blue/yellow tests horizontal instead of vertical > stripes, so that we can detect vertical flipping issues. > > Tests: RendererPixelTest.EnlargedRenderPassTextureWithAntiAliasing > > R=enne > BUG=247782 > > Review URL: https://chromiumcodereview.appspot.com/16634015 TBR=danakj@chromium.org Review URL: https://codereview.chromium.org/16296006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/renderer_pixeltest.cc')
-rw-r--r--cc/output/renderer_pixeltest.cc82
1 files changed, 7 insertions, 75 deletions
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
index 76de3ad..cb91ca6 100644
--- a/cc/output/renderer_pixeltest.cc
+++ b/cc/output/renderer_pixeltest.cc
@@ -536,7 +536,7 @@ TYPED_TEST(RendererPixelTest, FastPassColorFilterAlphaTranslation) {
FuzzyForSoftwareOnlyPixelComparator<TypeParam>(false)));
}
-TYPED_TEST(RendererPixelTest, EnlargedRenderPassTexture) {
+TYPED_TEST(RendererPixelTest, DISABLED_RenderPassChangesSize) {
gfx::Rect viewport_rect(this->device_viewport_size_);
RenderPass::Id root_pass_id(1, 1);
@@ -557,16 +557,16 @@ TYPED_TEST(RendererPixelTest, EnlargedRenderPassTexture) {
blue->SetNew(shared_state.get(),
gfx::Rect(0,
0,
- this->device_viewport_size_.width(),
- this->device_viewport_size_.height() / 2),
+ this->device_viewport_size_.width() / 2,
+ this->device_viewport_size_.height()),
SK_ColorBLUE,
false);
scoped_ptr<SolidColorDrawQuad> yellow = SolidColorDrawQuad::Create();
yellow->SetNew(shared_state.get(),
- gfx::Rect(0,
- this->device_viewport_size_.height() / 2,
- this->device_viewport_size_.width(),
- this->device_viewport_size_.height() / 2),
+ gfx::Rect(this->device_viewport_size_.width() / 2,
+ 0,
+ this->device_viewport_size_.width() / 2,
+ this->device_viewport_size_.height()),
SK_ColorYELLOW,
false);
@@ -592,74 +592,6 @@ TYPED_TEST(RendererPixelTest, EnlargedRenderPassTexture) {
ExactPixelComparator(true)));
}
-TYPED_TEST(RendererPixelTest, EnlargedRenderPassTextureWithAntiAliasing) {
- gfx::Rect viewport_rect(this->device_viewport_size_);
-
- RenderPass::Id root_pass_id(1, 1);
- scoped_ptr<RenderPass> root_pass =
- CreateTestRootRenderPass(root_pass_id, viewport_rect);
-
- RenderPass::Id child_pass_id(2, 2);
- gfx::Rect pass_rect(this->device_viewport_size_);
- gfx::Transform transform_to_root;
- scoped_ptr<RenderPass> child_pass =
- CreateTestRenderPass(child_pass_id, pass_rect, transform_to_root);
-
- gfx::Transform content_to_target_transform;
- scoped_ptr<SharedQuadState> shared_state =
- CreateTestSharedQuadState(content_to_target_transform, viewport_rect);
-
- scoped_ptr<SolidColorDrawQuad> blue = SolidColorDrawQuad::Create();
- blue->SetNew(shared_state.get(),
- gfx::Rect(0,
- 0,
- this->device_viewport_size_.width(),
- this->device_viewport_size_.height() / 2),
- SK_ColorBLUE,
- false);
- scoped_ptr<SolidColorDrawQuad> yellow = SolidColorDrawQuad::Create();
- yellow->SetNew(shared_state.get(),
- gfx::Rect(0,
- this->device_viewport_size_.height() / 2,
- this->device_viewport_size_.width(),
- this->device_viewport_size_.height() / 2),
- SK_ColorYELLOW,
- false);
-
- child_pass->quad_list.push_back(blue.PassAs<DrawQuad>());
- child_pass->quad_list.push_back(yellow.PassAs<DrawQuad>());
-
- gfx::Transform aa_transform;
- aa_transform.Translate(0.5, 0.0);
-
- scoped_ptr<SharedQuadState> pass_shared_state =
- CreateTestSharedQuadState(aa_transform, pass_rect);
- root_pass->quad_list.push_back(
- CreateTestRenderPassDrawQuad(pass_shared_state.get(),
- pass_rect,
- child_pass_id));
-
- scoped_ptr<SharedQuadState> root_shared_state =
- CreateTestSharedQuadState(gfx::Transform(), viewport_rect);
- scoped_ptr<SolidColorDrawQuad> background = SolidColorDrawQuad::Create();
- background->SetNew(root_shared_state.get(),
- gfx::Rect(this->device_viewport_size_),
- SK_ColorWHITE,
- false);
- root_pass->quad_list.push_back(background.PassAs<DrawQuad>());
-
- RenderPassList pass_list;
- pass_list.push_back(child_pass.Pass());
- pass_list.push_back(root_pass.Pass());
-
- this->renderer_->SetEnlargePassTextureAmountForTesting(gfx::Vector2d(50, 75));
-
- EXPECT_TRUE(this->RunPixelTest(
- &pass_list,
- base::FilePath(FILE_PATH_LITERAL("blue_yellow_anti_aliasing.png")),
- FuzzyForSoftwareOnlyPixelComparator<TypeParam>(true)));
-}
-
template <typename RendererType>
class RendererPixelTestWithBackgroundFilter
: public RendererPixelTest<RendererType> {