OLD | NEW |
---|---|
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" |
11 #include "third_party/WebKit/public/platform/WebBlendMode.h" | |
12 #include "third_party/WebKit/public/platform/WebContentLayerClient.h" | |
13 #include "third_party/WebKit/public/platform/WebDisplayItemList.h" | 11 #include "third_party/WebKit/public/platform/WebDisplayItemList.h" |
14 #include "third_party/WebKit/public/platform/WebFloatPoint.h" | 12 #include "third_party/WebKit/public/platform/WebFloatPoint.h" |
15 #include "third_party/WebKit/public/platform/WebVector.h" | 13 #include "third_party/WebKit/public/platform/WebVector.h" |
16 #include "third_party/skia/include/core/SkRegion.h" | 14 #include "third_party/skia/include/core/SkRegion.h" |
enne (OOO)
2015/03/26 20:18:09
Did you mean to not change this?
huayong.xu
2015/03/27 01:55:23
In Patch Set 2, I removed WebFloatPoint.h incorrec
enne (OOO)
2015/03/27 17:52:19
Sorry, but my original comment still stands. If y
huayong.xu
2015/03/30 03:51:15
I got it.
Instead of changing includes, I add some
| |
17 #include "third_party/skia/include/core/SkXfermode.h" | 15 #include "third_party/skia/include/core/SkXfermode.h" |
18 #include "ui/gfx/geometry/point_f.h" | 16 #include "ui/gfx/geometry/point_f.h" |
19 | 17 |
20 class SkColorFilter; | 18 class SkColorFilter; |
21 class SkImageFilter; | 19 class SkImageFilter; |
22 class SkMatrix44; | 20 class SkMatrix44; |
23 class SkPath; | 21 class SkPath; |
24 class SkPicture; | 22 class SkPicture; |
25 class SkRRect; | 23 class SkRRect; |
26 | 24 |
(...skipping 13 matching lines...) Expand all Loading... | |
40 const blink::WebVector<SkRRect>& rounded_clip_rects); | 38 const blink::WebVector<SkRRect>& rounded_clip_rects); |
41 virtual void appendEndClipItem(); | 39 virtual void appendEndClipItem(); |
42 virtual void appendClipPathItem(const SkPath& clip_path, | 40 virtual void appendClipPathItem(const SkPath& clip_path, |
43 SkRegion::Op clip_op, | 41 SkRegion::Op clip_op, |
44 bool antialias); | 42 bool antialias); |
45 virtual void appendEndClipPathItem(); | 43 virtual void appendEndClipPathItem(); |
46 virtual void appendFloatClipItem(const blink::WebFloatRect& clip_rect); | 44 virtual void appendFloatClipItem(const blink::WebFloatRect& clip_rect); |
47 virtual void appendEndFloatClipItem(); | 45 virtual void appendEndFloatClipItem(); |
48 virtual void appendTransformItem(const SkMatrix44& matrix); | 46 virtual void appendTransformItem(const SkMatrix44& matrix); |
49 virtual void appendEndTransformItem(); | 47 virtual void appendEndTransformItem(); |
50 // TODO(pdr): Remove this once the blink-side callers have been removed. | |
51 virtual void appendCompositingItem(float opacity, | |
52 SkXfermode::Mode, | |
53 SkColorFilter*); | |
54 virtual void appendCompositingItem(float opacity, | 48 virtual void appendCompositingItem(float opacity, |
55 SkXfermode::Mode, | 49 SkXfermode::Mode, |
56 SkRect* bounds, | 50 SkRect* bounds, |
57 SkColorFilter*); | 51 SkColorFilter*); |
58 virtual void appendEndCompositingItem(); | 52 virtual void appendEndCompositingItem(); |
59 virtual void appendFilterItem(const blink::WebFilterOperations& filters, | 53 virtual void appendFilterItem(const blink::WebFilterOperations& filters, |
60 const blink::WebFloatRect& bounds); | 54 const blink::WebFloatRect& bounds); |
61 virtual void appendEndFilterItem(); | 55 virtual void appendEndFilterItem(); |
62 virtual void appendScrollItem(const blink::WebSize& scrollOffset, | 56 virtual void appendScrollItem(const blink::WebSize& scrollOffset, |
63 ScrollContainerId); | 57 ScrollContainerId); |
64 virtual void appendEndScrollItem(); | 58 virtual void appendEndScrollItem(); |
65 | 59 |
66 private: | 60 private: |
67 scoped_refptr<cc::DisplayItemList> display_item_list_; | 61 scoped_refptr<cc::DisplayItemList> display_item_list_; |
68 | 62 |
69 DISALLOW_COPY_AND_ASSIGN(WebDisplayItemListImpl); | 63 DISALLOW_COPY_AND_ASSIGN(WebDisplayItemListImpl); |
70 }; | 64 }; |
71 | 65 |
72 } // namespace cc_blink | 66 } // namespace cc_blink |
73 | 67 |
74 #endif // CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_ | 68 #endif // CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_ |
OLD | NEW |