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

Side by Side Diff: cc/blink/web_display_item_list_impl.h

Issue 836203002: Remove #ifs related to WebDisplayItemList (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « cc/blink/web_content_layer_impl.cc ('k') | no next file » | 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"
11 #include "third_party/WebKit/public/platform/WebBlendMode.h" 11 #include "third_party/WebKit/public/platform/WebBlendMode.h"
12 #include "third_party/WebKit/public/platform/WebContentLayerClient.h" 12 #include "third_party/WebKit/public/platform/WebContentLayerClient.h"
13 #include "third_party/WebKit/public/platform/WebDisplayItemList.h"
13 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 14 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
14 #include "third_party/WebKit/public/platform/WebVector.h" 15 #include "third_party/WebKit/public/platform/WebVector.h"
15 16
16 #if WEB_DISPLAY_ITEM_LIST_IS_DEFINED
17 #include "third_party/WebKit/public/platform/WebDisplayItemList.h"
18 #endif
19
20 class SkImageFilter; 17 class SkImageFilter;
21 class SkMatrix44; 18 class SkMatrix44;
22 class SkPicture; 19 class SkPicture;
23 class SkRRect; 20 class SkRRect;
24 21
25 namespace cc_blink { 22 namespace cc_blink {
26 23
27 #if WEB_DISPLAY_ITEM_LIST_IS_DEFINED
28 class WebDisplayItemListImpl : public blink::WebDisplayItemList { 24 class WebDisplayItemListImpl : public blink::WebDisplayItemList {
29 #else
30 class WebDisplayItemListImpl {
31 #endif
32
33 public: 25 public:
34 CC_BLINK_EXPORT WebDisplayItemListImpl(); 26 CC_BLINK_EXPORT WebDisplayItemListImpl();
35 virtual ~WebDisplayItemListImpl(); 27 virtual ~WebDisplayItemListImpl();
36 28
37 scoped_refptr<cc::DisplayItemList> ToDisplayItemList(); 29 scoped_refptr<cc::DisplayItemList> ToDisplayItemList();
38 30
39 // blink::WebDisplayItemList implementation. 31 // blink::WebDisplayItemList implementation.
40 virtual void appendDrawingItem(SkPicture* picture, 32 virtual void appendDrawingItem(SkPicture* picture,
41 const blink::WebFloatPoint& location); 33 const blink::WebFloatPoint& location);
42 virtual void appendClipItem( 34 virtual void appendClipItem(
(...skipping 13 matching lines...) Expand all
56 48
57 private: 49 private:
58 scoped_refptr<cc::DisplayItemList> display_item_list_; 50 scoped_refptr<cc::DisplayItemList> display_item_list_;
59 51
60 DISALLOW_COPY_AND_ASSIGN(WebDisplayItemListImpl); 52 DISALLOW_COPY_AND_ASSIGN(WebDisplayItemListImpl);
61 }; 53 };
62 54
63 } // namespace cc_blink 55 } // namespace cc_blink
64 56
65 #endif // CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_ 57 #endif // CC_BLINK_WEB_DISPLAY_ITEM_LIST_IMPL_H_
OLDNEW
« no previous file with comments | « cc/blink/web_content_layer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698