Issue 7792008: Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed)

Issue 7792008: Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed) (Closed)

Created:
9 years, 3 months ago by Vangelis Kokkevis

Modified:
9 years, 3 months ago

Reviewers:
vangelis

CC:
chromium-reviews, joi+watch-content_chromium.org, jam, darin-cc_chromium.org, apatrick_chromium, Paweł Hajdan Jr.

Base URL:
svn://svn.chromium.org/chrome/branches/835/src/

Visibility:
Public.

Description

Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed) BUG=92260 Review URL: http://codereview.chromium.org/7762009 TBR=vangelis@google.com Review URL: http://codereview.chromium.org/7765013 TBR=vangelis@google.com Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=98675

Patch Set 1 #

Created: 9 years, 3 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+1201 lines, -226 lines)			Patch
M	content/common/gpu/gpu_command_buffer_stub.cc	View	1 chunk	+6 lines, -3 lines	0 comments	Download
M	content/renderer/gpu/renderer_gl_context.h	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	content/renderer/gpu/renderer_gl_context.cc	View	4 chunks	+5 lines, -1 line	0 comments	Download
M	gpu/command_buffer/build_gles2_cmd_buffer.py	View	4 chunks	+14 lines, -15 lines	0 comments	Download
M	gpu/command_buffer/client/gles2_demo.cc	View	3 chunks	+4 lines, -1 line	0 comments	Download
M	gpu/command_buffer/client/gles2_implementation.h	View	8 chunks	+20 lines, -7 lines	0 comments	Download
M	gpu/command_buffer/client/gles2_implementation.cc	View	26 chunks	+361 lines, -93 lines	0 comments	Download
M	gpu/command_buffer/client/gles2_implementation_autogen.h	View	8 chunks	+27 lines, -39 lines	0 comments	Download
M	gpu/command_buffer/client/gles2_implementation_unittest.cc	View	7 chunks	+134 lines, -18 lines	0 comments	Download
A +	gpu/command_buffer/client/program_info_manager.h	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
M	gpu/command_buffer/client/program_info_manager.cc	View	1 chunk	+495 lines, -0 lines	0 comments	Download
A +	gpu/command_buffer/client/program_info_manager_unittest.cc	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
M	gpu/command_buffer/common/id_allocator.h	View	1 chunk	+0 lines, -4 lines	0 comments	Download
M	gpu/command_buffer/service/context_group.h	View	3 chunks	+6 lines, -1 line	0 comments	Download
M	gpu/command_buffer/service/context_group.cc	View	1 chunk	+2 lines, -1 line	0 comments	Download
M	gpu/command_buffer/service/context_group_unittest.cc	View	1 chunk	+1 line, -1 line	0 comments	Download
M	gpu/command_buffer/service/gles2_cmd_decoder.cc	View	7 chunks	+30 lines, -13 lines	0 comments	Download
M	gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc	View	20 chunks	+69 lines, -19 lines	0 comments	Download
M	gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h	View	1 chunk	+2 lines, -1 line	0 comments	Download
M	gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc	View	2 chunks	+5 lines, -3 lines	0 comments	Download
M	gpu/command_buffer/service/program_manager_unittest.cc	View	1 chunk	+1 line, -1 line	0 comments	Download
M	gpu/demos/framework/window.cc	View	1 chunk	+2 lines, -1 line	0 comments	Download
M	gpu/gles2_conform_support/egl/display.cc	View	3 chunks	+4 lines, -1 line	0 comments	Download
M	gpu/gpu.gyp	View	2 chunks	+3 lines, -0 lines	0 comments	Download
M	ppapi/proxy/ppb_context_3d_proxy.cc	View	1 chunk	+2 lines, -1 line	0 comments	Download
M	ppapi/shared_impl/graphics_3d_impl.cc	View	1 chunk	+2 lines, -1 line	0 comments	Download
M	webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc	View	2 chunks	+5 lines, -2 lines	0 comments	Download
M	webkit/plugins/ppapi/ppb_context_3d_impl.cc	View	1 chunk	+2 lines, -1 line	0 comments	Download

Messages

Total messages: 1 (0 generated)

Expand Messages | Collapse Messages