cc: Test cleanup for layer tree pixel tests.

cc/test/layer_tree_pixel_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/layer_tree_pixel_test.h"
 
 #include "base/path_service.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/resources/texture_mailbox.h"
 #include "cc/test/paths.h"
 #include "cc/test/pixel_comparator.h"
 #include "cc/test/pixel_test_output_surface.h"
 #include "cc/test/pixel_test_software_output_device.h"
 #include "cc/test/pixel_test_utils.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "ui/gl/gl_implementation.h"
 #include "webkit/common/gpu/context_provider_in_process.h"
 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 namespace cc {
 
 LayerTreePixelTest::LayerTreePixelTest()
-    : pixel_comparator_(new ExactPixelComparator(true)), use_gl_(true) {}
+    : pixel_comparator_(new ExactPixelComparator(true)),
+      test_type_(GL_WITH_DEFAULT) {}
 
 LayerTreePixelTest::~LayerTreePixelTest() {}
 
 scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface() {
   gfx::Vector2d viewport_offset(20, 10);
   gfx::Size surface_expansion_size(40, 60);
   scoped_ptr<PixelTestOutputSurface> output_surface;
 
-  if (!use_gl_) {
-    scoped_ptr<PixelTestSoftwareOutputDevice> software_output_device(
-        new PixelTestSoftwareOutputDevice);
-    software_output_device->set_surface_expansion_size(surface_expansion_size);
-    output_surface = make_scoped_ptr(
-        new PixelTestOutputSurface(
-            software_output_device.PassAs<SoftwareOutputDevice>()));
-  } else {
-    CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
+  switch (test_type_) {
+    case SOFTWARE_WITH_DEFAULT:
+    case SOFTWARE_WITH_BITMAP: {
+      scoped_ptr<PixelTestSoftwareOutputDevice> software_output_device(
+          new PixelTestSoftwareOutputDevice);
+      software_output_device->set_surface_expansion_size(
+          surface_expansion_size);
+      output_surface = make_scoped_ptr(
+          new PixelTestOutputSurface(
+              software_output_device.PassAs<SoftwareOutputDevice>()));
+      break;
+    }
 
-    using WebKit::WebGraphicsContext3D;
-    using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
-    scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d(
-        WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext(
-            WebGraphicsContext3D::Attributes()));
-    output_surface = make_scoped_ptr(
-        new PixelTestOutputSurface(context3d.PassAs<WebGraphicsContext3D>()));
+    case GL_WITH_DEFAULT:
+    case GL_WITH_BITMAP: {
+      CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
+
+      using WebKit::WebGraphicsContext3D;
+      using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
+      scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d(
+          WebGraphicsContext3DInProcessCommandBufferImpl::
+              CreateOffscreenContext(WebGraphicsContext3D::Attributes()));
+      output_surface = make_scoped_ptr(
+          new PixelTestOutputSurface(context3d.PassAs<WebGraphicsContext3D>()));
+      break;
+    }
   }
 
   output_surface->set_viewport_offset(viewport_offset);
   output_surface->set_surface_expansion_size(surface_expansion_size);
   return output_surface.PassAs<OutputSurface>();
 }
 
 scoped_refptr<cc::ContextProvider>
 LayerTreePixelTest::OffscreenContextProviderForMainThread() {
   scoped_refptr<webkit::gpu::ContextProviderInProcess> provider =
@@ skipping 74 matching lines @@
       gfx::Rect(0, rect.height() - border_width, rect.width(), border_width),
       border_color);
   layer->AddChild(border_top);
   layer->AddChild(border_left);
   layer->AddChild(border_right);
   layer->AddChild(border_bottom);
   return layer;
 }
 
 void LayerTreePixelTest::RunPixelTest(
+    PixelTestType test_type,
     scoped_refptr<Layer> content_root,
     base::FilePath file_name) {
+  test_type_ = test_type;
   content_root_ = content_root;
   readback_target_ = NULL;
   ref_file_ = file_name;
   RunTest(true, false, true);
 }
 
 void LayerTreePixelTest::RunPixelTestWithReadbackTarget(
+    PixelTestType test_type,
     scoped_refptr<Layer> content_root,
     Layer* target,
     base::FilePath file_name) {
+  test_type_ = test_type;
   content_root_ = content_root;
   readback_target_ = target;
   ref_file_ = file_name;
   RunTest(true, false, true);
 }
 
 void LayerTreePixelTest::SetupTree() {
   scoped_refptr<Layer> root = Layer::Create();
   root->SetBounds(content_root_->bounds());
   root->AddChild(content_root_);
@@ skipping 72 matching lines @@
       out_pixels[dest_y + x + SK_G32_SHIFT/8] = pixels.get()[src_y + x + 1];
       out_pixels[dest_y + x + SK_B32_SHIFT/8] = pixels.get()[src_y + x + 2];
       out_pixels[dest_y + x + SK_A32_SHIFT/8] = pixels.get()[src_y + x + 3];
     }
   }
 
   return bitmap.Pass();
 }
 
 }  // namespace cc