Index: ui/gl/gl_helper.h |
diff --git a/ui/gl/test/gl_test_helper.h b/ui/gl/gl_helper.h |
similarity index 57% |
copy from ui/gl/test/gl_test_helper.h |
copy to ui/gl/gl_helper.h |
index f566525cb25cf6d35b9de951ac3d7185100716c5..506e84d6ce26a0d093cedfbdfd494b5c1a79a54a 100644 |
--- a/ui/gl/test/gl_test_helper.h |
+++ b/ui/gl/gl_helper.h |
@@ -2,20 +2,16 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef UI_GL_TEST_GL_TEST_HELPER_H_ |
-#define UI_GL_TEST_GL_TEST_HELPER_H_ |
+#ifndef UI_GL_GL_HELPER_H_ |
+#define UI_GL_GL_HELPER_H_ |
#include "base/basictypes.h" |
#include "ui/gl/gl_bindings.h" |
namespace gfx { |
-class GLTestHelper { |
+class GL_EXPORT GLHelper { |
public: |
- // Creates a texture object. |
- // Does not check for errors, always returns texture. |
- static GLuint CreateTexture(GLenum target); |
- |
// Compiles a shader. |
// Does not check for errors, always returns shader. |
static GLuint CompileShader(GLenum type, const char* src); |
@@ -31,19 +27,8 @@ class GLTestHelper { |
// Attaches 2 shaders, links them to a program, and checks for errors. |
// Returns program, 0 on failure. |
static GLuint SetupProgram(GLuint vertex_shader, GLuint fragment_shader); |
- |
- // Creates a framebuffer, attaches a color buffer, and checks for errors. |
- // Returns framebuffer, 0 on failure. |
- static GLuint SetupFramebuffer(int width, int height); |
- |
- // Checks an area of pixels for a color. |
- static bool CheckPixels(GLint x, |
- GLint y, |
- GLsizei width, |
- GLsizei height, |
- const uint8_t expected_color[4]); |
}; |
} // namespace gfx |
-#endif // UI_GL_TEST_GL_TEST_HELPER_H_ |
+#endif // UI_GL_GL_HELPER_H_ |