Change pixel_test setup to use gfx::SurfaceOrigin

Follow-up CL to crrev.com/c/2083573 to remove vague bool
flips_vertically.

Bug: 1051970
Change-Id: I7442d72396ae435521b9d9006202a4722c2a87eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2091922Reviewed-by: kylechar <kylechar@chromium.org>
Auto-Submit: Kramer Ge <fangzhoug@chromium.org>
Commit-Queue: Kramer Ge <fangzhoug@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747940}

cc/test/pixel_test.cc

@@ -226,7 +226,8 @@ viz::ResourceId PixelTest::AllocateAndFillSoftwareResource(
       viz::SingleReleaseCallback::Create(base::DoNothing()));
 }
 
-void PixelTest::SetUpGLWithoutRenderer(bool flipped_output_surface) {
+void PixelTest::SetUpGLWithoutRenderer(
+    gfx::SurfaceOrigin output_surface_origin) {
   enable_pixel_output_ = std::make_unique<gl::DisableNullDrawGLBindings>();
 
   auto context_provider =
@@ -235,9 +236,7 @@ void PixelTest::SetUpGLWithoutRenderer(bool flipped_output_surface) {
   gpu::ContextResult result = context_provider->BindToCurrentThread();
   DCHECK_EQ(result, gpu::ContextResult::kSuccess);
   output_surface_ = std::make_unique<PixelTestOutputSurface>(
-      std::move(context_provider), flipped_output_surface
-                                       ? gfx::SurfaceOrigin::kTopLeft
-                                       : gfx::SurfaceOrigin::kBottomLeft);
+      std::move(context_provider), output_surface_origin);
   output_surface_->BindToClient(output_surface_client_.get());
 
   shared_bitmap_manager_ = std::make_unique<viz::TestSharedBitmapManager>();
@@ -253,8 +252,8 @@ void PixelTest::SetUpGLWithoutRenderer(bool flipped_output_surface) {
   child_resource_provider_ = std::make_unique<viz::ClientResourceProvider>();
 }
 
-void PixelTest::SetUpGLRenderer(bool flipped_output_surface) {
-  SetUpGLWithoutRenderer(flipped_output_surface);
+void PixelTest::SetUpGLRenderer(gfx::SurfaceOrigin output_surface_origin) {
+  SetUpGLWithoutRenderer(output_surface_origin);
   renderer_ = std::make_unique<viz::GLRenderer>(
       &renderer_settings_, output_surface_.get(), resource_provider_.get(),
       nullptr, base::ThreadTaskRunnerHandle::Get());
@@ -262,7 +261,7 @@ void PixelTest::SetUpGLRenderer(bool flipped_output_surface) {
   renderer_->SetVisible(true);
 }
 
-void PixelTest::SetUpSkiaRenderer(bool flipped_output_surface) {
+void PixelTest::SetUpSkiaRenderer(gfx::SurfaceOrigin output_surface_origin) {
   enable_pixel_output_ = std::make_unique<gl::DisableNullDrawGLBindings>();
   // Set up the GPU service.
   gpu_service_holder_ = viz::TestGpuServiceHolder::GetInstance();
@@ -274,7 +273,7 @@ void PixelTest::SetUpSkiaRenderer(bool flipped_output_surface) {
       renderer_settings_);
   output_surface_->BindToClient(output_surface_client_.get());
   static_cast<viz::SkiaOutputSurfaceImpl*>(output_surface_.get())
-      ->SetCapabilitiesForTesting(flipped_output_surface);
+      ->SetCapabilitiesForTesting(output_surface_origin);
   resource_provider_ = std::make_unique<viz::DisplayResourceProvider>(
       viz::DisplayResourceProvider::kGpu,
       /*compositor_context_provider=*/nullptr,

cc/test/pixel_test.h

@@ -116,9 +116,9 @@ class PixelTest : public testing::Test {
   viz::SoftwareRenderer* software_renderer_ = nullptr;
   std::unique_ptr<SkBitmap> result_bitmap_;
 
-  void SetUpGLWithoutRenderer(bool flipped_output_surface);
-  void SetUpGLRenderer(bool flipped_output_surface);
-  void SetUpSkiaRenderer(bool flipped_output_surface);
+  void SetUpGLWithoutRenderer(gfx::SurfaceOrigin output_surface_origin);
+  void SetUpGLRenderer(gfx::SurfaceOrigin output_surface_origin);
+  void SetUpSkiaRenderer(gfx::SurfaceOrigin output_surface_origin);
   void SetUpSoftwareRenderer();
 
   void TearDown() override;
@@ -174,12 +174,12 @@ class VulkanSkiaRendererWithFlippedSurface : public viz::SkiaRenderer {};
 
 template <>
 inline void RendererPixelTest<viz::GLRenderer>::SetUp() {
-  SetUpGLRenderer(false);
+  SetUpGLRenderer(gfx::SurfaceOrigin::kBottomLeft);
 }
 
 template <>
 inline void RendererPixelTest<GLRendererWithFlippedSurface>::SetUp() {
-  SetUpGLRenderer(true);
+  SetUpGLRenderer(gfx::SurfaceOrigin::kTopLeft);
 }
 
 template <>
@@ -189,22 +189,22 @@ inline void RendererPixelTest<viz::SoftwareRenderer>::SetUp() {
 
 template <>
 inline void RendererPixelTest<viz::SkiaRenderer>::SetUp() {
-  SetUpSkiaRenderer(false);
+  SetUpSkiaRenderer(gfx::SurfaceOrigin::kBottomLeft);
 }
 
 template <>
 inline void RendererPixelTest<SkiaRendererWithFlippedSurface>::SetUp() {
-  SetUpSkiaRenderer(true);
+  SetUpSkiaRenderer(gfx::SurfaceOrigin::kTopLeft);
 }
 
 template <>
 inline void RendererPixelTest<VulkanSkiaRenderer>::SetUp() {
-  SetUpSkiaRenderer(false);
+  SetUpSkiaRenderer(gfx::SurfaceOrigin::kBottomLeft);
 }
 
 template <>
 inline void RendererPixelTest<VulkanSkiaRendererWithFlippedSurface>::SetUp() {
-  SetUpSkiaRenderer(true);
+  SetUpSkiaRenderer(gfx::SurfaceOrigin::kTopLeft);
 }
 
 typedef RendererPixelTest<viz::GLRenderer> GLRendererPixelTest;

components/viz/common/gl_i420_converter_pixeltest.cc

@@ -34,7 +34,7 @@ class GLI420ConverterPixelTest : public cc::PixelTest,
 
  protected:
   void SetUp() final {
-    cc::PixelTest::SetUpGLWithoutRenderer(false);
+    cc::PixelTest::SetUpGLWithoutRenderer(gfx::SurfaceOrigin::kBottomLeft);
     converter_.reset(new GLI420Converter(context_provider(), allow_mrt_path()));
     texture_helper_ = std::make_unique<GLScalerTestTextureHelper>(
         context_provider()->ContextGL());

components/viz/common/gl_scaler_overscan_pixeltest.cc

@@ -168,7 +168,7 @@ class GLScalerOverscanPixelTest : public cc::PixelTest,
 
  protected:
   void SetUp() final {
-    cc::PixelTest::SetUpGLWithoutRenderer(false);
+    cc::PixelTest::SetUpGLWithoutRenderer(gfx::SurfaceOrigin::kBottomLeft);
 
     scaler_ = std::make_unique<GLScaler>(context_provider());
     gl_ = context_provider()->ContextGL();

components/viz/common/gl_scaler_pixeltest.cc

@@ -88,7 +88,7 @@ class GLScalerPixelTest : public cc::PixelTest, public GLScalerTestUtil {
 
  protected:
   void SetUp() final {
-    cc::PixelTest::SetUpGLWithoutRenderer(false);
+    cc::PixelTest::SetUpGLWithoutRenderer(gfx::SurfaceOrigin::kBottomLeft);
 
     scaler_ = std::make_unique<GLScaler>(context_provider());
     gl_ = context_provider()->ContextGL();

components/viz/common/gl_scaler_shader_pixeltest.cc

@@ -102,7 +102,7 @@ class GLScalerShaderPixelTest
   std::pair<GLuint, GLuint> RenderToNewTextures(GLuint src_texture,
                                                 const gfx::Size& size,
                                                 bool dual_outputs) {
-    auto dst_textures = std::make_pair<GLuint, GLuint>(
+    std::pair<GLuint, GLuint> dst_textures(
         CreateTexture(size), dual_outputs ? CreateTexture(size) : 0u);
     GLuint framebuffer = 0;
     gl_->GenFramebuffers(1, &framebuffer);
@@ -309,7 +309,7 @@ class GLScalerShaderPixelTest
 
  protected:
   void SetUp() final {
-    cc::PixelTest::SetUpGLWithoutRenderer(false);
+    cc::PixelTest::SetUpGLWithoutRenderer(gfx::SurfaceOrigin::kBottomLeft);
 
     scaler_ = std::make_unique<GLScaler>(context_provider());
     gl_ = context_provider()->ContextGL();

components/viz/common/gl_scaler_unittest.cc

@@ -83,7 +83,9 @@ class MockContextProvider : public ContextProvider {
 
 class GLScalerTest : public cc::PixelTest {
  protected:
-  void SetUp() final { cc::PixelTest::SetUpGLWithoutRenderer(false); }
+  void SetUp() final {
+    cc::PixelTest::SetUpGLWithoutRenderer(gfx::SurfaceOrigin::kBottomLeft);
+  }
 
   void TearDown() final { cc::PixelTest::TearDown(); }
 };

components/viz/service/display/gl_renderer_copier_pixeltest.cc

@@ -63,7 +63,7 @@ class GLRendererCopierPixelTest
           std::tuple<GLenum, bool, CopyOutputResult::Format, bool, bool>> {
  public:
   void SetUp() override {
-    SetUpGLWithoutRenderer(false /* flipped_output_surface */);
+    SetUpGLWithoutRenderer(gfx::SurfaceOrigin::kBottomLeft);
 
     texture_deleter_ =
         std::make_unique<TextureDeleter>(base::ThreadTaskRunnerHandle::Get());

components/viz/service/display/skia_readback_pixeltest.cc

@@ -84,7 +84,7 @@ class SkiaReadbackPixelTest : public cc::PixelTest,
   bool ScaleByHalf() const { return GetParam(); }
 
   void SetUp() override {
-    SetUpSkiaRenderer(false);
+    SetUpSkiaRenderer(gfx::SurfaceOrigin::kBottomLeft);
 
     ASSERT_TRUE(cc::ReadPNGFile(
         GetTestFilePath(FILE_PATH_LITERAL("16_color_rects.png")),

components/viz/service/display_embedder/skia_output_surface_impl.cc

@@ -678,12 +678,10 @@ void SkiaOutputSurfaceImpl::SetEnableDCLayers(bool enable) {
 #endif
 
 void SkiaOutputSurfaceImpl::SetCapabilitiesForTesting(
-    bool flipped_output_surface) {
+    gfx::SurfaceOrigin output_surface_origin) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(impl_on_gpu_);
-  capabilities_.output_surface_origin = flipped_output_surface
-                                            ? gfx::SurfaceOrigin::kTopLeft
-                                            : gfx::SurfaceOrigin::kBottomLeft;
+  capabilities_.output_surface_origin = output_surface_origin;
   auto callback =
       base::BindOnce(&SkiaOutputSurfaceImplOnGpu::SetCapabilitiesForTesting,
                      base::Unretained(impl_on_gpu_.get()), capabilities_);

components/viz/service/display_embedder/skia_output_surface_impl.h

@@ -147,7 +147,7 @@ class VIZ_SERVICE_EXPORT SkiaOutputSurfaceImpl : public SkiaOutputSurface {
 
   // Set the fields of |capabilities_| and propagates to |impl_on_gpu_|. Should
   // be called after BindToClient().
-  void SetCapabilitiesForTesting(bool flipped_output_surface);
+  void SetCapabilitiesForTesting(gfx::SurfaceOrigin output_surface_origin);
 
   // Used in unit tests.
   void ScheduleGpuTaskForTesting(