Add flag for drawing layers to screen with Ganesh

cc/test/pixel_test.h

 // 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 "base/file_util.h"
+#include "cc/output/gl_renderer.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/pixel_comparator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/size.h"
 
 #ifndef CC_TEST_PIXEL_TEST_H_
 #define CC_TEST_PIXEL_TEST_H_
 
 namespace cc {
 class DirectRenderer;
-class GLRenderer;
 class SoftwareRenderer;
 class OutputSurface;
 class ResourceProvider;
 
 class PixelTest : public testing::Test {
  protected:
   PixelTest();
   virtual ~PixelTest();
 
   bool RunPixelTest(RenderPassList* pass_list,
                     const base::FilePath& ref_file,
                     const PixelComparator& comparator);
 
   bool RunPixelTestWithReadbackTarget(RenderPassList* pass_list,
                                       RenderPass* target,
                                       const base::FilePath& ref_file,
                                       const PixelComparator& comparator);
 
   gfx::Size device_viewport_size_;
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
   class PixelTestRendererClient;
   scoped_ptr<PixelTestRendererClient> fake_client_;
   scoped_ptr<DirectRenderer> renderer_;
   scoped_ptr<SkBitmap> result_bitmap_;
 
-  void SetUpGLRenderer();
+  void SetUpGLRenderer(bool use_ganesh);
   void SetUpSoftwareRenderer();
 
  private:
   void ReadbackResult(base::Closure quit_run_loop, scoped_ptr<SkBitmap> bitmap);
 
   bool PixelsMatchReference(const base::FilePath& ref_file,
                             const PixelComparator& comparator);
 };
 
 template<typename RendererType>
 class RendererPixelTest : public PixelTest {
  public:
   RendererType* renderer() {
     return static_cast<RendererType*>(renderer_.get());
   }
 
+  bool UseGanesh() const;
+
  protected:
-  virtual void SetUp() OVERRIDE;
+  void SetUp();

[danakj, 2013/05/15 20:33:16]

why isnt it virtual anymore?

[enne (OOO), 2013/05/15 22:34:38]

Changed back.  (At some point as I was iterating on this patch it wasn't
overriding anymore, but it clearly is now.)

+};
+
+// A simple wrapper to differentiate a renderer that should use ganesh
+// and one that shouldn't in templates.
+class GLRendererWithGanesh : public GLRenderer {
+ public:
+  GLRendererWithGanesh(RendererClient* client,
+                       OutputSurface* output_surface,
+                       ResourceProvider* resource_provider,
+                       int highp_threshold_min)
+      : GLRenderer(client,
+                   output_surface,
+                   resource_provider,
+                   highp_threshold_min) {}
 };
 
 template<>
 inline void RendererPixelTest<GLRenderer>::SetUp() {
-  SetUpGLRenderer();
+  SetUpGLRenderer(false);
 }
 
 template<>
+inline bool RendererPixelTest<GLRenderer>::UseGanesh() const {
+  return false;
+}
+
+template<>
+inline void RendererPixelTest<GLRendererWithGanesh>::SetUp() {
+  SetUpGLRenderer(true);
+}
+
+template<>
+inline bool RendererPixelTest<GLRendererWithGanesh>::UseGanesh() const {
+  return true;
+}
+
+template<>
 inline void RendererPixelTest<SoftwareRenderer>::SetUp() {
   SetUpSoftwareRenderer();
 }
 
+template<>
+inline bool RendererPixelTest<SoftwareRenderer>::UseGanesh() const {
+  return false;
+}
+
 typedef RendererPixelTest<GLRenderer> GLRendererPixelTest;
+typedef RendererPixelTest<GLRendererWithGanesh> GLRendererGaneshPixelTest;
 typedef RendererPixelTest<SoftwareRenderer> SoftwareRendererPixelTest;
 
 }  // namespace cc
 
 #endif  // CC_TEST_PIXEL_TEST_H_