summaryrefslogtreecommitdiffstats
path: root/cc/test/layer_tree_pixel_test.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-16 00:46:09 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-16 00:46:09 +0000
commit0634cdd4173783be804661c755cb111e1f49034d (patch)
tree841b3e44e6c0f76a6345fa78b50cbb53c912eb65 /cc/test/layer_tree_pixel_test.cc
parentfbe4952b1c18689bc7129267d375889cf96cd230 (diff)
downloadchromium_src-0634cdd4173783be804661c755cb111e1f49034d.zip
chromium_src-0634cdd4173783be804661c755cb111e1f49034d.tar.gz
chromium_src-0634cdd4173783be804661c755cb111e1f49034d.tar.bz2
ContextProvider in OutputSurface
Instead of putting a raw WebGraphicsContext3D in the OutputSurface given to the compositor, put a ContextProvider. This requires embedders to create ContextProviders instead of raw contexts. No change in behaviour. Covered by existing tests, including cc/ context loss tests. BUG=258625 R=aelias@chromium.org, jamesr@chromium.org, piman@chromium.org, sievers@chromium.org Review URL: https://codereview.chromium.org/20185002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_pixel_test.cc')
-rw-r--r--cc/test/layer_tree_pixel_test.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index a0fac61..16d7187 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -52,12 +52,9 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface(
case GL_WITH_BITMAP: {
CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
- using WebKit::WebGraphicsContext3D;
- using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
- scoped_ptr<WebGraphicsContext3D> context(
- WebGraphicsContext3DInProcessCommandBufferImpl::
- CreateOffscreenContext(WebGraphicsContext3D::Attributes()));
- output_surface.reset(new PixelTestOutputSurface(context.Pass()));
+ using webkit::gpu::ContextProviderInProcess;
+ output_surface = make_scoped_ptr(new PixelTestOutputSurface(
+ ContextProviderInProcess::CreateOffscreen()));
break;
}
}