diff options
| author | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 05:00:37 +0000 |
|---|---|---|
| committer | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 05:00:37 +0000 |
| commit | e1e5f346318ce6f565cb0314f3e69a9a1018912d (patch) | |
| tree | 2be472b3855a2f19094864e48247fc2e4da2277f /android_webview | |
| parent | 295efba6b8ff371ac9a07b9be369c19a0c6e35d1 (diff) | |
| download | chromium_src-e1e5f346318ce6f565cb0314f3e69a9a1018912d.zip chromium_src-e1e5f346318ce6f565cb0314f3e69a9a1018912d.tar.gz chromium_src-e1e5f346318ce6f565cb0314f3e69a9a1018912d.tar.bz2 | |
android_webview: add an IsMapped API to the GpuMemoryBuffer
BUG=175012
Review URL: https://chromiumcodereview.appspot.com/13861039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/gpu_memory_buffer_impl.cc | 6 | ||||
| -rw-r--r-- | android_webview/browser/gpu_memory_buffer_impl.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/android_webview/browser/gpu_memory_buffer_impl.cc b/android_webview/browser/gpu_memory_buffer_impl.cc index dcd7345..561c7c9 100644 --- a/android_webview/browser/gpu_memory_buffer_impl.cc +++ b/android_webview/browser/gpu_memory_buffer_impl.cc @@ -33,7 +33,6 @@ GpuMemoryBufferImpl::~GpuMemoryBufferImpl() { void GpuMemoryBufferImpl::Map(gpu::GpuMemoryBuffer::AccessMode mode, void** vaddr) { DCHECK(buffer_id_ != 0); - DCHECK(!mapped_); int err = g_gl_draw_functions->lock(buffer_id_, mode, vaddr); DCHECK(err == 0); mapped_ = true; @@ -41,7 +40,6 @@ void GpuMemoryBufferImpl::Map(gpu::GpuMemoryBuffer::AccessMode mode, void GpuMemoryBufferImpl::Unmap() { DCHECK(buffer_id_ != 0); - DCHECK(mapped_); int err = g_gl_draw_functions->unlock(buffer_id_); DCHECK(err == 0); mapped_ = false; @@ -57,6 +55,10 @@ uint32 GpuMemoryBufferImpl::GetStride() { return g_gl_draw_functions->get_stride(buffer_id_); } +bool GpuMemoryBufferImpl::IsMapped() { + return mapped_; +} + // static void GpuMemoryBufferImpl::SetAwDrawGLFunctionTable( AwDrawGLFunctionTable* table) { diff --git a/android_webview/browser/gpu_memory_buffer_impl.h b/android_webview/browser/gpu_memory_buffer_impl.h index e584b7c..bbf73f4 100644 --- a/android_webview/browser/gpu_memory_buffer_impl.h +++ b/android_webview/browser/gpu_memory_buffer_impl.h @@ -24,6 +24,7 @@ class GpuMemoryBufferImpl : public gpu::GpuMemoryBuffer { virtual void Map(gpu::GpuMemoryBuffer::AccessMode mode, void** vaddr) OVERRIDE; virtual void Unmap() OVERRIDE; + virtual bool IsMapped() OVERRIDE; virtual void* GetNativeBuffer() OVERRIDE; virtual uint32 GetStride() OVERRIDE; |