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

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 1838853005: android: Remove in-process sync compositor code path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_in_proc_video
Patch Set: rebase Created 4 years, 8 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
« no previous file with comments | « content/renderer/android/synchronous_compositor_factory.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 1204f2b559d7eff9dc2d4a900cb9c4d009aa6642..fe5ff02a259a774d517e662881a2db9fb42af9c8 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -44,6 +44,7 @@
#include "content/common/content_switches_internal.h"
#include "content/common/gpu/client/context_provider_command_buffer.h"
#include "content/common/input/input_event_utils.h"
+#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
#include "content/renderer/gpu/render_widget_compositor_delegate.h"
#include "content/renderer/input/input_handler_manager.h"
@@ -60,7 +61,6 @@
#if defined(OS_ANDROID)
#include "base/android/build_info.h"
-#include "content/renderer/android/synchronous_compositor_factory.h"
#include "ui/gfx/android/device_display_info.h"
#endif
@@ -368,11 +368,8 @@ void RenderWidgetCompositor::Initialize(float device_scale_factor) {
}
#if defined(OS_ANDROID)
- DCHECK(!SynchronousCompositorFactory::GetInstance() ||
- !cmd->HasSwitch(switches::kIPCSyncCompositing));
bool using_synchronous_compositor =
- SynchronousCompositorFactory::GetInstance() ||
- cmd->HasSwitch(switches::kIPCSyncCompositing);
+ GetContentClient()->UsingSynchronousCompositing();
// We can't use GPU rasterization on low-end devices, because the Ganesh
// cache would consume too much memory.
« no previous file with comments | « content/renderer/android/synchronous_compositor_factory.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698