summaryrefslogtreecommitdiffstats
path: root/android_webview/public
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-09 11:31:17 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-09 11:31:17 +0000
commita978921b65ea85602254880f33b59175a5543fae (patch)
tree58e65152dfbe8979d76623781218a094783e1ee5 /android_webview/public
parent927a9d67ceaddc3811fdeb4e25622aae59819f0b (diff)
downloadchromium_src-a978921b65ea85602254880f33b59175a5543fae.zip
chromium_src-a978921b65ea85602254880f33b59175a5543fae.tar.gz
chromium_src-a978921b65ea85602254880f33b59175a5543fae.tar.bz2
Rename GLDraw to DrawGL.
We were using both before and it was getting confusing. Also removed unneeded kStatusMaskDrew BUG= Review URL: https://codereview.chromium.org/11293166 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/public')
-rw-r--r--android_webview/public/browser/draw_gl.h (renamed from android_webview/public/browser/gl_draw.h)17
1 files changed, 8 insertions, 9 deletions
diff --git a/android_webview/public/browser/gl_draw.h b/android_webview/public/browser/draw_gl.h
index 15447aa..75a3a61 100644
--- a/android_webview/public/browser/gl_draw.h
+++ b/android_webview/public/browser/draw_gl.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ANDROID_WEBVIEW_PUBLIC_BROWSER_GL_DRAW_H_
-#define ANDROID_WEBVIEW_PUBLIC_BROWSER_GL_DRAW_H_
+#ifndef ANDROID_WEBVIEW_PUBLIC_BROWSER_DRAW_GL_H_
+#define ANDROID_WEBVIEW_PUBLIC_BROWSER_DRAW_GL_H_
#ifdef __cplusplus
extern "C" {
#endif
// Holds the information required to trigger an OpenGL drawing operation.
-struct AwGLDrawInfo {
+struct AwDrawGLInfo {
// Input: Tells the Draw function what action to perform.
enum Mode {
kModeDraw,
@@ -38,7 +38,6 @@ struct AwGLDrawInfo {
kStatusMaskDone = 0x0,
kStatusMaskDraw = 0x1,
kStatusMaskInvoke = 0x2,
- kStatusMaskDrew = 0x4,
} status_mask;
// Output: dirty region to redraw.
@@ -49,17 +48,17 @@ struct AwGLDrawInfo {
};
// Function to invoke a direct GL draw into the client's pre-configured
-// GL context. Obtained via AwContents.getGLDrawFunction() (static).
+// GL context. Obtained via AwContents.getDrawGLFunction() (static).
// |view_context| is an opaque identifier that was returned by the corresponding
-// call to AwContents.getAwGLDrawViewContext().
+// call to AwContents.getAwDrawGLViewContext().
// |draw_info| carries the in and out parameters for this draw.
// |spare| ignored; pass NULL.
-typedef void (AwGLDrawFunction)(int view_context,
- AwGLDrawInfo* draw_info,
+typedef void (AwDrawGLFunction)(int view_context,
+ AwDrawGLInfo* draw_info,
void* spare);
#ifdef __cplusplus
} // extern "C"
#endif
-#endif // ANDROID_WEBVIEW_PUBLIC_BROWSER_GL_DRAW_H_
+#endif // ANDROID_WEBVIEW_PUBLIC_BROWSER_DRAW_GL_H_