OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "cc/content_layer.h" | 5 #include "cc/content_layer.h" |
6 | 6 |
7 #include "cc/bitmap_content_layer_updater.h" | |
8 #include "cc/content_layer_client.h" | 7 #include "cc/content_layer_client.h" |
| 8 #include "cc/resources/bitmap_content_layer_updater.h" |
9 #include "cc/test/geometry_test_utils.h" | 9 #include "cc/test/geometry_test_utils.h" |
10 #include "skia/ext/platform_canvas.h" | 10 #include "skia/ext/platform_canvas.h" |
11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
12 #include "ui/gfx/rect_conversions.h" | 12 #include "ui/gfx/rect_conversions.h" |
13 | 13 |
14 using namespace WebKit; | 14 using namespace WebKit; |
15 | 15 |
16 namespace cc { | 16 namespace cc { |
17 namespace { | 17 namespace { |
18 | 18 |
(...skipping 30 matching lines...) Expand all Loading... |
49 contents_scale, | 49 contents_scale, |
50 &resulting_opaque_rect, | 50 &resulting_opaque_rect, |
51 NULL); | 51 NULL); |
52 | 52 |
53 EXPECT_RECT_EQ(gfx::ToEnclosingRect(opaque_rect_in_content_space), | 53 EXPECT_RECT_EQ(gfx::ToEnclosingRect(opaque_rect_in_content_space), |
54 resulting_opaque_rect); | 54 resulting_opaque_rect); |
55 } | 55 } |
56 | 56 |
57 } // namespace | 57 } // namespace |
58 } // namespace cc | 58 } // namespace cc |
OLD | NEW |