webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h - Issue 226423002: Merge 261120 "gpu: Lose context when BeginQueryEXT fails to allo..."

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 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

« 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

===================================================================

--- webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h (revision 261815)

+++ webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h (working copy)

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

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);

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

+ bool lose_context_when_out_of_memory);

static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>

WrapContext(

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

WebGraphicsContext3DInProcessCommandBufferImpl(

scoped_ptr< ::gpu::GLInProcessContext> context,

const blink::WebGraphicsContext3D::Attributes& attributes,

+ bool lose_context_when_out_of_memory,

bool is_offscreen,

gfx::AcceleratedWidget window);

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

WGC3Denum context_lost_reason_;

blink::WebGraphicsContext3D::Attributes attributes_;

+ bool lose_context_when_out_of_memory_;

// Errors raised by synthesizeGLError().

std::vector<WGC3Denum> synthetic_errors_;