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

Unified Diff: cc/test/layer_tree_pixel_test.cc

Issue 23072008: aura: Allow in process ContextProvider to hold onscreen contexts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: inprocesscreatecallback: nit Created 7 years, 4 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 | « no previous file | 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/layer_tree_pixel_test.cc
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index 03242007fe25805f2f3b60ed2c988b9a4c7d36f7..a0fac61c815426a6d21d92dfb0ea9e65e4a71653 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -54,9 +54,10 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface(
using WebKit::WebGraphicsContext3D;
using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
- output_surface = make_scoped_ptr(new PixelTestOutputSurface(
+ scoped_ptr<WebGraphicsContext3D> context(
WebGraphicsContext3DInProcessCommandBufferImpl::
- CreateOffscreenContext(WebGraphicsContext3D::Attributes())));
+ CreateOffscreenContext(WebGraphicsContext3D::Attributes()));
+ output_surface.reset(new PixelTestOutputSurface(context.Pass()));
break;
}
}
@@ -69,7 +70,7 @@ scoped_ptr<OutputSurface> LayerTreePixelTest::CreateOutputSurface(
scoped_refptr<cc::ContextProvider>
LayerTreePixelTest::OffscreenContextProviderForMainThread() {
scoped_refptr<webkit::gpu::ContextProviderInProcess> provider =
- webkit::gpu::ContextProviderInProcess::Create();
+ webkit::gpu::ContextProviderInProcess::CreateOffscreen();
CHECK(provider->BindToCurrentThread());
return provider;
}
@@ -77,7 +78,7 @@ LayerTreePixelTest::OffscreenContextProviderForMainThread() {
scoped_refptr<cc::ContextProvider>
LayerTreePixelTest::OffscreenContextProviderForCompositorThread() {
scoped_refptr<webkit::gpu::ContextProviderInProcess> provider =
- webkit::gpu::ContextProviderInProcess::Create();
+ webkit::gpu::ContextProviderInProcess::CreateOffscreen();
CHECK(provider.get());
return provider;
}
« no previous file with comments | « no previous file | cc/test/pixel_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698