diff options
author | boliu <boliu@chromium.org> | 2014-12-08 16:31:28 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-09 00:31:50 +0000 |
commit | 6a7f826357db40b6a0343acfb8dd9001a6511a6d (patch) | |
tree | fa8a0575f31d354778551078ab8fdaefa01f0e92 /android_webview/browser/browser_view_renderer.h | |
parent | 6b45094444c528b4e72308ed524e2b7c34b7c2da (diff) | |
download | chromium_src-6a7f826357db40b6a0343acfb8dd9001a6511a6d.zip chromium_src-6a7f826357db40b6a0343acfb8dd9001a6511a6d.tar.gz chromium_src-6a7f826357db40b6a0343acfb8dd9001a6511a6d.tar.bz2 |
aw: More clean ups for testing
Have BVR return a pointer to SharedRendererState and do the reinterpret
case in AwContents.
Update ScopedAppGLStateRestore to handle null binding where
most calls are no-op and returns null.
BUG=418346
Review URL: https://codereview.chromium.org/735013006
Cr-Commit-Position: refs/heads/master@{#307387}
Diffstat (limited to 'android_webview/browser/browser_view_renderer.h')
-rw-r--r-- | android_webview/browser/browser_view_renderer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h index fbe4ac6..e1388a5 100644 --- a/android_webview/browser/browser_view_renderer.h +++ b/android_webview/browser/browser_view_renderer.h @@ -34,7 +34,7 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient { virtual ~BrowserViewRenderer(); - intptr_t GetAwDrawGLViewContext(); + SharedRendererState* GetAwDrawGLViewContext(); bool RequestDrawGL(bool wait_for_completion); // Called before either OnDrawHardware or OnDrawSoftware to set the view |