cc: Remove most methods from RendererClient.

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/output/software_renderer.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/pixel_comparator.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 24 matching lines @@
                     const base::FilePath& ref_file,
                     const PixelComparator& comparator);
 
   bool RunPixelTestWithReadbackTarget(
       RenderPassList* pass_list,
       RenderPass* target,
       OffscreenContextOption provide_offscreen_context,
       const base::FilePath& ref_file,
       const PixelComparator& comparator);
 
+  LayerTreeSettings settings_;
   gfx::Size device_viewport_size_;
   class PixelTestRendererClient;
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<PixelTestRendererClient> fake_client_;
   scoped_ptr<DirectRenderer> renderer_;
   scoped_ptr<SkBitmap> result_bitmap_;
 
   void SetUpGLRenderer(bool use_skia_gpu_backend);
   void SetUpSoftwareRenderer();
@@ skipping 23 matching lines @@
 
  protected:
   virtual void SetUp() OVERRIDE;
 };
 
 // A simple wrapper to differentiate a renderer that should use ganesh
 // and one that shouldn't in templates.
 class GLRendererWithSkiaGPUBackend : public GLRenderer {
  public:
   GLRendererWithSkiaGPUBackend(RendererClient* client,
-                       OutputSurface* output_surface,
-                       ResourceProvider* resource_provider,
-                       int highp_threshold_min)
+                               const LayerTreeSettings* settings,
+                               OutputSurface* output_surface,
+                               ResourceProvider* resource_provider,
+                               int highp_threshold_min)
       : GLRenderer(client,
+                   settings,
                    output_surface,
                    resource_provider,
                    highp_threshold_min) {}
 };
 
 // Wrappers to differentiate renderers where the the output surface and viewport
 // have an externally determined size and offset.
 class GLRendererWithExpandedViewport : public GLRenderer {
  public:
   GLRendererWithExpandedViewport(RendererClient* client,
-                       OutputSurface* output_surface,
-                       ResourceProvider* resource_provider,
-                       int highp_threshold_min)
+                                 const LayerTreeSettings* settings,
+                                 OutputSurface* output_surface,
+                                 ResourceProvider* resource_provider,
+                                 int highp_threshold_min)
       : GLRenderer(client,
+                   settings,
                    output_surface,
                    resource_provider,
                    highp_threshold_min) {}
 };
 
 class SoftwareRendererWithExpandedViewport : public SoftwareRenderer {
  public:
   SoftwareRendererWithExpandedViewport(RendererClient* client,
-                       OutputSurface* output_surface,
-                       ResourceProvider* resource_provider)
-      : SoftwareRenderer(client,
-                   output_surface,
-                   resource_provider) {}
+                                       const LayerTreeSettings* settings,
+                                       OutputSurface* output_surface,
+                                       ResourceProvider* resource_provider)
+      : SoftwareRenderer(client, settings, output_surface, resource_provider) {}
 };
 
-
 template<>
 inline void RendererPixelTest<GLRenderer>::SetUp() {
   SetUpGLRenderer(false);
   DCHECK(!renderer()->CanUseSkiaGPUBackend());
 }
 
 template<>
 inline bool RendererPixelTest<GLRenderer>::UseSkiaGPUBackend() const {
   return false;
 }
@@ skipping 73 matching lines @@
 }
 
 typedef RendererPixelTest<GLRenderer> GLRendererPixelTest;
 typedef RendererPixelTest<GLRendererWithSkiaGPUBackend>
     GLRendererSkiaGPUBackendPixelTest;
 typedef RendererPixelTest<SoftwareRenderer> SoftwareRendererPixelTest;
 
 }  // namespace cc
 
 #endif  // CC_TEST_PIXEL_TEST_H_