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

Side by Side Diff: cc/blink/web_display_item_list_impl.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/blink/web_content_layer_impl.cc ('k') | cc/blink/web_display_item_list_impl.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_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_ 5 #ifndef CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_
6 #define CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_ 6 #define CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "cc/blink/cc_blink_export.h" 9 #include "cc/blink/cc_blink_export.h"
10 #include "cc/resources/display_item_list.h" 10 #include "cc/resources/display_item_list.h"
(...skipping 13 matching lines...) Expand all
24 namespace blink { 24 namespace blink {
25 class WebFilterOperations; 25 class WebFilterOperations;
26 struct WebFloatRect; 26 struct WebFloatRect;
27 struct WebRect; 27 struct WebRect;
28 } 28 }
29 29
30 namespace cc_blink { 30 namespace cc_blink {
31 31
32 class WebDisplayItemListImpl : public blink::WebDisplayItemList { 32 class WebDisplayItemListImpl : public blink::WebDisplayItemList {
33 public: 33 public:
34 CC_BLINK_EXPORT WebDisplayItemListImpl(cc::DisplayItemList* display_list); 34 CC_BLINK_EXPORT WebDisplayItemListImpl();
35 virtual ~WebDisplayItemListImpl(); 35 virtual ~WebDisplayItemListImpl();
36 36
37 scoped_refptr<cc::DisplayItemList> ToDisplayItemList();
38
37 // blink::WebDisplayItemList implementation. 39 // blink::WebDisplayItemList implementation.
38 virtual void appendDrawingItem(const SkPicture*); 40 virtual void appendDrawingItem(const SkPicture*);
39 virtual void appendClipItem( 41 virtual void appendClipItem(
40 const blink::WebRect& clip_rect, 42 const blink::WebRect& clip_rect,
41 const blink::WebVector<SkRRect>& rounded_clip_rects); 43 const blink::WebVector<SkRRect>& rounded_clip_rects);
42 virtual void appendEndClipItem(); 44 virtual void appendEndClipItem();
43 virtual void appendClipPathItem(const SkPath& clip_path, 45 virtual void appendClipPathItem(const SkPath& clip_path,
44 SkRegion::Op clip_op, 46 SkRegion::Op clip_op,
45 bool antialias); 47 bool antialias);
46 virtual void appendEndClipPathItem(); 48 virtual void appendEndClipPathItem();
47 virtual void appendFloatClipItem(const blink::WebFloatRect& clip_rect); 49 virtual void appendFloatClipItem(const blink::WebFloatRect& clip_rect);
48 virtual void appendEndFloatClipItem(); 50 virtual void appendEndFloatClipItem();
49 virtual void appendTransformItem(const SkMatrix44& matrix); 51 virtual void appendTransformItem(const SkMatrix44& matrix);
50 virtual void appendEndTransformItem(); 52 virtual void appendEndTransformItem();
51 virtual void appendCompositingItem(float opacity, 53 virtual void appendCompositingItem(float opacity,
52 SkXfermode::Mode, 54 SkXfermode::Mode,
53 SkRect* bounds, 55 SkRect* bounds,
54 SkColorFilter*); 56 SkColorFilter*);
55 virtual void appendEndCompositingItem(); 57 virtual void appendEndCompositingItem();
56 virtual void appendFilterItem(const blink::WebFilterOperations& filters, 58 virtual void appendFilterItem(const blink::WebFilterOperations& filters,
57 const blink::WebFloatRect& bounds); 59 const blink::WebFloatRect& bounds);
58 virtual void appendEndFilterItem(); 60 virtual void appendEndFilterItem();
59 virtual void appendScrollItem(const blink::WebSize& scrollOffset, 61 virtual void appendScrollItem(const blink::WebSize& scrollOffset,
60 ScrollContainerId); 62 ScrollContainerId);
61 virtual void appendEndScrollItem(); 63 virtual void appendEndScrollItem();
62 64
63 private: 65 private:
64 cc::DisplayItemList* display_item_list_; 66 scoped_refptr<cc::DisplayItemList> display_item_list_;
65 67
66 DISALLOW_COPY_AND_ASSIGN(WebDisplayItemListImpl); 68 DISALLOW_COPY_AND_ASSIGN(WebDisplayItemListImpl);
67 }; 69 };
68 70
69 } // namespace cc_blink 71 } // namespace cc_blink
70 72
71 #endif // CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_ 73 #endif // CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_
OLDNEW
« no previous file with comments | « cc/blink/web_content_layer_impl.cc ('k') | cc/blink/web_display_item_list_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698