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

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

Issue 1138923005: Remove SK_LEGACY_DRAWPICTURECALLBACK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: analysis_canvas_unittest fix 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
« no previous file with comments | « cc/playback/clip_path_display_item.cc ('k') | cc/playback/compositing_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_COMPOSITING_DISPLAY_ITEM_H_ 5 #ifndef CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_
6 #define CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ 6 #define CC_PLAYBACK_COMPOSITING_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/playback/display_item.h" 10 #include "cc/playback/display_item.h"
11 #include "skia/ext/refptr.h" 11 #include "skia/ext/refptr.h"
12 #include "third_party/skia/include/core/SkColorFilter.h" 12 #include "third_party/skia/include/core/SkColorFilter.h"
13 #include "third_party/skia/include/core/SkRect.h" 13 #include "third_party/skia/include/core/SkRect.h"
14 #include "third_party/skia/include/core/SkXfermode.h" 14 #include "third_party/skia/include/core/SkXfermode.h"
15 #include "ui/gfx/geometry/rect_f.h" 15 #include "ui/gfx/geometry/rect_f.h"
16 16
17 class SkCanvas; 17 class SkCanvas;
18 class SkDrawPictureCallback;
19 18
20 namespace cc { 19 namespace cc {
21 20
22 class CC_EXPORT CompositingDisplayItem : public DisplayItem { 21 class CC_EXPORT CompositingDisplayItem : public DisplayItem {
23 public: 22 public:
24 CompositingDisplayItem(); 23 CompositingDisplayItem();
25 ~CompositingDisplayItem() override; 24 ~CompositingDisplayItem() override;
26 25
27 void SetNew(uint8_t alpha, 26 void SetNew(uint8_t alpha,
28 SkXfermode::Mode xfermode, 27 SkXfermode::Mode xfermode,
29 SkRect* bounds, 28 SkRect* bounds,
30 skia::RefPtr<SkColorFilter> color_filter); 29 skia::RefPtr<SkColorFilter> color_filter);
31 30
32 void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override; 31 void Raster(SkCanvas* canvas,
32 SkPicture::AbortCallback* callback) const override;
33 void AsValueInto(base::trace_event::TracedValue* array) const override; 33 void AsValueInto(base::trace_event::TracedValue* array) const override;
34 34
35 private: 35 private:
36 uint8_t alpha_; 36 uint8_t alpha_;
37 SkXfermode::Mode xfermode_; 37 SkXfermode::Mode xfermode_;
38 bool has_bounds_; 38 bool has_bounds_;
39 SkRect bounds_; 39 SkRect bounds_;
40 skia::RefPtr<SkColorFilter> color_filter_; 40 skia::RefPtr<SkColorFilter> color_filter_;
41 }; 41 };
42 42
43 class CC_EXPORT EndCompositingDisplayItem : public DisplayItem { 43 class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
44 public: 44 public:
45 EndCompositingDisplayItem(); 45 EndCompositingDisplayItem();
46 ~EndCompositingDisplayItem() override; 46 ~EndCompositingDisplayItem() override;
47 47
48 static scoped_ptr<EndCompositingDisplayItem> Create() { 48 static scoped_ptr<EndCompositingDisplayItem> Create() {
49 return make_scoped_ptr(new EndCompositingDisplayItem()); 49 return make_scoped_ptr(new EndCompositingDisplayItem());
50 } 50 }
51 51
52 void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override; 52 void Raster(SkCanvas* canvas,
53 SkPicture::AbortCallback* callback) const override;
53 void AsValueInto(base::trace_event::TracedValue* array) const override; 54 void AsValueInto(base::trace_event::TracedValue* array) const override;
54 }; 55 };
55 56
56 } // namespace cc 57 } // namespace cc
57 58
58 #endif // CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ 59 #endif // CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_
OLDNEW
« no previous file with comments | « cc/playback/clip_path_display_item.cc ('k') | cc/playback/compositing_display_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698