diff options
| author | tfarina <tfarina@chromium.org> | 2014-12-19 21:42:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-20 05:42:46 +0000 |
| commit | 13f5f5e58cf2b2bf9a5ad9918a37294d38bb2c4c (patch) | |
| tree | d3306342ce4733c4edf5a75ddd5b0d7584d768a6 /android_webview | |
| parent | 9a5f241dcf8825d10ac1f43bda60ddd17760f044 (diff) | |
| download | chromium_src-13f5f5e58cf2b2bf9a5ad9918a37294d38bb2c4c.zip chromium_src-13f5f5e58cf2b2bf9a5ad9918a37294d38bb2c4c.tar.gz chromium_src-13f5f5e58cf2b2bf9a5ad9918a37294d38bb2c4c.tar.bz2 | |
Reland the patch to move WebGraphicsContext3DImpl out of webkit/.
BUG=338338
TEST=
R=jamesr@chromium.org,piman@chromium.org
TBR=torne@chromium.org
Review URL: https://codereview.chromium.org/810273004
Cr-Commit-Position: refs/heads/master@{#309341}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/android_webview.gyp | 1 | ||||
| -rw-r--r-- | android_webview/browser/hardware_renderer.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index b40976b..3f91264 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -108,6 +108,7 @@ '../components/components.gyp:web_contents_delegate_android', '../content/content.gyp:content_app_both', '../content/content.gyp:content_browser', + '../gpu/blink/gpu_blink.gyp:gpu_blink', '../gpu/command_buffer/command_buffer.gyp:gles2_utils', '../gpu/gpu.gyp:command_buffer_service', '../gpu/gpu.gyp:gles2_implementation', diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc index 1449541..1a6b170 100644 --- a/android_webview/browser/hardware_renderer.cc +++ b/android_webview/browser/hardware_renderer.cc @@ -34,8 +34,8 @@ namespace android_webview { namespace { +using gpu_blink::WebGraphicsContext3DImpl; using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; -using webkit::gpu::WebGraphicsContext3DImpl; scoped_refptr<cc::ContextProvider> CreateContext( scoped_refptr<gfx::GLSurface> surface, |