diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 01:05:16 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 01:05:16 +0000 |
| commit | bf732afbac0c44afeaefa931adfed359172aca5b (patch) | |
| tree | 808410c82c1838a3494012162d8c8d6ab0a5e23a /webkit/gpu | |
| parent | 295e5cda96aa124dc3faf62acdcda1be40dcb465 (diff) | |
| download | chromium_src-bf732afbac0c44afeaefa931adfed359172aca5b.zip chromium_src-bf732afbac0c44afeaefa931adfed359172aca5b.tar.gz chromium_src-bf732afbac0c44afeaefa931adfed359172aca5b.tar.bz2 | |
Expose EXT_debug_marker to webkit
BUG=141700
R=apatrick@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10828328
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 12 | ||||
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 291ecb4..e766332 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -1625,6 +1625,18 @@ DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT, DELEGATE_TO_GL_5(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum, WGC3Duint, WGC3Duint, WGC3Dint, WGC3Denum) +void WebGraphicsContext3DInProcessCommandBufferImpl::insertEventMarkerEXT( + const WGC3Dchar* marker) { + gl_->InsertEventMarkerEXT(0, marker); +} + +void WebGraphicsContext3DInProcessCommandBufferImpl::pushGroupMarkerEXT( + const WGC3Dchar* marker) { + gl_->PushGroupMarkerEXT(0, marker); +} + +DELEGATE_TO_GL(popGroupMarkerEXT, PopGroupMarkerEXT); + GrGLInterface* WebGraphicsContext3DInProcessCommandBufferImpl:: onCreateGrGLInterface() { return webkit_glue::CreateCommandBufferSkiaGLBinding(); diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h index 7c0c311..6dd92aa 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -490,6 +490,10 @@ class WebGraphicsContext3DInProcessCommandBufferImpl virtual void consumeTextureCHROMIUM(WGC3Denum target, const WGC3Dbyte* mailbox); + virtual void insertEventMarkerEXT(const WGC3Dchar* marker); + virtual void pushGroupMarkerEXT(const WGC3Dchar* marker); + virtual void popGroupMarkerEXT(); + protected: virtual GrGLInterface* onCreateGrGLInterface(); |