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

Unified Diff: cc/blimp/layer_tree_host_remote.cc

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 years, 1 month 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 | « cc/blimp/layer_tree_host_remote.h ('k') | cc/blimp/layer_tree_host_remote_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/blimp/layer_tree_host_remote.cc
diff --git a/cc/blimp/layer_tree_host_remote.cc b/cc/blimp/layer_tree_host_remote.cc
index 276f5927dae26f4db7c74af69110036f60558bd4..4453f9e6c12e99aa8dd7353c21e798b39892bc1e 100644
--- a/cc/blimp/layer_tree_host_remote.cc
+++ b/cc/blimp/layer_tree_host_remote.cc
@@ -7,7 +7,6 @@
#include "base/atomic_sequence_num.h"
#include "base/auto_reset.h"
#include "base/memory/ptr_util.h"
-#include "cc/animation/animation_host.h"
#include "cc/blimp/compositor_proto_state.h"
#include "cc/blimp/engine_picture_cache.h"
#include "cc/blimp/picture_data_conversions.h"
@@ -20,6 +19,7 @@
#include "cc/trees/layer_tree.h"
#include "cc/trees/layer_tree_host_client.h"
#include "cc/trees/layer_tree_host_common.h"
+#include "cc/trees/mutator_host.h"
#include "cc/trees/task_runner_provider.h"
#include "ui/gfx/geometry/scroll_offset.h"
@@ -64,8 +64,7 @@ LayerTreeHostRemote::InitParams::~InitParams() = default;
LayerTreeHostRemote::LayerTreeHostRemote(InitParams* params)
: LayerTreeHostRemote(
params,
- base::MakeUnique<LayerTree>(std::move(params->animation_host),
- this)) {}
+ base::MakeUnique<LayerTree>(params->mutator_host, this)) {}
LayerTreeHostRemote::LayerTreeHostRemote(InitParams* params,
std::unique_ptr<LayerTree> layer_tree)
@@ -377,7 +376,6 @@ void LayerTreeHostRemote::BeginMainFrame() {
// We don't run any animations on the layer because threaded animations are
// disabled.
// TODO(khushalsagar): Revisit this when adding support for animations.
- DCHECK(!layer_tree_->animation_host()->needs_push_properties());
client_->UpdateLayerTreeHost();
current_pipeline_stage_ = FramePipelineStage::UPDATE_LAYERS;
« no previous file with comments | « cc/blimp/layer_tree_host_remote.h ('k') | cc/blimp/layer_tree_host_remote_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698