gpu/command_buffer/service/texture_manager_unittest.cc - 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/service/texture_manager_unittest.cc

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

« no previous file with comments | « gpu/command_buffer/service/shader_manager_unittest.cc ('k') | gpu/command_buffer/service/vertex_attrib_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/texture_manager_unittest.cc

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

--- gpu/command_buffer/service/texture_manager_unittest.cc (revision 102984)

+++ gpu/command_buffer/service/texture_manager_unittest.cc (working copy)

@@ -2,17 +2,13 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-// 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 "gpu/command_buffer/service/texture_manager.h"

#include "base/memory/scoped_ptr.h"

#include "gpu/command_buffer/common/gl_mock.h"

#include "gpu/command_buffer/service/feature_info.h"

#include "gpu/command_buffer/service/test_helper.h"

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

using ::testing::Pointee;

using ::testing::_;

@@ -731,3 +727,5 @@

} // namespace gles2

} // namespace gpu

Property changes on: gpu/command_buffer/service/texture_manager_unittest.cc

___________________________________________________________________

Deleted: svn:mergeinfo

Reverse-merged /branches/chrome_webkit_merge_branch/o3d/gpu/command_buffer/service/texture_manager_unittest.cc:r69-2775

Reverse-merged /trunk/src/o3d/gpu/command_buffer/service/texture_manager_unittest.cc:r32866-32958