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

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

Issue 1539203002: Switch to standard integer types in cc/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more includes 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 unified diff | Download patch
« no previous file with comments | « cc/test/layer_tree_json_parser.cc ('k') | cc/test/layer_tree_pixel_test.cc » ('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 <stddef.h>
8
7 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
8 #include "cc/test/fake_impl_task_runner_provider.h" 10 #include "cc/test/fake_impl_task_runner_provider.h"
9 #include "cc/test/fake_layer_tree_host.h" 11 #include "cc/test/fake_layer_tree_host.h"
10 #include "cc/test/fake_layer_tree_host_impl.h" 12 #include "cc/test/fake_layer_tree_host_impl.h"
11 #include "cc/test/geometry_test_utils.h" 13 #include "cc/test/geometry_test_utils.h"
12 #include "cc/test/test_task_graph_runner.h" 14 #include "cc/test/test_task_graph_runner.h"
13 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
14 16
15 namespace cc { 17 namespace cc {
16 18
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 root_impl->AddChild(std::move(touch_layer)); 117 root_impl->AddChild(std::move(touch_layer));
116 tree->SetRootLayer(std::move(root_impl)); 118 tree->SetRootLayer(std::move(root_impl));
117 119
118 std::string json = host_impl.LayerTreeAsJson(); 120 std::string json = host_impl.LayerTreeAsJson();
119 scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL); 121 scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
120 ASSERT_TRUE(root.get()); 122 ASSERT_TRUE(root.get());
121 EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get())); 123 EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
122 } 124 }
123 125
124 } // namespace cc 126 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_json_parser.cc ('k') | cc/test/layer_tree_pixel_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698