gpu/gpu.gyp - Issue 7762009: Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt)

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: gpu/gpu.gyp

Issue 7762009: Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt) (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: gpu/gpu.gyp

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

--- gpu/gpu.gyp (revision 98483)

+++ gpu/gpu.gyp (working copy)

@@ -21,6 +21,8 @@

'command_buffer/client/gles2_implementation_autogen.h',

'command_buffer/client/gles2_implementation.cc',

'command_buffer/client/gles2_implementation.h',

+ 'command_buffer/client/program_info_manager.cc',

+ 'command_buffer/client/program_info_manager.h',

]

'targets': [

@@ -272,6 +274,7 @@

'command_buffer/client/fenced_allocator_test.cc',

'command_buffer/client/gles2_implementation_unittest.cc',

'command_buffer/client/mapped_memory_unittest.cc',

+ 'command_buffer/client/program_info_manager_unittest.cc',

'command_buffer/client/ring_buffer_test.cc',

'command_buffer/common/bitfield_helpers_test.cc',

'command_buffer/common/command_buffer_mock.cc',

« no previous file with comments | « gpu/gles2_conform_support/egl/display.cc ('k') | ppapi/proxy/ppb_context_3d_proxy.cc » ('j') | no next file with comments »