| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 6bc0b1730d2b70f9b5edf028bfb920d3c22b31d7..263167cfe99ff954409983f77b1d4ac4ef705452 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -1534,24 +1534,11 @@ RenderThreadImpl::SharedMainThreadContextProvider() {
|
|
|
| #if defined(OS_ANDROID)
|
|
|
| -namespace {
|
| -base::LazyInstance<scoped_refptr<StreamTextureFactory>>
|
| - g_stream_texture_factory_override;
|
| -}
|
| -
|
| -// static
|
| -void RenderThreadImpl::SetStreamTextureFactory(
|
| - scoped_refptr<StreamTextureFactory> factory) {
|
| - g_stream_texture_factory_override.Get() = factory;
|
| -}
|
| -
|
| scoped_refptr<StreamTextureFactory> RenderThreadImpl::GetStreamTexureFactory() {
|
| DCHECK(IsMainThread());
|
| - if (g_stream_texture_factory_override.Get()) {
|
| - stream_texture_factory_ = g_stream_texture_factory_override.Get();
|
| - } else if (!stream_texture_factory_.get() ||
|
| - stream_texture_factory_->ContextGL()
|
| - ->GetGraphicsResetStatusKHR() != GL_NO_ERROR) {
|
| + if (!stream_texture_factory_.get() ||
|
| + stream_texture_factory_->ContextGL()->GetGraphicsResetStatusKHR() !=
|
| + GL_NO_ERROR) {
|
| if (!SharedMainThreadContextProvider().get()) {
|
| stream_texture_factory_ = NULL;
|
| return NULL;
|
| @@ -1570,8 +1557,7 @@ scoped_refptr<StreamTextureFactory> RenderThreadImpl::GetStreamTexureFactory() {
|
| }
|
|
|
| bool RenderThreadImpl::EnableStreamTextureCopy() {
|
| - return !g_stream_texture_factory_override.Get() &&
|
| - sync_compositor_message_filter_.get();
|
| + return sync_compositor_message_filter_.get();
|
| }
|
|
|
| #endif
|
|
|