Commit b6634d21 authored by Katie Dektar's avatar Katie Dektar Committed by Commit Bot

Revert "Enable SkiaCopyOutputScalingPixelTest"

This reverts commit 9a8afe6e.

Reason for revert: Test is flaky, see crbug.com/1051546

Original change's description:
> Enable SkiaCopyOutputScalingPixelTest
> 
> The test should work with SkiaRenderer now.
> 
> Bug: 1047217
> Change-Id: Ib467e836cf7abc3a8d00b606d81ed33470929db2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050616
> Reviewed-by: Jonathan Backer <backer@chromium.org>
> Commit-Queue: kylechar <kylechar@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#740428}

TBR=backer@chromium.org,kylechar@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1047217,1051546
Change-Id: I7184e18735d436edb404a0d9f342cef9830ce002
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2055283Reviewed-by: default avatarKatie Dektar <katie@chromium.org>
Commit-Queue: Katie Dektar <katie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741183}
parent 0ca6d3ee
......@@ -115,6 +115,8 @@ class CopyOutputScalingPixelTest
cc::AddRenderPassQuad(root_pass, smaller_passes[i]);
cc::AddQuad(root_pass, gfx::Rect(viewport_size), root_pass_color);
renderer()->DecideRenderPassAllocationsForFrame(list);
// Make a copy request and execute it by drawing a frame. A subset of the
// viewport is requested, to test that scaled offsets are being computed
// correctly as well.
......@@ -165,7 +167,6 @@ class CopyOutputScalingPixelTest
request->SetScaleRatio(scale_from_, scale_to_);
list.back()->copy_requests.push_back(std::move(request));
renderer()->DecideRenderPassAllocationsForFrame(list);
renderer()->DrawFrame(&list, 1.0f, viewport_size,
gfx::DisplayColorSpaces());
loop.Run();
......@@ -299,8 +300,9 @@ TEST_P(GLCopyOutputScalingPixelTest, ScaledCopyOfDrawnFrame) {
}
INSTANTIATE_TEST_SUITE_P(All, GLCopyOutputScalingPixelTest, kParameters);
// TODO(crbug.com/939442): Enable this test for SkiaRenderer.
using SkiaCopyOutputScalingPixelTest = CopyOutputScalingPixelTest<SkiaRenderer>;
TEST_P(SkiaCopyOutputScalingPixelTest, ScaledCopyOfDrawnFrame) {
TEST_P(SkiaCopyOutputScalingPixelTest, DISABLED_ScaledCopyOfDrawnFrame) {
RunTest();
}
INSTANTIATE_TEST_SUITE_P(All, SkiaCopyOutputScalingPixelTest, kParameters);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment