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

Unified Diff: cc/blink/web_display_item_list_impl.h

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/base/switches.cc ('k') | cc/blink/web_display_item_list_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/blink/web_display_item_list_impl.h
diff --git a/cc/blink/web_display_item_list_impl.h b/cc/blink/web_display_item_list_impl.h
index cd35975caeb5ae531bf631108b993ab6a674aa41..f2ff8c67411f0cfbd0d2ee04141142e454b6313c 100644
--- a/cc/blink/web_display_item_list_impl.h
+++ b/cc/blink/web_display_item_list_impl.h
@@ -14,6 +14,7 @@
#include "third_party/WebKit/public/platform/WebFloatPoint.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/skia/include/core/SkRegion.h"
+#include "ui/gfx/geometry/point_f.h"
class SkImageFilter;
class SkMatrix44;
@@ -31,7 +32,8 @@ class WebDisplayItemListImpl : public blink::WebDisplayItemList {
scoped_refptr<cc::DisplayItemList> ToDisplayItemList();
// blink::WebDisplayItemList implementation.
- virtual void appendDrawingItem(SkPicture* picture,
+ virtual void appendDrawingItem(const SkPicture*);
+ virtual void appendDrawingItem(SkPicture*,
const blink::WebFloatPoint& location);
virtual void appendClipItem(
const blink::WebRect& clip_rect,
@@ -48,8 +50,13 @@ class WebDisplayItemListImpl : public blink::WebDisplayItemList {
virtual void appendTransparencyItem(float opacity,
blink::WebBlendMode blend_mode);
virtual void appendEndTransparencyItem();
+#if FILTER_DISPLAY_ITEM_USES_FILTER_OPERATIONS
+ virtual void appendFilterItem(const blink::WebFilterOperations& filters,
+ const blink::WebFloatRect& bounds);
+#else
virtual void appendFilterItem(SkImageFilter* filter,
const blink::WebFloatRect& bounds);
+#endif
virtual void appendEndFilterItem();
private:
« no previous file with comments | « cc/base/switches.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