Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(947)

Unified Diff: content/browser/browser_main_loop.cc

Issue 2285593002: Add ScopedSurfaceRequestManager (Closed)
Patch Set: Fixed signed/unsigned in UTs Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 309e4eb4e5e5b5e14bfe5361916cab4e875f1020..bf338c95776249718238d342c14e9ac7577a0268 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -106,6 +106,7 @@
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
#include "components/tracing/common/graphics_memory_dump_provider_android.h"
+#include "content/browser/android/browser_scoped_surface_request_manager.h"
#include "content/browser/android/browser_startup_controller.h"
#include "content/browser/android/browser_surface_texture_manager.h"
#include "content/browser/android/tracing_controller_android.h"
@@ -634,6 +635,8 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
BrowserSurfaceTextureManager::GetInstance());
}
BrowserMediaPlayerManager::InitSurfaceTexturePeer();
+ gpu::ScopedSurfaceRequestManager::SetInstance(
+ BrowserScopedSurfaceRequestManager::GetInstance());
}
if (!parsed_command_line_.HasSwitch(

Powered by Google App Engine
This is Rietveld 408576698