| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layers/layer_proto_converter.h" | 5 #include "cc/layers/layer_proto_converter.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
| 9 #include "cc/layers/layer_settings.h" |
| 9 #include "cc/proto/layer.pb.h" | 10 #include "cc/proto/layer.pb.h" |
| 10 #include "cc/trees/layer_tree_host_common.h" | 11 #include "cc/trees/layer_tree_host_common.h" |
| 11 #include "cc/trees/layer_tree_settings.h" | 12 #include "cc/trees/layer_tree_settings.h" |
| 12 | 13 |
| 13 namespace cc { | 14 namespace cc { |
| 14 | 15 |
| 15 LayerProtoConverter::LayerProtoConverter() {} | 16 LayerProtoConverter::LayerProtoConverter() {} |
| 16 | 17 |
| 17 LayerProtoConverter::~LayerProtoConverter() {} | 18 LayerProtoConverter::~LayerProtoConverter() {} |
| 18 | 19 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 case proto::Base: | 106 case proto::Base: |
| 106 return Layer::Create(LayerSettings()).get(); | 107 return Layer::Create(LayerSettings()).get(); |
| 107 } | 108 } |
| 108 // TODO(nyquist): Add the rest of the necessary LayerTypes. This function | 109 // TODO(nyquist): Add the rest of the necessary LayerTypes. This function |
| 109 // should not return null. | 110 // should not return null. |
| 110 NOTREACHED(); | 111 NOTREACHED(); |
| 111 return nullptr; | 112 return nullptr; |
| 112 } | 113 } |
| 113 | 114 |
| 114 } // namespace cc | 115 } // namespace cc |
| OLD | NEW |