diff options
Diffstat (limited to 'src/core/chromium_gpu_helper.h')
| -rw-r--r-- | src/core/chromium_gpu_helper.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/chromium_gpu_helper.h b/src/core/chromium_gpu_helper.h index 9954dc1d0..848a43c7e 100644 --- a/src/core/chromium_gpu_helper.h +++ b/src/core/chromium_gpu_helper.h @@ -50,11 +50,9 @@ class MessageLoop; namespace gpu { struct Mailbox; class SyncPointManager; -namespace gles2 { class MailboxManager; class TextureBase; } -} // These functions wrap code that needs to include headers that are // incompatible with Qt GL headers. @@ -63,10 +61,10 @@ class TextureBase; base::MessageLoop *gpu_message_loop(); gpu::SyncPointManager *sync_point_manager(); -gpu::gles2::MailboxManager *mailbox_manager(); +gpu::MailboxManager *mailbox_manager(); -gpu::gles2::TextureBase* ConsumeTexture(gpu::gles2::MailboxManager *mailboxManager, unsigned target, const gpu::Mailbox& mailbox); -unsigned int service_id(gpu::gles2::TextureBase *tex); +gpu::TextureBase* ConsumeTexture(gpu::MailboxManager *mailboxManager, unsigned target, const gpu::Mailbox& mailbox); +unsigned int service_id(gpu::TextureBase *tex); #ifdef Q_OS_QNX typedef void* EGLDisplay; @@ -79,7 +77,7 @@ struct EGLStreamData { EGLStreamData(): egl_display(NULL), egl_str_handle(NULL) {} }; -EGLStreamData eglstream_connect_consumer(gpu::gles2::Texture *tex); +EGLStreamData eglstream_connect_consumer(gpu::Texture *tex); #endif #endif // CHROMIUM_GPU_HELPER_H |