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

Side by Side Diff: cc/test/layer_tree_json_parser.cc

Issue 1462613002: Move cc::LayerSettings to cc/layers/layer_settings.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc_perftests Created 5 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 unified diff | Download patch
« no previous file with comments | « cc/test/layer_tree_host_common_test.h ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/layer_tree_json_parser.h" 5 #include "cc/test/layer_tree_json_parser.h"
6 6
7 #include "base/test/values_test_util.h" 7 #include "base/test/values_test_util.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/layers/layer_settings.h"
10 #include "cc/layers/nine_patch_layer.h" 11 #include "cc/layers/nine_patch_layer.h"
11 #include "cc/layers/picture_layer.h" 12 #include "cc/layers/picture_layer.h"
12 #include "cc/layers/solid_color_layer.h" 13 #include "cc/layers/solid_color_layer.h"
13 #include "cc/layers/texture_layer.h" 14 #include "cc/layers/texture_layer.h"
14 #include "cc/trees/layer_tree_settings.h" 15 #include "cc/trees/layer_tree_settings.h"
15 16
16 namespace cc { 17 namespace cc {
17 18
18 namespace { 19 namespace {
19 20
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 191
191 } // namespace 192 } // namespace
192 193
193 scoped_refptr<Layer> ParseTreeFromJson(std::string json, 194 scoped_refptr<Layer> ParseTreeFromJson(std::string json,
194 ContentLayerClient* content_client) { 195 ContentLayerClient* content_client) {
195 scoped_ptr<base::Value> val = base::test::ParseJson(json); 196 scoped_ptr<base::Value> val = base::test::ParseJson(json);
196 return ParseTreeFromValue(val.get(), content_client); 197 return ParseTreeFromValue(val.get(), content_client);
197 } 198 }
198 199
199 } // namespace cc 200 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_host_common_test.h ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698