Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2291)

Unified Diff: cc/test/pixel_test.h

Issue 23961003: cc: Remove most methods from RendererClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rendererclient: rebase Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/fake_output_surface_client.h ('k') | cc/test/pixel_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/pixel_test.h
diff --git a/cc/test/pixel_test.h b/cc/test/pixel_test.h
index 86a81123579271ca0a22f0886456db2f4d43374c..2d5e8ce40f977b38b51ddba8f1439b01d946fdf0 100644
--- a/cc/test/pixel_test.h
+++ b/cc/test/pixel_test.h
@@ -42,6 +42,7 @@ class PixelTest : public testing::Test {
const base::FilePath& ref_file,
const PixelComparator& comparator);
+ LayerTreeSettings settings_;
gfx::Size device_viewport_size_;
class PixelTestRendererClient;
scoped_ptr<OutputSurface> output_surface_;
@@ -85,10 +86,12 @@ class RendererPixelTest : public PixelTest {
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) {}
@@ -99,10 +102,12 @@ class GLRendererWithSkiaGPUBackend : public GLRenderer {
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) {}
@@ -111,14 +116,12 @@ class GLRendererWithExpandedViewport : public GLRenderer {
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);
« no previous file with comments | « cc/test/fake_output_surface_client.h ('k') | cc/test/pixel_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698