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

Unified Diff: cc/layers/layer_proto_converter.cc

Issue 1527863002: Serialize PictureLayer properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests Created 5 years 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: cc/layers/layer_proto_converter.cc
diff --git a/cc/layers/layer_proto_converter.cc b/cc/layers/layer_proto_converter.cc
index 65e1b14ff0c1d4043bbeb7da17e7fa725393e0de..87e567f805b05e30ae2c7c5587257a24e7de12bc 100644
--- a/cc/layers/layer_proto_converter.cc
+++ b/cc/layers/layer_proto_converter.cc
@@ -5,8 +5,10 @@
#include "cc/layers/layer_proto_converter.h"
#include "base/stl_util.h"
+#include "cc/layers/empty_content_layer_client.h"
#include "cc/layers/layer.h"
#include "cc/layers/layer_settings.h"
+#include "cc/layers/picture_layer.h"
#include "cc/proto/layer.pb.h"
#include "cc/trees/layer_tree_host_common.h"
#include "cc/trees/layer_tree_settings.h"
@@ -105,6 +107,9 @@ scoped_refptr<Layer> LayerProtoConverter::FindOrAllocateAndConstruct(
switch (proto.type()) {
case proto::Base:
return Layer::Create(LayerSettings()).get();
+ case proto::Picture:
vmpstr 2015/12/16 04:21:08 I think this should be PictureLayer (and maybe bas
David Trainor- moved to gerrit 2015/12/16 19:10:58 Done.
+ return PictureLayer::Create(LayerSettings(),
+ EmptyContentLayerClient::GetInstance());
}
// TODO(nyquist): Add the rest of the necessary LayerTypes. This function
// should not return null.

Powered by Google App Engine
This is Rietveld 408576698