diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 20:12:47 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 20:12:47 +0000 |
| commit | a6366937214521c35a5e040beb2913f0cde1b252 (patch) | |
| tree | d7ff2446cd2dc8c007a46a551bb3676e32f166c3 /cc/test/layer_tree_test.cc | |
| parent | 5cdd8fd8e343dbaa131256302eb338eeac7eb2aa (diff) | |
| download | chromium_src-a6366937214521c35a5e040beb2913f0cde1b252.zip chromium_src-a6366937214521c35a5e040beb2913f0cde1b252.tar.gz chromium_src-a6366937214521c35a5e040beb2913f0cde1b252.tar.bz2 | |
Rename and unify paths for LayerTreeTest::CreateFakeOutputSurface.
This was called CreateFakeOutputSurfaceForTest because of the conflict
with another CreateFakeOutputSurface method. To avoid this confusion,
replace the CreateFakeOutputSurface() calls with direct calls to
FakeOutputSurface::Create3d().
Get all unit tests that use a FakeOutputSurface (everything except
pixel tests) to override CreateFakeOutputSurface instead of
CreateOutputSurface. This gives us a common point for all unit tests
to inject things onto the OutputSurface. We'll inject the frame rate
there in the future (moving it out of LayerTreeSettings).
R=jamesr
BUG=267140
Review URL: https://codereview.chromium.org/155343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_test.cc')
| -rw-r--r-- | cc/test/layer_tree_test.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index 333814d..986d20b 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -676,13 +676,12 @@ void LayerTreeTest::RunTestWithImplSidePainting() { scoped_ptr<OutputSurface> LayerTreeTest::CreateOutputSurface(bool fallback) { scoped_ptr<FakeOutputSurface> output_surface = - CreateFakeOutputSurfaceForTest(fallback); - + CreateFakeOutputSurface(fallback); output_surface_ = output_surface.get(); return output_surface.PassAs<OutputSurface>(); } -scoped_ptr<FakeOutputSurface> LayerTreeTest::CreateFakeOutputSurfaceForTest( +scoped_ptr<FakeOutputSurface> LayerTreeTest::CreateFakeOutputSurface( bool fallback) { if (delegating_renderer_) return FakeOutputSurface::CreateDelegating3d(); |