diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 14:20:43 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 14:20:43 +0000 |
| commit | 9cdd71579d57869f215155a772aa5f15c27df48c (patch) | |
| tree | fe0ee59411c779a52485a5bade355c6db92c7846 /content/renderer/render_view_impl.cc | |
| parent | 7943f0d7b4f0b2866905c64f78d21651caab4a25 (diff) | |
| download | chromium_src-9cdd71579d57869f215155a772aa5f15c27df48c.zip chromium_src-9cdd71579d57869f215155a772aa5f15c27df48c.tar.gz chromium_src-9cdd71579d57869f215155a772aa5f15c27df48c.tar.bz2 | |
Use ContextProvider subclass to provide WGC3D pointers
Some cc::ContextProvider instances will also need to provide WebGraphicsContext3D*
interfaces to the underlying GL context, but not all. This adds a subclass of ContextProvider
in content:: to use for these users. The compositor itself doesn't need the WGC3D
accessor so it just uses the base class.
BUG=181120
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=244383
Review URL: https://codereview.chromium.org/126093010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244697 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.cc')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 47c30fb..14b9722 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -5911,7 +5911,7 @@ WebMediaPlayer* RenderViewImpl::CreateAndroidWebMediaPlayer( SynchronousCompositorFactory::GetInstance(); stream_texture_factory = factory->CreateStreamTextureFactory(routing_id_); } else { - scoped_refptr<cc::ContextProvider> context_provider = + scoped_refptr<webkit::gpu::ContextProviderWebContext> context_provider = RenderThreadImpl::current()->SharedMainThreadContextProvider(); if (!context_provider.get()) { @@ -5920,7 +5920,7 @@ WebMediaPlayer* RenderViewImpl::CreateAndroidWebMediaPlayer( } stream_texture_factory.reset(new StreamTextureFactoryImpl( - context_provider->Context3d(), gpu_channel_host, routing_id_)); + context_provider->WebContext3D(), gpu_channel_host, routing_id_)); } scoped_ptr<WebMediaPlayerAndroid> web_media_player_android( |