| 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/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/debug/trace_event.h" | |
| 9 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 10 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 11 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| 12 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
| 14 #include "base/path_service.h" | 13 #include "base/path_service.h" |
| 15 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
| 16 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 16 #include "base/trace_event/trace_event.h" |
| 17 #include "cc/layers/delegated_frame_provider.h" | 17 #include "cc/layers/delegated_frame_provider.h" |
| 18 #include "cc/layers/delegated_frame_resource_collection.h" | 18 #include "cc/layers/delegated_frame_resource_collection.h" |
| 19 #include "cc/layers/layer.h" | 19 #include "cc/layers/layer.h" |
| 20 #include "cc/output/copy_output_request.h" | 20 #include "cc/output/copy_output_request.h" |
| 21 #include "cc/output/copy_output_result.h" | 21 #include "cc/output/copy_output_result.h" |
| 22 #include "cc/output/delegated_frame_data.h" | 22 #include "cc/output/delegated_frame_data.h" |
| 23 #include "cc/test/pixel_test_utils.h" | 23 #include "cc/test/pixel_test_utils.h" |
| 24 #include "testing/gtest/include/gtest/gtest.h" | 24 #include "testing/gtest/include/gtest/gtest.h" |
| 25 #include "ui/compositor/compositor_observer.h" | 25 #include "ui/compositor/compositor_observer.h" |
| 26 #include "ui/compositor/dip_util.h" | 26 #include "ui/compositor/dip_util.h" |
| (...skipping 1706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1733 MakeFrameData(gfx::Size(10, 10)))); | 1733 MakeFrameData(gfx::Size(10, 10)))); |
| 1734 layer->SetShowDelegatedContent(frame_provider.get(), gfx::Size(10, 10)); | 1734 layer->SetShowDelegatedContent(frame_provider.get(), gfx::Size(10, 10)); |
| 1735 | 1735 |
| 1736 EXPECT_FALSE(delegate.delegated_frame_damage_called()); | 1736 EXPECT_FALSE(delegate.delegated_frame_damage_called()); |
| 1737 layer->OnDelegatedFrameDamage(damage_rect); | 1737 layer->OnDelegatedFrameDamage(damage_rect); |
| 1738 EXPECT_TRUE(delegate.delegated_frame_damage_called()); | 1738 EXPECT_TRUE(delegate.delegated_frame_damage_called()); |
| 1739 EXPECT_EQ(damage_rect, delegate.delegated_frame_damage_rect()); | 1739 EXPECT_EQ(damage_rect, delegate.delegated_frame_damage_rect()); |
| 1740 } | 1740 } |
| 1741 | 1741 |
| 1742 } // namespace ui | 1742 } // namespace ui |
| OLD | NEW |