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

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

Issue 1159573002: cc: Move cc/quads/list_container.* files to cc/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months 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
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 #include "cc/playback/display_item_list.h" 5 #include "cc/playback/display_item_list.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "base/trace_event/trace_event_argument.h" 10 #include "base/trace_event/trace_event_argument.h"
11 #include "cc/base/list_container.cc"
enne (OOO) 2015/05/26 18:31:28 Don't include cc files, please. Find some other w
prashant.n 2015/05/26 19:11:48 We'll have to then merge then list_container.h and
11 #include "cc/base/math_util.h" 12 #include "cc/base/math_util.h"
12 #include "cc/debug/picture_debug_util.h" 13 #include "cc/debug/picture_debug_util.h"
13 #include "cc/debug/traced_picture.h" 14 #include "cc/debug/traced_picture.h"
14 #include "cc/debug/traced_value.h" 15 #include "cc/debug/traced_value.h"
15 #include "cc/playback/largest_display_item.h" 16 #include "cc/playback/largest_display_item.h"
16 #include "third_party/skia/include/core/SkCanvas.h" 17 #include "third_party/skia/include/core/SkCanvas.h"
17 #include "third_party/skia/include/core/SkPictureRecorder.h" 18 #include "third_party/skia/include/core/SkPictureRecorder.h"
18 #include "third_party/skia/include/utils/SkPictureUtils.h" 19 #include "third_party/skia/include/utils/SkPictureUtils.h"
19 #include "ui/gfx/skia_util.h" 20 #include "ui/gfx/skia_util.h"
20 21
21 namespace cc { 22 namespace cc {
22 23
24 template class ListContainer<DisplayItem>;
25
23 namespace { 26 namespace {
24 27
25 bool PictureTracingEnabled() { 28 bool PictureTracingEnabled() {
26 bool tracing_enabled; 29 bool tracing_enabled;
27 TRACE_EVENT_CATEGORY_GROUP_ENABLED( 30 TRACE_EVENT_CATEGORY_GROUP_ENABLED(
28 TRACE_DISABLED_BY_DEFAULT("cc.debug.picture") "," 31 TRACE_DISABLED_BY_DEFAULT("cc.debug.picture") ","
29 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.picture"), 32 TRACE_DISABLED_BY_DEFAULT("devtools.timeline.picture"),
30 &tracing_enabled); 33 &tracing_enabled);
31 return tracing_enabled; 34 return tracing_enabled;
32 } 35 }
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 // This should be only called once, and only after CreateAndCacheSkPicture. 222 // This should be only called once, and only after CreateAndCacheSkPicture.
220 DCHECK(picture_); 223 DCHECK(picture_);
221 DCHECK(!pixel_refs_); 224 DCHECK(!pixel_refs_);
222 pixel_refs_ = make_scoped_ptr(new PixelRefMap(grid_cell_size)); 225 pixel_refs_ = make_scoped_ptr(new PixelRefMap(grid_cell_size));
223 if (!picture_->willPlayBackBitmaps()) 226 if (!picture_->willPlayBackBitmaps())
224 return; 227 return;
225 228
226 pixel_refs_->GatherPixelRefsFromPicture(picture_.get()); 229 pixel_refs_->GatherPixelRefsFromPicture(picture_.get());
227 } 230 }
228 } // namespace cc 231 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698