summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authordominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 18:58:29 +0000
committerdominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 18:58:29 +0000
commit31c31b2bab65f6b0f87ab234aa0f253f9f55f4df (patch)
tree4019f44e24ebd0e8284a2197f65407a971faf76d /gpu
parent785b6e7a46fc2e0ec1f40abd67fc5930c95094ad (diff)
downloadchromium_src-31c31b2bab65f6b0f87ab234aa0f253f9f55f4df.zip
chromium_src-31c31b2bab65f6b0f87ab234aa0f253f9f55f4df.tar.gz
chromium_src-31c31b2bab65f6b0f87ab234aa0f253f9f55f4df.tar.bz2
Revert 102978 - Change X11 error handler override to allow easy X11 error checking.
BUG=None TEST=None Review URL: http://codereview.chromium.org/7889040 TBR=dominich@chromium.org Review URL: http://codereview.chromium.org/8052015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/DEPS2
-rw-r--r--gpu/command_buffer/common/gl_mock.h6
-rw-r--r--gpu/command_buffer/service/buffer_manager_unittest.cc8
-rw-r--r--gpu/command_buffer/service/framebuffer_manager_unittest.cc11
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc11
-rw-r--r--gpu/command_buffer/service/id_manager_unittest.cc10
-rw-r--r--gpu/command_buffer/service/program_manager_unittest.cc7
-rw-r--r--gpu/command_buffer/service/renderbuffer_manager_unittest.cc9
-rw-r--r--gpu/command_buffer/service/shader_manager_unittest.cc8
-rw-r--r--gpu/command_buffer/service/texture_manager_unittest.cc8
-rw-r--r--gpu/command_buffer/service/vertex_attrib_manager_unittest.cc8
11 files changed, 27 insertions, 61 deletions
diff --git a/gpu/DEPS b/gpu/DEPS
index 5c266a4..b357d81 100644
--- a/gpu/DEPS
+++ b/gpu/DEPS
@@ -8,8 +8,6 @@ include_rules = [
"+../GLES2",
"+../service",
- # For ui::CheckFailOnReportedX11Error
- "+ui/base",
# For gfx::PluginWindowHandle
"+ui/gfx",
]
diff --git a/gpu/command_buffer/common/gl_mock.h b/gpu/command_buffer/common/gl_mock.h
index 29fb000..4c5c114 100644
--- a/gpu/command_buffer/common/gl_mock.h
+++ b/gpu/command_buffer/common/gl_mock.h
@@ -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 @@ class MockGLInterface : public GLInterface {
} // namespace gfx
#endif // GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
+
diff --git a/gpu/command_buffer/service/buffer_manager_unittest.cc b/gpu/command_buffer/service/buffer_manager_unittest.cc
index 8cd095dc..1e4258b 100644
--- a/gpu/command_buffer/service/buffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/buffer_manager_unittest.cc
@@ -2,13 +2,9 @@
// 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/buffer_manager.h"
#include "gpu/command_buffer/common/gl_mock.h"
+#include "testing/gtest/include/gtest/gtest.h"
namespace gpu {
namespace gles2 {
@@ -227,3 +223,5 @@ TEST_F(BufferManagerTest, GetMaxValueForRangeUint32) {
} // namespace gles2
} // namespace gpu
+
+
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
index 7bd4872..77c6622 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -2,15 +2,12 @@
// 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/common/gl_mock.h"
#include "gpu/command_buffer/service/framebuffer_manager.h"
#include "gpu/command_buffer/service/feature_info.h"
+#include "gpu/command_buffer/common/gl_mock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
namespace gpu {
namespace gles2 {
@@ -367,3 +364,5 @@ TEST_F(FramebufferInfoTest, AttachTexture) {
} // namespace gles2
} // namespace gpu
+
+
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 82b16de..d6c513e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -15,7 +15,6 @@
#include "base/atomicops.h"
#include "base/at_exit.h"
#include "base/callback.h"
-#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
@@ -41,13 +40,6 @@
#include "ui/gfx/gl/gl_implementation.h"
#include "ui/gfx/gl/gl_surface.h"
-#if defined(USE_X11)
-#include "ui/base/x/x11_util_internal.h"
-#define CHECK_X_ERROR() ui::CheckForReportedX11Error()
-#else // USE_X11
-#define CHECK_X_ERROR() void(0)
-#endif // USE_X11
-
#if !defined(GL_DEPTH24_STENCIL8)
#define GL_DEPTH24_STENCIL8 0x88F0
#endif
@@ -1740,8 +1732,6 @@ bool GLES2DecoderImpl::Initialize(
// Take ownership of the GLContext.
context_ = context;
- CHECK_X_ERROR();
-
if (!MakeCurrent()) {
LOG(ERROR) << "GLES2DecoderImpl::Initialize failed because "
<< "MakeCurrent failed.";
@@ -1756,7 +1746,6 @@ bool GLES2DecoderImpl::Initialize(
return false;
}
- CHECK_X_ERROR();
CHECK_GL_ERROR();
disallowed_features_ = disallowed_features;
diff --git a/gpu/command_buffer/service/id_manager_unittest.cc b/gpu/command_buffer/service/id_manager_unittest.cc
index 7f7e676..015a442 100644
--- a/gpu/command_buffer/service/id_manager_unittest.cc
+++ b/gpu/command_buffer/service/id_manager_unittest.cc
@@ -1,13 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// 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/id_manager.h"
+#include "testing/gtest/include/gtest/gtest.h"
namespace gpu {
namespace gles2 {
@@ -76,3 +72,5 @@ TEST_F(IdManagerTest, Basic) {
} // namespace gles2
} // namespace gpu
+
+
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index b5f7cc3..c58cda1 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -2,11 +2,6 @@
// 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/program_manager.h"
#include <algorithm>
@@ -905,3 +900,5 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoGetProgramInfo) {
} // namespace gles2
} // namespace gpu
+
+
diff --git a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
index c12e451..c68b599 100644
--- a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc
@@ -1,12 +1,7 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// 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/renderbuffer_manager.h"
#include "gpu/command_buffer/common/gl_mock.h"
@@ -122,3 +117,5 @@ TEST_F(RenderbufferManagerTest, RenderbufferInfo) {
} // namespace gles2
} // namespace gpu
+
+
diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc
index 2aed8d9..23590b78 100644
--- a/gpu/command_buffer/service/shader_manager_unittest.cc
+++ b/gpu/command_buffer/service/shader_manager_unittest.cc
@@ -2,16 +2,12 @@
// 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/shader_manager.h"
#include "base/memory/scoped_ptr.h"
#include "gpu/command_buffer/common/gl_mock.h"
#include "gpu/command_buffer/service/mocks.h"
+#include "testing/gtest/include/gtest/gtest.h"
using ::testing::Return;
using ::testing::ReturnRef;
@@ -246,3 +242,5 @@ TEST_F(ShaderManagerTest, ShaderInfoUseCount) {
} // namespace gles2
} // namespace gpu
+
+
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index fe0392b..cf33e72 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -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 @@ TEST_F(TextureInfoTest, EGLImageExternal) {
} // namespace gles2
} // namespace gpu
+
+
diff --git a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
index fb5e26c..49c1883 100644
--- a/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
+++ b/gpu/command_buffer/service/vertex_attrib_manager_unittest.cc
@@ -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/vertex_attrib_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::_;
@@ -180,3 +176,5 @@ TEST_F(VertexAttribManagerTest, CanAccess) {
} // namespace gles2
} // namespace gpu
+
+