ui/gl/gl_bindings.h - Issue 715983004: gpu: Change the hex code of conflicted _CHROMIUM macro

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: ui/gl/gl_bindings.h

Issue 715983004: gpu: Change the hex code of conflicted _CHROMIUM macro (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: run build_gles2_cmd_buffer.py Created 6 years, 1 month 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

« gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h ('K') | « gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/gl/gl_bindings.h

diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h

index aea47fc77e8bb0830447ca4641de4915aa4fc676..b8de7d43cbb40245b3d7be9859bbd708cd5548c4 100644

--- a/ui/gl/gl_bindings.h

+++ b/ui/gl/gl_bindings.h

@@ -125,8 +125,8 @@