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

Unified Diff: cc/layers/layer.h

Issue 2493523003: cc: Remove unused proto conversion code. (Closed)
Patch Set: test 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_unittest_serialization.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 7291467d1fa835edfb2c87c2d1fb0d0d2539eb2c..04cc9c000c781de75ffd269022e6713c77450224 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -358,33 +358,11 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
// construction of the correct layer on the client.
virtual void ToLayerNodeProto(proto::LayerNode* proto) const;
- // Recursively iterate over this layer and all children and reset the
- // properties sent with the hierarchical structure in the LayerNode protos.
- // This must be done before deserializing the new LayerTree from the Layernode
- // protos.
- void ClearLayerTreePropertiesForDeserializationAndAddToMap(
- LayerIdMap* layer_map);
-
- // Recursively iterate over the given LayerNode proto and read the structure
- // into this node and its children. The |layer_map| should be used to look
- // for previously existing Layers, since they should be re-used between each
- // hierarchy update.
- virtual void FromLayerNodeProto(const proto::LayerNode& proto,
- const LayerIdMap& layer_map,
- LayerTreeHost* layer_tree_host);
-
// This method is similar to PushPropertiesTo, but instead of pushing to
// a LayerImpl, it pushes the properties to proto::LayerProperties. It is
// called only on layers that have changed properties. The properties
// themselves are pushed to proto::LayerProperties.
- virtual void ToLayerPropertiesProto(proto::LayerUpdate* layer_update,
- bool inputs_only);
-
- // Read all property values from the given LayerProperties object and update
- // the current layer. The values for |needs_push_properties_| and
- // |num_dependents_need_push_properties_| are always updated, but the rest
- // of |proto| is only read if |needs_push_properties_| is set.
- void FromLayerPropertiesProto(const proto::LayerProperties& proto);
+ virtual void ToLayerPropertiesProto(proto::LayerProperties* proto);
LayerTreeHost* GetLayerTreeHostForTesting() const { return layer_tree_host_; }
LayerTree* GetLayerTree() const;
@@ -504,6 +482,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
void SetScrollbarsHiddenFromImplSide(bool hidden);
+ const gfx::Rect& update_rect() const { return inputs_.update_rect; }
+
protected:
friend class LayerImpl;
friend class TreeSynchronizer;
@@ -544,29 +524,13 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
bool IsPropertyChangeAllowed() const;
- // Serialize all the necessary properties to be able to reconstruct this Layer
- // into proto::LayerProperties. This method is not marked as const
- // as some implementations need reset member fields, similarly to
- // PushPropertiesTo().
- virtual void LayerSpecificPropertiesToProto(proto::LayerProperties* proto,
- bool inputs_only);
-
- // Deserialize all the necessary properties from proto::LayerProperties into
- // this Layer.
- virtual void FromLayerSpecificPropertiesProto(
- const proto::LayerProperties& proto);
-
- gfx::Rect& update_rect() { return inputs_.update_rect; }
-
// When true, the layer is about to perform an update. Any commit requests
// will be handled implicitly after the update completes.
bool ignore_set_needs_commit_;
private:
friend class base::RefCounted<Layer>;
- friend class LayerSerializationTest;
friend class LayerTreeHostCommon;
- friend class LayerTreeHost;
friend class LayerTree;
friend class LayerInternalsForTest;
« no previous file with comments | « cc/blimp/layer_tree_host_unittest_serialization.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698