diff options
author | Nicolas Roard <nicolas@android.com> | 2010-12-08 11:37:30 -0800 |
---|---|---|
committer | Nicolas Roard <nicolas@android.com> | 2010-12-16 13:41:16 -0800 |
commit | 8c3b4386c279f644e5e9d2c5769fe5a43c6cd0ca (patch) | |
tree | 91dbe20f39c9e0235f2f4f2e3fbf3b01430e7fe9 /WebCore/platform/graphics/android/GLUtils.h | |
parent | 211482b53e73a386e2aabb0d3acb92e0e7ea22d4 (diff) | |
download | external_webkit-8c3b4386c279f644e5e9d2c5769fe5a43c6cd0ca.zip external_webkit-8c3b4386c279f644e5e9d2c5769fe5a43c6cd0ca.tar.gz external_webkit-8c3b4386c279f644e5e9d2c5769fe5a43c6cd0ca.tar.bz2 |
Cleanup pass to make files compliant with webkit style
Change-Id: I9234be0c1559d5cc11af73ebd8cc14f98f6a4c2e
Diffstat (limited to 'WebCore/platform/graphics/android/GLUtils.h')
-rw-r--r-- | WebCore/platform/graphics/android/GLUtils.h | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/WebCore/platform/graphics/android/GLUtils.h b/WebCore/platform/graphics/android/GLUtils.h index 1b2e823..3e7b800 100644 --- a/WebCore/platform/graphics/android/GLUtils.h +++ b/WebCore/platform/graphics/android/GLUtils.h @@ -23,50 +23,50 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef GLUTILS_H_ -#define GLUTILS_H_ +#ifndef GLUtils_h +#define GLUtils_h #if USE(ACCELERATED_COMPOSITING) -#include <GLES2/gl2.h> -#include <GLES2/gl2ext.h> -#include <EGL/egl.h> -#include <EGL/eglext.h> #include "SkBitmap.h" #include "SkMatrix.h" #include "TransformationMatrix.h" +#include <EGL/egl.h> +#include <EGL/eglext.h> +#include <GLES2/gl2.h> +#include <GLES2/gl2ext.h> namespace WebCore { class GLUtils { public: - // Matrix utilities - static void toGLMatrix(GLfloat* flattened, const TransformationMatrix& matrix); - static void toSkMatrix(SkMatrix& skmatrix, const TransformationMatrix& matrix); - static void setOrthographicMatrix(TransformationMatrix& ortho, float left, float top, - float right, float bottom, float nearZ, float farZ); + // Matrix utilities + static void toGLMatrix(GLfloat* flattened, const TransformationMatrix& matrix); + static void toSkMatrix(SkMatrix& skmatrix, const TransformationMatrix& matrix); + static void setOrthographicMatrix(TransformationMatrix& ortho, float left, float top, + float right, float bottom, float nearZ, float farZ); - // GL & EGL error checks - static void checkEglError(const char* op, EGLBoolean returnVal = EGL_TRUE); - static bool checkGlErrorOn(void* p, const char* op); - static bool checkGlError(const char* op); + // GL & EGL error checks + static void checkEglError(const char* op, EGLBoolean returnVal = EGL_TRUE); + static bool checkGlErrorOn(void* p, const char* op); + static bool checkGlError(const char* op); - // GL & EGL extension checks - static bool isEGLImageSupported(); - static bool isEGLFenceSyncSupported(); + // GL & EGL extension checks + static bool isEGLImageSupported(); + static bool isEGLFenceSyncSupported(); - // Texture utilities - static EGLContext createBackgroundContext(EGLContext sharedContext); - static void deleteTexture(GLuint* texture); - static GLuint createSampleTexture(); - static void createTextureWithBitmap(GLuint texture, SkBitmap& bitmap, GLint filter = GL_LINEAR); - static void updateTextureWithBitmap(GLuint texture, SkBitmap& bitmap, GLint filter = GL_LINEAR); - static void createEGLImageFromTexture(GLuint texture, EGLImageKHR* image); - static void createTextureFromEGLImage(GLuint texture, EGLImageKHR image, GLint filter = GL_LINEAR); + // Texture utilities + static EGLContext createBackgroundContext(EGLContext sharedContext); + static void deleteTexture(GLuint* texture); + static GLuint createSampleTexture(); + static void createTextureWithBitmap(GLuint texture, SkBitmap& bitmap, GLint filter = GL_LINEAR); + static void updateTextureWithBitmap(GLuint texture, SkBitmap& bitmap, GLint filter = GL_LINEAR); + static void createEGLImageFromTexture(GLuint texture, EGLImageKHR* image); + static void createTextureFromEGLImage(GLuint texture, EGLImageKHR image, GLint filter = GL_LINEAR); }; } // namespace WebCore #endif // USE(ACCELERATED_COMPOSITING) -#endif // GLUTILS_H_ +#endif // GLUtils_h |