Chromium Code Reviews| Index: content/browser/browser_main_loop.cc |
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
| index 14a90b273fdaed520ab4755a6641fc37a4ffe0fb..6bd11740edc6c25990ed0d6ddeb0022da26b370b 100644 |
| --- a/content/browser/browser_main_loop.cc |
| +++ b/content/browser/browser_main_loop.cc |
| @@ -110,6 +110,7 @@ |
| #include "content/browser/android/browser_surface_texture_manager.h" |
| #include "content/browser/android/tracing_controller_android.h" |
| #include "content/browser/media/android/browser_media_player_manager.h" |
| +#include "content/browser/renderer_host/context_provider_factory_impl_android.h" |
| #include "content/browser/screen_orientation/screen_orientation_delegate_android.h" |
| #include "content/public/browser/screen_orientation_provider.h" |
| #include "gpu/ipc/client/android/in_process_surface_texture_manager.h" |
| @@ -1233,6 +1234,8 @@ int BrowserMainLoop::BrowserThreadsStarted() { |
| established_gpu_channel = false; |
| always_uses_gpu = ShouldStartGpuProcessOnBrowserStartup(); |
| BrowserGpuChannelHostFactory::Initialize(established_gpu_channel); |
| + ui::ContextProviderFactory::SetInstance( |
| + ContextProviderFactoryImpl::GetInstance()); |
|
no sievers
2016/08/02 20:44:33
still leaking. (i'm not worried about a normal app
Khushal
2016/08/02 22:22:15
Resetting it on shutdown. Is that better?
|
| #elif defined(USE_AURA) || defined(OS_MACOSX) |
| established_gpu_channel = true; |
| if (!GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor() || |