From 02830cac49ac96f0c9dd8c018fb888462127cec9 Mon Sep 17 00:00:00 2001 From: "kaanb@chromium.org" Date: Tue, 21 May 2013 23:03:51 +0000 Subject: Make GpuMemoryBufferFactory a function pointer rather than a callback. BUG=175012 Review URL: https://chromiumcodereview.appspot.com/15374002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201383 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/browser/DEPS | 2 ++ android_webview/browser/gpu_memory_buffer_impl.cc | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'android_webview') diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS index c32e861..58b826e 100644 --- a/android_webview/browser/DEPS +++ b/android_webview/browser/DEPS @@ -22,6 +22,8 @@ include_rules = [ "+ui/gfx", "+ui/gl", + "+webkit/gpu", + # Temporary until we bundle our own favicon. See # AwContentBrowserClient::GetDefaultFavicon "!grit/ui_resources.h", diff --git a/android_webview/browser/gpu_memory_buffer_impl.cc b/android_webview/browser/gpu_memory_buffer_impl.cc index 3cc103b..cb805c7 100644 --- a/android_webview/browser/gpu_memory_buffer_impl.cc +++ b/android_webview/browser/gpu_memory_buffer_impl.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/logging.h" #include "gpu/command_buffer/client/gpu_memory_buffer.h" -#include "gpu/command_buffer/client/gpu_memory_buffer_factory.h" #include "ui/gfx/size.h" +#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace android_webview { @@ -77,8 +77,8 @@ bool GpuMemoryBufferImpl::IsMapped() { void GpuMemoryBufferImpl::SetAwDrawGLFunctionTable( AwDrawGLFunctionTable* table) { g_gl_draw_functions = table; - gpu::gles2::SetProcessDefaultGpuMemoryBufferFactory( - base::Bind(&CreateGpuMemoryBuffer)); + ::webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl:: + SetGpuMemoryBufferCreator(&CreateGpuMemoryBuffer); } } // namespace android_webview -- cgit v1.1