diff options
author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 04:56:18 +0000 |
---|---|---|
committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 04:56:18 +0000 |
commit | 16578a8e3481ffdde5b699fe747f114efb64a26b (patch) | |
tree | aded2899b6e2b8c44ed8efdad826a9c2659c173f /mojo/examples/aura_demo | |
parent | 1cd6af20ba32d3fc4ebf4290cf25f8fac9bc9c05 (diff) | |
download | chromium_src-16578a8e3481ffdde5b699fe747f114efb64a26b.zip chromium_src-16578a8e3481ffdde5b699fe747f114efb64a26b.tar.gz chromium_src-16578a8e3481ffdde5b699fe747f114efb64a26b.tar.bz2 |
Revert of gpu: Raise GL_OUT_OF_MEMORY when BeginQueryEXT fails to allocate. (https://codereview.chromium.org/199443004/)
Reason for revert:
Build failure in content/common/gpu/client/gl_helper_benchmark.cc.
http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/63241/steps/compile/logs/stdio
Original issue's description:
> gpu: Lose context when BeginQueryEXT fails to allocate.
>
> Instead of crashes, raise a GL_OUT_OF_MEMORY error. Since compositor
> does not want to deal with these errors and it would leave it in a
> bad state, add the ability to lose the context when GL_OUT_OF_MEMORY
> occurs.
>
> R=piman
> BUG=351587
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261064
TBR=piman@chromium.org,dmichael@chromium.org,jamesr@chromium.org,danakj@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=351587
Review URL: https://codereview.chromium.org/221783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/aura_demo')
-rw-r--r-- | mojo/examples/aura_demo/demo_context_factory.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mojo/examples/aura_demo/demo_context_factory.cc b/mojo/examples/aura_demo/demo_context_factory.cc index 4040208..e9312ad 100644 --- a/mojo/examples/aura_demo/demo_context_factory.cc +++ b/mojo/examples/aura_demo/demo_context_factory.cc @@ -56,10 +56,8 @@ DemoContextFactory::OffscreenCompositorContextProvider() { // 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( - lose_context_when_out_of_memory); + webkit::gpu::ContextProviderInProcess::CreateOffscreen(); } return offscreen_compositor_contexts_; } @@ -68,10 +66,8 @@ scoped_refptr<cc::ContextProvider> 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( - lose_context_when_out_of_memory); + webkit::gpu::ContextProviderInProcess::CreateOffscreen(); if (shared_main_thread_contexts_ && !shared_main_thread_contexts_->BindToCurrentThread()) shared_main_thread_contexts_ = NULL; |