summaryrefslogtreecommitdiffstats
path: root/webkit/gpu
diff options
context:
space:
mode:
authormmocny@chromium.org <mmocny@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-21 03:22:22 +0000
committermmocny@chromium.org <mmocny@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-21 03:22:22 +0000
commitc537090136d23d0064488c27de3bb2ba0f1ac120 (patch)
treefef63a643ab2518e8ed4e6f4be41c8310e6a5751 /webkit/gpu
parent7ba65591ec4ae167980feea4341de827f8982fb0 (diff)
downloadchromium_src-c537090136d23d0064488c27de3bb2ba0f1ac120.zip
chromium_src-c537090136d23d0064488c27de3bb2ba0f1ac120.tar.gz
chromium_src-c537090136d23d0064488c27de3bb2ba0f1ac120.tar.bz2
This is the glue that binds the GpuMemoryManager and the WebKit WebGraphicsContext3D GL_CHROMIUM_gpu_memory_manager extension.
Depends on: 1. https://chromiumcodereview.appspot.com/9289052/ 2. https://bugs.webkit.org/show_bug.cgi?id=77155 TBR=backer BUG=114234 TEST=GpuMemoryManager unittests updated Review URL: https://chromiumcodereview.appspot.com/9234072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122787 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h3
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
index cd23e42..d3e0641 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
@@ -425,6 +425,9 @@ class WebGraphicsContext3DInProcessCommandBufferImpl
virtual void setVisibilityCHROMIUM(bool visible);
+ virtual void setMemoryAllocationChangedCallbackCHROMIUM(
+ WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* callback) { }
+
virtual void copyTextureToParentTextureCHROMIUM(
WebGLId texture, WebGLId parentTexture);
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
index a89cacc..574ced0 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
@@ -109,6 +109,9 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D {
virtual void setVisibilityCHROMIUM(bool visible);
+ virtual void setMemoryAllocationChangedCallbackCHROMIUM(
+ WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* callback) { }
+
virtual void copyTextureToParentTextureCHROMIUM(
WebGLId texture, WebGLId parentTexture);