gpu/command_buffer/common/gl_mock.h - Issue 8052015: Revert 102978 - Change X11 error handler override to allow easy X11 error checking.

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/command_buffer/common/gl_mock.h

Issue 8052015: Revert 102978 - Change X11 error handler override to allow easy X11 error checking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 3 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/command_buffer/common/gl_mock.h

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

--- gpu/command_buffer/common/gl_mock.h (revision 102984)

+++ gpu/command_buffer/common/gl_mock.h (working copy)

@@ -9,11 +9,6 @@

#define GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_

#pragma once

-// Include gtest.h out of order because <X11/X.h> #define's Bool & None, which

-// gtest uses as struct names (inside a namespace). This means that

-// #include'ing gtest after anything that pulls in X.h fails to compile.

-// This is http://code.google.com/p/googletest/issues/detail?id=371

-#include "testing/gtest/include/gtest/gtest.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "ui/gfx/gl/gl_interface.h"

@@ -455,3 +450,4 @@

} // namespace gfx

#endif // GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_

« no previous file with comments | « gpu/DEPS ('k') | gpu/command_buffer/service/buffer_manager_unittest.cc » ('j') | no next file with comments »