diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 16:54:36 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 16:54:36 +0000 |
commit | 4145d17a54bbf9c5b7b29efb9f55eaa6f954602b (patch) | |
tree | 4400d937ae8e2ccd1eb2aa162456c2535254951e /cc/output/delegating_renderer_unittest.cc | |
parent | 7a956a61566c1021d310c7a0097c5df45c340269 (diff) | |
download | chromium_src-4145d17a54bbf9c5b7b29efb9f55eaa6f954602b.zip chromium_src-4145d17a54bbf9c5b7b29efb9f55eaa6f954602b.tar.gz chromium_src-4145d17a54bbf9c5b7b29efb9f55eaa6f954602b.tar.bz2 |
cc: Run all LayerTreeHost tests with a delegating renderer.
Unless they choose to opt out.
The VideoResourceUpdater was deleting resources when the ResourceProvider
shut down, which was not ideal. Instead, it deletes them when
it shuts down itself (before the ResourceProvider). This works
out fine, since anyone else using it will be using it through a
mailbox.
DelegatingRenderer needs to use and export the resources in the
quads it is given inside of DrawFrame() as they may be deleted
afterward, instead of waiting until SwapBuffers().
Depends on: https://codereview.chromium.org/14960006/
TEST=cc_unittests
R=jamesr, piman
BUG=123444
Review URL: https://chromiumcodereview.appspot.com/14925009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/delegating_renderer_unittest.cc')
-rw-r--r-- | cc/output/delegating_renderer_unittest.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cc/output/delegating_renderer_unittest.cc b/cc/output/delegating_renderer_unittest.cc index bad075c..94cae6a 100644 --- a/cc/output/delegating_renderer_unittest.cc +++ b/cc/output/delegating_renderer_unittest.cc @@ -18,13 +18,8 @@ class DelegatingRendererTest : public LayerTreeTest { virtual ~DelegatingRendererTest() {} virtual scoped_ptr<OutputSurface> CreateOutputSurface() OVERRIDE { - scoped_ptr<TestWebGraphicsContext3D> context3d = - TestWebGraphicsContext3D::Create( - WebKit::WebGraphicsContext3D::Attributes()); - context3d_ = context3d.get(); scoped_ptr<FakeOutputSurface> output_surface = - FakeOutputSurface::CreateDelegating3d( - context3d.PassAs<WebKit::WebGraphicsContext3D>()); + FakeOutputSurface::CreateDelegating3d(); output_surface_ = output_surface.get(); return output_surface.PassAs<OutputSurface>(); } @@ -84,7 +79,7 @@ class DelegatingRendererTestDraw : public DelegatingRendererTest { } }; -SINGLE_AND_MULTI_THREAD_TEST_F(DelegatingRendererTestDraw); +SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(DelegatingRendererTestDraw); class DelegatingRendererTestResources : public DelegatingRendererTest { public: @@ -143,6 +138,7 @@ class DelegatingRendererTestResources : public DelegatingRendererTest { } }; -SINGLE_AND_MULTI_THREAD_TEST_F(DelegatingRendererTestResources); +SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F( + DelegatingRendererTestResources); } // namespace cc |