diff options
| author | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 23:03:51 +0000 |
|---|---|---|
| committer | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 23:03:51 +0000 |
| commit | 02830cac49ac96f0c9dd8c018fb888462127cec9 (patch) | |
| tree | 68757e8d4d42eae4d348910e4174cd9759be5b6a /android_webview | |
| parent | 78f8b3d0181da1e27671a026228300a8641b7a10 (diff) | |
| download | chromium_src-02830cac49ac96f0c9dd8c018fb888462127cec9.zip chromium_src-02830cac49ac96f0c9dd8c018fb888462127cec9.tar.gz chromium_src-02830cac49ac96f0c9dd8c018fb888462127cec9.tar.bz2 | |
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
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/DEPS | 2 | ||||
| -rw-r--r-- | android_webview/browser/gpu_memory_buffer_impl.cc | 6 |
2 files changed, 5 insertions, 3 deletions
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 |