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

Side by Side Diff: cc/resources/drawing_display_item.cc

Issue 806553004: Fix inclusion of SkDrawPictureCallback.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up Created 5 years, 11 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
« no previous file with comments | « no previous file | cc/resources/picture.h » ('j') | cc/resources/picture.h » ('J')
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 #include "cc/resources/drawing_display_item.h" 5 #include "cc/resources/drawing_display_item.h"
6 6
7 #include "third_party/skia/include/core/SkCanvas.h" 7 #include "third_party/skia/include/core/SkCanvas.h"
8 #include "third_party/skia/include/core/SkDrawPictureCallback.h"
danakj 2015/01/06 15:42:46 A forward declaration seems like enough here?
robertphillips 2015/01/06 16:08:09 This include will go away after the Skia-side rena
8 #include "third_party/skia/include/core/SkMatrix.h" 9 #include "third_party/skia/include/core/SkMatrix.h"
9 #include "third_party/skia/include/core/SkPicture.h" 10 #include "third_party/skia/include/core/SkPicture.h"
10 #include "third_party/skia/include/utils/SkPictureUtils.h" 11 #include "third_party/skia/include/utils/SkPictureUtils.h"
11 12
12 namespace cc { 13 namespace cc {
13 14
14 DrawingDisplayItem::DrawingDisplayItem(skia::RefPtr<SkPicture> picture, 15 DrawingDisplayItem::DrawingDisplayItem(skia::RefPtr<SkPicture> picture,
15 gfx::PointF location) 16 gfx::PointF location)
16 : picture_(picture), location_(location) { 17 : picture_(picture), location_(location) {
17 } 18 }
(...skipping 19 matching lines...) Expand all
37 int DrawingDisplayItem::ApproximateOpCount() const { 38 int DrawingDisplayItem::ApproximateOpCount() const {
38 return picture_->approximateOpCount() + sizeof(gfx::PointF); 39 return picture_->approximateOpCount() + sizeof(gfx::PointF);
39 } 40 }
40 41
41 size_t DrawingDisplayItem::PictureMemoryUsage() const { 42 size_t DrawingDisplayItem::PictureMemoryUsage() const {
42 DCHECK(picture_); 43 DCHECK(picture_);
43 return SkPictureUtils::ApproximateBytesUsed(picture_.get()); 44 return SkPictureUtils::ApproximateBytesUsed(picture_.get());
44 } 45 }
45 46
46 } // namespace cc 47 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/resources/picture.h » ('j') | cc/resources/picture.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698