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

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

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 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 | « cc/resources/display_list_recording_source.cc ('k') | cc/resources/drawing_display_item.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_RESOURCES_DRAWING_DISPLAY_ITEM_H_ 5 #ifndef CC_RESOURCES_DRAWING_DISPLAY_ITEM_H_
6 #define CC_RESOURCES_DRAWING_DISPLAY_ITEM_H_ 6 #define CC_RESOURCES_DRAWING_DISPLAY_ITEM_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/base/cc_export.h" 9 #include "cc/base/cc_export.h"
10 #include "cc/resources/display_item.h" 10 #include "cc/resources/display_item.h"
11 #include "skia/ext/refptr.h" 11 #include "skia/ext/refptr.h"
12 #include "ui/gfx/geometry/point_f.h" 12 #include "ui/gfx/geometry/point_f.h"
13 13
14 class SkCanvas; 14 class SkCanvas;
15 class SkDrawPictureCallback; 15 class SkDrawPictureCallback;
16 class SkPicture; 16 class SkPicture;
17 17
18 namespace cc { 18 namespace cc {
19 19
20 class CC_EXPORT DrawingDisplayItem : public DisplayItem { 20 class CC_EXPORT DrawingDisplayItem : public DisplayItem {
21 public: 21 public:
22 ~DrawingDisplayItem() override; 22 ~DrawingDisplayItem() override;
23 23
24 static scoped_ptr<DrawingDisplayItem> Create( 24 static scoped_ptr<DrawingDisplayItem> Create(
25 skia::RefPtr<SkPicture> picture) { 25 skia::RefPtr<SkPicture> picture) {
26 return make_scoped_ptr(new DrawingDisplayItem(picture)); 26 return make_scoped_ptr(new DrawingDisplayItem(picture));
27 } 27 }
28 28
29 void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override; 29 void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override;
30 void RasterForTracing(SkCanvas* canvas) const override;
30 31
31 bool IsSuitableForGpuRasterization() const override; 32 bool IsSuitableForGpuRasterization() const override;
32 int ApproximateOpCount() const override; 33 int ApproximateOpCount() const override;
33 size_t PictureMemoryUsage() const override; 34 size_t PictureMemoryUsage() const override;
34 void AsValueInto(base::trace_event::TracedValue* array) const override; 35 void AsValueInto(base::trace_event::TracedValue* array) const override;
35 36
36 protected: 37 protected:
37 explicit DrawingDisplayItem(skia::RefPtr<SkPicture> picture); 38 explicit DrawingDisplayItem(skia::RefPtr<SkPicture> picture);
38 39
39 private: 40 private:
40 skia::RefPtr<SkPicture> picture_; 41 skia::RefPtr<SkPicture> picture_;
41 }; 42 };
42 43
43 } // namespace cc 44 } // namespace cc
44 45
45 #endif // CC_RESOURCES_DRAWING_DISPLAY_ITEM_H_ 46 #endif // CC_RESOURCES_DRAWING_DISPLAY_ITEM_H_
OLDNEW
« no previous file with comments | « cc/resources/display_list_recording_source.cc ('k') | cc/resources/drawing_display_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698