content/renderer/gpu/renderer_gl_context.cc - Issue 7792008: Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed)

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: content/renderer/gpu/renderer_gl_context.cc

Issue 7792008: Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed) (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/

Patch Set: Created 9 years, 4 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/renderer/gpu/renderer_gl_context.cc

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

--- content/renderer/gpu/renderer_gl_context.cc (revision 98673)

+++ content/renderer/gpu/renderer_gl_context.cc (working copy)

@@ -95,6 +95,7 @@

render_view_id,

gfx::Size(),

share_resources,

+ false,

share_group,

allowed_extensions,

attrib_list,

@@ -130,6 +131,7 @@

size,

share_resources,

+ false,

share_group,

allowed_extensions,

attrib_list,

@@ -308,6 +310,7 @@

int render_view_id,

const gfx::Size& size,

bool share_resources,

+ bool bind_generates_resource,

RendererGLContext* share_group,

const char* allowed_extensions,

const int32* attrib_list,

@@ -422,7 +425,8 @@

transfer_buffer.size,

transfer_buffer.ptr,

transfer_buffer_id_,

- share_resources);

+ share_resources,

+ bind_generates_resource);

size_ = size;

« no previous file with comments | « content/renderer/gpu/renderer_gl_context.h ('k') | gpu/command_buffer/build_gles2_cmd_buffer.py » ('j') | no next file with comments »