webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h - Issue 221783002: Revert of gpu: Raise GL_OUT_OF_MEMORY when BeginQueryEXT fails to allocate.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h

Issue 221783002: Revert of gpu: Raise GL_OUT_OF_MEMORY when BeginQueryEXT fails to allocate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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

« no previous file with comments | « webkit/common/gpu/context_provider_in_process.cc ('k') | webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h

diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h

index 0e4348dccf01db892ea941f1c1bc13b2720485bf..f278bb0351a3bbaf7c934bd576da09ae9306530e 100644

--- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h

+++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h

@@ -52,13 +52,11 @@

static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>

CreateViewContext(

const blink::WebGraphicsContext3D::Attributes& attributes,

- bool lose_context_when_out_of_memory,

gfx::AcceleratedWidget window);

static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>

CreateOffscreenContext(

- const blink::WebGraphicsContext3D::Attributes& attributes,

- bool lose_context_when_out_of_memory);

+ const blink::WebGraphicsContext3D::Attributes& attributes);

static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>

WrapContext(

@@ -573,7 +571,6 @@

WebGraphicsContext3DInProcessCommandBufferImpl(

scoped_ptr< ::gpu::GLInProcessContext> context,

const blink::WebGraphicsContext3D::Attributes& attributes,

- bool lose_context_when_out_of_memory,

bool is_offscreen,

gfx::AcceleratedWidget window);

@@ -601,7 +598,6 @@

WGC3Denum context_lost_reason_;

blink::WebGraphicsContext3D::Attributes attributes_;

- bool lose_context_when_out_of_memory_;

// Errors raised by synthesizeGLError().

std::vector<WGC3Denum> synthetic_errors_;