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

Unified Diff: content/browser/gpu/gpu_ipc_browsertests.cc

Issue 226423002: Merge 261120 "gpu: Lose context when BeginQueryEXT fails to allo..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/
Patch Set: Created 6 years, 9 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
Index: content/browser/gpu/gpu_ipc_browsertests.cc
===================================================================
--- content/browser/gpu/gpu_ipc_browsertests.cc (revision 261814)
+++ content/browser/gpu/gpu_ipc_browsertests.cc (working copy)
@@ -35,12 +35,14 @@
content::BrowserGpuChannelHostFactory* factory =
content::BrowserGpuChannelHostFactory::instance();
CHECK(factory);
+ bool lose_context_when_out_of_memory = false;
scoped_refptr<content::GpuChannelHost> gpu_channel_host(
factory->EstablishGpuChannelSync(kInitCause));
context_.reset(
WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
gpu_channel_host.get(),
blink::WebGraphicsContext3D::Attributes(),
+ lose_context_when_out_of_memory,
GURL(),
WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
NULL));
@@ -125,10 +127,12 @@
}
scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContext() {
+ bool lose_context_when_out_of_memory = false;
return make_scoped_ptr(
WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
GetGpuChannel(),
blink::WebGraphicsContext3D::Attributes(),
+ lose_context_when_out_of_memory,
GURL(),
WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
NULL));
« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.cc ('k') | content/browser/renderer_host/compositor_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698