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

Unified Diff: cc/layers/layer_impl.h

Issue 2054483002: Revert of cc : Make LayerImpl destruction independent of tree hierarchy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | cc/layers/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 9a7265c0124818c0bbb92739dfbbeafa662acc9d..8a79d12d1139042c9caafb0df5405ca6ebddc013 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -160,7 +160,7 @@
void SetReplicaLayer(std::unique_ptr<LayerImpl> replica_layer);
LayerImpl* replica_layer() { return replica_layer_; }
const LayerImpl* replica_layer() const { return replica_layer_; }
- std::unique_ptr<LayerImpl> TakeReplicaLayerForTesting();
+ std::unique_ptr<LayerImpl> TakeReplicaLayer();
bool has_mask() const { return !!mask_layer_; }
bool has_replica() const { return !!replica_layer_; }
@@ -535,6 +535,9 @@
gfx::Rect GetScaledEnclosingRectInTargetSpace(float scale) const;
private:
+ // Warning: This does not preserve tree structure invariants.
+ void ClearChildList();
+
void ValidateQuadResourcesInternal(DrawQuad* quad) const;
virtual const char* LayerTypeAsString() const;
« no previous file with comments | « no previous file | cc/layers/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698