diff options
author | dongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 19:48:41 +0000 |
---|---|---|
committer | dongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 19:50:31 +0000 |
commit | 807567a6e3b472ac30f5501156090e7ecc7edd7f (patch) | |
tree | e740119f3d934ba99fc5f44bb5ccb85d279b4cec /content/renderer/render_thread_impl.h | |
parent | 8ed8bf43124192671eaf134d014f148a9dd12bea (diff) | |
download | chromium_src-807567a6e3b472ac30f5501156090e7ecc7edd7f.zip chromium_src-807567a6e3b472ac30f5501156090e7ecc7edd7f.tar.gz chromium_src-807567a6e3b472ac30f5501156090e7ecc7edd7f.tar.bz2 |
Unify shared main thread context provider code among Clank, Android WebView and other platforms.
Android WebView manages shared main thread context provider in
SynchronousCompositorFactory, while others manage it in RenderThreadImpl.
This CL unifies all code in RenderThreadImpl.
In addition, there is slight logic change in Android WebView. Currently Android
WebView doesn't bind the context to the main thread when the context exists,
while others always bind it to the main thread. It could cause a strange bug, and
this CL fixes the potential bug.
BUG=N/A
Review URL: https://codereview.chromium.org/449793002
Cr-Commit-Position: refs/heads/master@{#288769}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread_impl.h')
-rw-r--r-- | content/renderer/render_thread_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 421850e..012e2a2 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -538,7 +538,8 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, scoped_ptr<InputHandlerManager> input_handler_manager_; scoped_refptr<IPC::ForwardingMessageFilter> compositor_output_surface_filter_; - scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; + scoped_refptr<webkit::gpu::ContextProviderWebContext> + shared_main_thread_contexts_; ObserverList<RenderProcessObserver> observers_; |