Merge 261120 "gpu: Lose context when BeginQueryEXT fails to allo..."

mojo/examples/aura_demo/demo_context_factory.cc

Index: mojo/examples/aura_demo/demo_context_factory.cc
===================================================================
--- mojo/examples/aura_demo/demo_context_factory.cc	(revision 261815)
+++ mojo/examples/aura_demo/demo_context_factory.cc	(working copy)
@@ -56,8 +56,10 @@
     // to leak the context provider when we shutdown to avoid destroying the
     // contexts on the wrong thread.
     DCHECK(!ui::Compositor::WasInitializedWithThread());
+    bool lose_context_when_out_of_memory = true;
     offscreen_compositor_contexts_ =
-        webkit::gpu::ContextProviderInProcess::CreateOffscreen();
+        webkit::gpu::ContextProviderInProcess::CreateOffscreen(
+            lose_context_when_out_of_memory);
   }
   return offscreen_compositor_contexts_;
 }
@@ -66,8 +68,10 @@
 DemoContextFactory::SharedMainThreadContextProvider() {
   if (!shared_main_thread_contexts_ ||
       shared_main_thread_contexts_->DestroyedOnMainThread()) {
+    bool lose_context_when_out_of_memory = false;
     shared_main_thread_contexts_ =
-        webkit::gpu::ContextProviderInProcess::CreateOffscreen();
+        webkit::gpu::ContextProviderInProcess::CreateOffscreen(
+            lose_context_when_out_of_memory);
     if (shared_main_thread_contexts_ &&
         !shared_main_thread_contexts_->BindToCurrentThread())
       shared_main_thread_contexts_ = NULL;