Serialize PictureLayer properties.

cc/layers/layer_proto_converter.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 namespace cc {
 
 LayerProtoConverter::LayerProtoConverter() {}
 
 LayerProtoConverter::~LayerProtoConverter() {}
 
@@ skipping 76 matching lines @@
 // static
 scoped_refptr<Layer> LayerProtoConverter::FindOrAllocateAndConstruct(
     const proto::LayerNode& proto,
     const Layer::LayerIdMap& layer_id_map) {
   DCHECK(proto.has_id());
   Layer::LayerIdMap::const_iterator iter = layer_id_map.find(proto.id());
   if (iter != layer_id_map.end())
     return iter->second;
   DCHECK(proto.has_type());
   switch (proto.type()) {
-    case proto::Base:
+    // Fall through and build a base layer.  This won't have any special layer
+    // properties but still maintains the layer hierarchy if we run into a
+    // layer type we don't support.
+    case proto::UNKNOWN:
+    case proto::LAYER:
       return Layer::Create(LayerSettings()).get();
+    case proto::PICTURE_LAYER:
+      return PictureLayer::Create(LayerSettings(),
+                                  EmptyContentLayerClient::GetInstance());
   }
   // TODO(nyquist): Add the rest of the necessary LayerTypes. This function
   // should not return null.
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace cc