summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/GLUtils.h
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-04-03 16:12:40 -0700
committerChris Craik <ccraik@google.com>2012-04-04 13:11:49 -0700
commit594c6b805969c2673c84d1d1d1a3556ce376ac7a (patch)
treec79b67f77a4327de8c68a89c569a1dd0a4824da5 /Source/WebCore/platform/graphics/android/GLUtils.h
parent4b0fde0e790db3b3f5a7a84fc77dc994f0a123c2 (diff)
downloadexternal_webkit-594c6b805969c2673c84d1d1d1a3556ce376ac7a.zip
external_webkit-594c6b805969c2673c84d1d1d1a3556ce376ac7a.tar.gz
external_webkit-594c6b805969c2673c84d1d1d1a3556ce376ac7a.tar.bz2
Rename several classes
BaseTile,BaseTileTexture -> Tile,TileTexture Used in layers other than the base LayerGroup -> Surface Renamed to convey that it is a member of the SurfaceCollection, and that the layers grouped inside are painted together (if at all) DualTiledTexture -> SurfaceBacking Better conveys that this is the raster backing for a surface that can paint. It may be implemented with two tiled textures for now, but that isn't as important as its relationship to the surface. TiledTexture -> TileGrid Renamed to make it more clear that it was a container of tiles, and to be less similar to TileTexture Change-Id: I843f8603a2080cfe5a7313ba1c2eff10620f8aa2
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLUtils.h')
-rw-r--r--Source/WebCore/platform/graphics/android/GLUtils.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLUtils.h b/Source/WebCore/platform/graphics/android/GLUtils.h
index f24ea0d..d4a2e84 100644
--- a/Source/WebCore/platform/graphics/android/GLUtils.h
+++ b/Source/WebCore/platform/graphics/android/GLUtils.h
@@ -31,8 +31,6 @@
#include "Color.h"
#include "SkBitmap.h"
#include "SkMatrix.h"
-#include "SkSize.h"
-#include "TextureInfo.h"
#include "TransformationMatrix.h"
#include <EGL/egl.h>
#include <EGL/eglext.h>
@@ -47,6 +45,8 @@ class SurfaceTexture;
namespace WebCore {
+class TileRenderInfo;
+
class GLUtils {
public:
@@ -71,7 +71,7 @@ public:
static void deleteTexture(GLuint* texture);
static GLuint createSampleColorTexture(int r, int g, int b);
static GLuint createSampleTexture();
- static GLuint createBaseTileGLTexture(int width, int height);
+ static GLuint createTileGLTexture(int width, int height);
static void createTextureWithBitmap(GLuint texture, const SkBitmap& bitmap, GLint filter = GL_LINEAR);
static void updateTextureWithBitmap(GLuint texture, const SkBitmap& bitmap, const IntRect&, GLint filter = GL_LINEAR);