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

Unified Diff: cc/blink/web_display_item_list_impl.h

Issue 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase 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 side-by-side diff with in-line comments
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 »
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 472549827e7768b2f6da5f58338f74603161992d..28fd472be39e56568fcdaacb89512987df070963 100644
--- a/cc/blink/web_display_item_list_impl.h
+++ b/cc/blink/web_display_item_list_impl.h
@@ -10,13 +10,10 @@
#include "cc/resources/display_item_list.h"
#include "third_party/WebKit/public/platform/WebBlendMode.h"
#include "third_party/WebKit/public/platform/WebContentLayerClient.h"
+#include "third_party/WebKit/public/platform/WebDisplayItemList.h"
#include "third_party/WebKit/public/platform/WebFloatPoint.h"
#include "third_party/WebKit/public/platform/WebVector.h"
-#if WEB_DISPLAY_ITEM_LIST_IS_DEFINED
-#include "third_party/WebKit/public/platform/WebDisplayItemList.h"
-#endif
-
class SkImageFilter;
class SkMatrix44;
class SkPicture;
@@ -24,12 +21,7 @@ class SkRRect;
namespace cc_blink {
-#if WEB_DISPLAY_ITEM_LIST_IS_DEFINED
class WebDisplayItemListImpl : public blink::WebDisplayItemList {
-#else
-class WebDisplayItemListImpl {
-#endif
-
public:
CC_BLINK_EXPORT WebDisplayItemListImpl();
virtual ~WebDisplayItemListImpl();
@@ -43,6 +35,8 @@ class WebDisplayItemListImpl {
const blink::WebRect& clip_rect,
const blink::WebVector<SkRRect>& rounded_clip_rects);
virtual void appendEndClipItem();
+ virtual void appendFloatClipItem(const blink::WebFloatRect& clip_rect);
+ virtual void appendEndFloatClipItem();
virtual void appendTransformItem(const SkMatrix44& matrix);
virtual void appendEndTransformItem();
virtual void appendTransparencyItem(float opacity,
« 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