OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/stringprintf.h" | 12 #include "base/stringprintf.h" |
13 #include "cc/layer.h" | 13 #include "cc/layer.h" |
14 #include "cc/test/pixel_test_utils.h" | 14 #include "cc/test/pixel_test_utils.h" |
15 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
16 #include "ui/compositor/compositor_observer.h" | 16 #include "ui/compositor/compositor_observer.h" |
17 #include "ui/compositor/compositor_setup.h" | 17 #include "ui/compositor/compositor_setup.h" |
18 #include "ui/compositor/layer.h" | 18 #include "ui/compositor/layer.h" |
19 #include "ui/compositor/layer_animation_sequence.h" | 19 #include "ui/compositor/layer_animation_sequence.h" |
20 #include "ui/compositor/test/test_compositor_host.h" | 20 #include "ui/compositor/test/test_compositor_host.h" |
21 #include "ui/gfx/canvas.h" | 21 #include "ui/gfx/canvas.h" |
22 #include "ui/gfx/codec/png_codec.h" | 22 #include "ui/gfx/codec/png_codec.h" |
23 #include "ui/gfx/gfx_paths.h" | 23 #include "ui/gfx/gfx_paths.h" |
24 #include "ui/gfx/skia_util.h" | 24 #include "ui/gfx/skia_util.h" |
25 | 25 |
26 using cc::test::IsSameAsPNGFile; | 26 using cc::IsSameAsPNGFile; |
27 | 27 |
28 namespace ui { | 28 namespace ui { |
29 | 29 |
30 namespace { | 30 namespace { |
31 | 31 |
32 // Returns a comma-separated list of the names of |layer|'s children in | 32 // Returns a comma-separated list of the names of |layer|'s children in |
33 // bottom-to-top stacking order. | 33 // bottom-to-top stacking order. |
34 std::string GetLayerChildrenNames(const Layer& layer) { | 34 std::string GetLayerChildrenNames(const Layer& layer) { |
35 std::string names; | 35 std::string names; |
36 for (std::vector<Layer*>::const_iterator it = layer.children().begin(); | 36 for (std::vector<Layer*>::const_iterator it = layer.children().begin(); |
(...skipping 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1233 | 1233 |
1234 // Resize layer. | 1234 // Resize layer. |
1235 child->SetBounds(gfx::Rect(200, 200, 400, 400)); | 1235 child->SetBounds(gfx::Rect(200, 200, 400, 400)); |
1236 child->SetVisible(true); | 1236 child->SetVisible(true); |
1237 EXPECT_TRUE(schedule_draw_invoked_); | 1237 EXPECT_TRUE(schedule_draw_invoked_); |
1238 DrawTree(root.get()); | 1238 DrawTree(root.get()); |
1239 EXPECT_TRUE(delegate.painted()); | 1239 EXPECT_TRUE(delegate.painted()); |
1240 } | 1240 } |
1241 | 1241 |
1242 } // namespace ui | 1242 } // namespace ui |
OLD | NEW |