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

Unified Diff: content/browser/compositor/surface_utils.cc

Issue 2932893002: BrowserMainLoop owns FrameSinkManagerHost (Closed)
Patch Set: Added a comment that works everywhere Created 3 years, 6 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/compositor/surface_utils.cc
diff --git a/content/browser/compositor/surface_utils.cc b/content/browser/compositor/surface_utils.cc
index 4fb995a555ff3182ed6a4a7115567051310d5ccc..42934aed12f8bbc88ca537c6762b2ce33d7e78b8 100644
--- a/content/browser/compositor/surface_utils.cc
+++ b/content/browser/compositor/surface_utils.cc
@@ -12,6 +12,7 @@
#include "cc/resources/single_release_callback.h"
#include "components/viz/display_compositor/gl_helper.h"
#include "components/viz/host/frame_sink_manager_host.h"
+#include "content/browser/browser_main_loop.h"
#include "skia/ext/image_operations.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColorFilter.h"
@@ -177,10 +178,7 @@ viz::FrameSinkManagerHost* GetFrameSinkManagerHost() {
#if defined(OS_ANDROID)
return CompositorImpl::GetFrameSinkManagerHost();
#else
- ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
- if (!factory)
- return nullptr;
- return factory->GetContextFactoryPrivate()->GetFrameSinkManagerHost();
+ return BrowserMainLoop::GetInstance()->frame_sink_manager_host();
#endif
}

Powered by Google App Engine
This is Rietveld 408576698