Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: cc/playback/display_item_list.h

Issue 1539203002: Switch to standard integer types in cc/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more includes Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/playback/display_item.h ('k') | cc/playback/display_item_list.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_PLAYBACK_DISPLAY_ITEM_LIST_H_ 5 #ifndef CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
6 #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_ 6 #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
7 7
8 #include <stddef.h>
9
8 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
11 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
12 #include "cc/base/cc_export.h" 15 #include "cc/base/cc_export.h"
13 #include "cc/base/contiguous_container.h" 16 #include "cc/base/contiguous_container.h"
14 #include "cc/playback/discardable_image_map.h" 17 #include "cc/playback/discardable_image_map.h"
15 #include "cc/playback/display_item.h" 18 #include "cc/playback/display_item.h"
16 #include "cc/playback/display_item_list_settings.h" 19 #include "cc/playback/display_item_list_settings.h"
17 #include "skia/ext/refptr.h" 20 #include "skia/ext/refptr.h"
18 #include "third_party/skia/include/core/SkPicture.h" 21 #include "third_party/skia/include/core/SkPicture.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 DiscardableImageMap image_map_; 138 DiscardableImageMap image_map_;
136 139
137 friend class base::RefCountedThreadSafe<DisplayItemList>; 140 friend class base::RefCountedThreadSafe<DisplayItemList>;
138 FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, ApproximateMemoryUsage); 141 FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, ApproximateMemoryUsage);
139 DISALLOW_COPY_AND_ASSIGN(DisplayItemList); 142 DISALLOW_COPY_AND_ASSIGN(DisplayItemList);
140 }; 143 };
141 144
142 } // namespace cc 145 } // namespace cc
143 146
144 #endif // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_ 147 #endif // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
OLDNEW
« no previous file with comments | « cc/playback/display_item.h ('k') | cc/playback/display_item_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698