| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CC_RESOURCES_DISPLAY_ITEM_LIST_H_ | 5 #ifndef CC_PLAYBACK_DISPLAY_ITEM_LIST_H_ |
| 6 #define CC_RESOURCES_DISPLAY_ITEM_LIST_H_ | 6 #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_ |
| 7 | 7 |
| 8 #include "base/gtest_prod_util.h" | 8 #include "base/gtest_prod_util.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/trace_event/trace_event.h" | 11 #include "base/trace_event/trace_event.h" |
| 12 #include "cc/base/cc_export.h" | 12 #include "cc/base/cc_export.h" |
| 13 #include "cc/base/scoped_ptr_vector.h" | 13 #include "cc/base/scoped_ptr_vector.h" |
| 14 #include "cc/playback/display_item.h" |
| 15 #include "cc/playback/pixel_ref_map.h" |
| 14 // TODO(danakj): Move ListContainer out of cc/quads/ | 16 // TODO(danakj): Move ListContainer out of cc/quads/ |
| 15 #include "cc/quads/list_container.h" | 17 #include "cc/quads/list_container.h" |
| 16 #include "cc/resources/display_item.h" | |
| 17 #include "cc/resources/pixel_ref_map.h" | |
| 18 #include "skia/ext/refptr.h" | 18 #include "skia/ext/refptr.h" |
| 19 #include "third_party/skia/include/core/SkPicture.h" | 19 #include "third_party/skia/include/core/SkPicture.h" |
| 20 #include "ui/gfx/geometry/rect.h" | 20 #include "ui/gfx/geometry/rect.h" |
| 21 | 21 |
| 22 class SkCanvas; | 22 class SkCanvas; |
| 23 class SkDrawPictureCallback; | 23 class SkDrawPictureCallback; |
| 24 class SkPictureRecorder; | 24 class SkPictureRecorder; |
| 25 | 25 |
| 26 namespace cc { | 26 namespace cc { |
| 27 | 27 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 scoped_ptr<PixelRefMap> pixel_refs_; | 90 scoped_ptr<PixelRefMap> pixel_refs_; |
| 91 | 91 |
| 92 friend class base::RefCountedThreadSafe<DisplayItemList>; | 92 friend class base::RefCountedThreadSafe<DisplayItemList>; |
| 93 friend class PixelRefMap::Iterator; | 93 friend class PixelRefMap::Iterator; |
| 94 FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, PictureMemoryUsage); | 94 FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, PictureMemoryUsage); |
| 95 DISALLOW_COPY_AND_ASSIGN(DisplayItemList); | 95 DISALLOW_COPY_AND_ASSIGN(DisplayItemList); |
| 96 }; | 96 }; |
| 97 | 97 |
| 98 } // namespace cc | 98 } // namespace cc |
| 99 | 99 |
| 100 #endif // CC_RESOURCES_DISPLAY_ITEM_LIST_H_ | 100 #endif // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_ |
| OLD | NEW |