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

Unified Diff: ui/compositor/layer.cc

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)
Patch Set: none Created 3 years, 7 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: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 64faa6a1418a7f56175b47817e0a521397ef6afe..f83810aa10a7428f224bf968088d0a854bf81f9f 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -617,7 +617,9 @@ void Layer::SwitchToLayer(scoped_refptr<cc::Layer> new_layer) {
cc_layer_->SetContentsOpaque(fills_bounds_opaquely_);
cc_layer_->SetIsDrawable(type_ != LAYER_NOT_DRAWN);
cc_layer_->SetHideLayerAndSubtree(!visible_);
- cc_layer_->SetElementId(cc::ElementId(cc_layer_->id(), 0));
+ cc::ElementId element_id;
+ element_id.id = cc_layer_->id();
+ cc_layer_->SetElementId(element_id);
SetLayerFilters();
SetLayerBackgroundFilters();
@@ -1167,7 +1169,9 @@ void Layer::CreateCcLayer() {
cc_layer_->SetContentsOpaque(true);
cc_layer_->SetIsDrawable(type_ != LAYER_NOT_DRAWN);
cc_layer_->SetLayerClient(this);
- cc_layer_->SetElementId(cc::ElementId(cc_layer_->id(), 0));
+ cc::ElementId element_id;
+ element_id.id = cc_layer_->id();
+ cc_layer_->SetElementId(element_id);
RecomputePosition();
}

Powered by Google App Engine
This is Rietveld 408576698