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

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

Issue 2413063002: content/blimp: Set up hooks for enabling LTHRemote in the renderer. (Closed)
Patch Set: Rebase Created 4 years, 2 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/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 8e47d6f2f7ba52c8b42da49b5111cab7b6468e1b..b6e04dd255daa4e7e3ce9524698296c67e3628c5 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -25,6 +25,10 @@
#include "cc/animation/animation_timeline.h"
#include "cc/animation/layer_tree_mutator.h"
#include "cc/base/switches.h"
+#include "cc/blimp/engine_picture_cache.h"
+#include "cc/blimp/image_serialization_processor.h"
+#include "cc/blimp/layer_tree_host_remote.h"
+#include "cc/blimp/remote_compositor_bridge.h"
#include "cc/blink/web_layer_impl.h"
#include "cc/debug/layer_tree_debug_state.h"
#include "cc/debug/micro_benchmark.h"
@@ -46,6 +50,7 @@
#include "content/common/layer_tree_settings_factory.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
+#include "content/public/renderer/content_renderer_client.h"
#include "content/renderer/gpu/render_widget_compositor_delegate.h"
#include "content/renderer/input/input_handler_manager.h"
#include "gpu/command_buffer/client/gles2_interface.h"
@@ -232,6 +237,27 @@ void RenderWidgetCompositor::Initialize(float device_scale_factor) {
base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
cc::LayerTreeSettings settings =
GenerateLayerTreeSettings(*cmd, compositor_deps_, device_scale_factor);
+
+ if (cmd->HasSwitch(switches::kUseRemoteCompositing) &&
+ cmd->HasSwitch(switches::kUseLayerTreeHostRemote)) {
+ DCHECK(!threaded_);
Wez 2016/10/19 22:15:28 nit: Command-line switches come from outside the p
Khushal 2016/10/20 01:29:33 I'm not sure what you mean by mis-matched switches
+
+ cc::LayerTreeHostRemote::InitParams params;
+ params.client = this;
+ params.main_task_runner =
+ compositor_deps_->GetCompositorMainThreadTaskRunner();
+ params.animation_host = cc::AnimationHost::CreateMainInstance();
+ params.remote_compositor_bridge =
+ GetContentClient()->renderer()->CreateRemoteCompositorBridge(
+ this, params.main_task_runner);
+ params.engine_picture_cache =
+ compositor_deps_->GetImageSerializationProcessor()
+ ->CreateEnginePictureCache();
+ params.settings = &settings;
+ layer_tree_host_ = base::MakeUnique<cc::LayerTreeHostRemote>(&params);
+ return;
+ }
+
cc::LayerTreeHostInProcess::InitParams params;
params.client = this;
params.shared_bitmap_manager = compositor_deps_->GetSharedBitmapManager();
« cc/proto/compositor_message.proto ('K') | « content/public/renderer/content_renderer_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698