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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2285593002: Add ScopedSurfaceRequestManager (Closed)
Patch Set: Added RunUntilIdle() to 2 UTs Created 4 years, 3 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 4a34f1ab8713fa7c4868ca62be2f2b11ffa25f79..1653f807f9e31fae43e845026731c9dd72933754 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -107,6 +107,7 @@
#include "components/tracing/common/graphics_memory_dump_provider_android.h"
#include "content/browser/android/browser_startup_controller.h"
#include "content/browser/android/browser_surface_texture_manager.h"
+#include "content/browser/android/scoped_surface_request_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"
@@ -628,6 +629,8 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
gpu::SurfaceTextureManager::SetInstance(
gpu::InProcessSurfaceTextureManager::GetInstance());
+ gpu::ScopedSurfaceRequestConduit::SetInstance(
+ ScopedSurfaceRequestManager::GetInstance());
} else {
gpu::SurfaceTextureManager::SetInstance(
BrowserSurfaceTextureManager::GetInstance());

Powered by Google App Engine
This is Rietveld 408576698