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

Unified Diff: cc/blink/web_display_item_list_impl.h

Issue 960873002: Update from https://crrev.com/318214 (Closed) Base URL: https://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/blink/cc_blink.gyp ('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 8ec7a152d054ab6652ebc5081e2570ec33f38fdc..2bb1b90b7ff72e01975f2c4d70d13422d93a29ab 100644
--- a/cc/blink/web_display_item_list_impl.h
+++ b/cc/blink/web_display_item_list_impl.h
@@ -14,8 +14,10 @@
#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 "third_party/skia/include/core/SkXfermode.h"
#include "ui/gfx/geometry/point_f.h"
+class SkColorFilter;
class SkImageFilter;
class SkMatrix44;
class SkPath;
@@ -45,9 +47,15 @@ class WebDisplayItemListImpl : public blink::WebDisplayItemList {
virtual void appendEndFloatClipItem();
virtual void appendTransformItem(const SkMatrix44& matrix);
virtual void appendEndTransformItem();
- virtual void appendTransparencyItem(float opacity,
- blink::WebBlendMode blend_mode);
- virtual void appendEndTransparencyItem();
+ // TODO(pdr): Remove this once the blink-side callers have been removed.
+ virtual void appendCompositingItem(float opacity,
+ SkXfermode::Mode,
+ SkColorFilter*);
+ virtual void appendCompositingItem(float opacity,
+ SkXfermode::Mode,
+ SkRect* bounds,
+ SkColorFilter*);
+ virtual void appendEndCompositingItem();
virtual void appendFilterItem(const blink::WebFilterOperations& filters,
const blink::WebFloatRect& bounds);
virtual void appendEndFilterItem();
« no previous file with comments | « cc/blink/cc_blink.gyp ('k') | cc/blink/web_display_item_list_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698