| 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_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.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/delegated_frame_data.h" | |
| 14 #include "cc/layer.h" | 13 #include "cc/layer.h" |
| 14 #include "cc/output/delegated_frame_data.h" |
| 15 #include "cc/test/pixel_test_utils.h" | 15 #include "cc/test/pixel_test_utils.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 17 #include "ui/compositor/compositor_observer.h" | 17 #include "ui/compositor/compositor_observer.h" |
| 18 #include "ui/compositor/compositor_setup.h" | 18 #include "ui/compositor/compositor_setup.h" |
| 19 #include "ui/compositor/layer.h" | 19 #include "ui/compositor/layer.h" |
| 20 #include "ui/compositor/layer_animation_sequence.h" | 20 #include "ui/compositor/layer_animation_sequence.h" |
| 21 #include "ui/compositor/layer_animator.h" | 21 #include "ui/compositor/layer_animator.h" |
| 22 #include "ui/compositor/test/test_compositor_host.h" | 22 #include "ui/compositor/test/test_compositor_host.h" |
| 23 #include "ui/gfx/canvas.h" | 23 #include "ui/gfx/canvas.h" |
| 24 #include "ui/gfx/codec/png_codec.h" | 24 #include "ui/gfx/codec/png_codec.h" |
| (...skipping 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1376 l1->SetOpacity(0.5f); | 1376 l1->SetOpacity(0.5f); |
| 1377 | 1377 |
| 1378 // Change l1's cc::Layer. | 1378 // Change l1's cc::Layer. |
| 1379 l1->SwitchCCLayerForTest(); | 1379 l1->SwitchCCLayerForTest(); |
| 1380 | 1380 |
| 1381 // Ensure that the opacity animation completed. | 1381 // Ensure that the opacity animation completed. |
| 1382 EXPECT_FLOAT_EQ(l1->opacity(), 0.5f); | 1382 EXPECT_FLOAT_EQ(l1->opacity(), 0.5f); |
| 1383 } | 1383 } |
| 1384 | 1384 |
| 1385 } // namespace ui | 1385 } // namespace ui |
| OLD | NEW |