Index: cc/playback/image_hijack_canvas.h |
diff --git a/cc/playback/image_hijack_canvas.h b/cc/playback/image_hijack_canvas.h |
index be9a6ba9c3a5527ed928a89864305e0a3021c511..4675f18ee4ff44d976fd255a557b1f9d959872cb 100644 |
--- a/cc/playback/image_hijack_canvas.h |
+++ b/cc/playback/image_hijack_canvas.h |
@@ -7,13 +7,16 @@ |
#include "base/macros.h" |
#include "cc/base/cc_export.h" |
+#include "cc/paint/paint_canvas.h" |
+#include "cc/paint/paint_flags.h" |
+#include "cc/paint/paint_record.h" |
#include "third_party/skia/include/utils/SkNWayCanvas.h" |
namespace cc { |
class ImageDecodeCache; |
-class CC_EXPORT ImageHijackCanvas : public SkNWayCanvas { |
+class CC_EXPORT ImageHijackCanvas : public PaintCanvasPassThrough { |
public: |
ImageHijackCanvas(int width, |
int height, |
@@ -22,31 +25,31 @@ class CC_EXPORT ImageHijackCanvas : public SkNWayCanvas { |
private: |
// Ensure that pictures are unpacked by this canvas, instead of being |
// forwarded to the raster canvas. |
- void onDrawPicture(const SkPicture* picture, |
+ void onDrawPicture(const PaintRecord* picture, |
const SkMatrix* matrix, |
- const SkPaint* paint) override; |
+ const PaintFlags* paint) override; |
void onDrawImage(const SkImage* image, |
SkScalar x, |
SkScalar y, |
- const SkPaint* paint) override; |
+ const PaintFlags* paint) override; |
void onDrawImageRect(const SkImage* image, |
const SkRect* src, |
const SkRect& dst, |
- const SkPaint* paint, |
+ const PaintFlags* paint, |
SrcRectConstraint constraint) override; |
- void onDrawRect(const SkRect&, const SkPaint&) override; |
- void onDrawPath(const SkPath& path, const SkPaint& paint) override; |
- void onDrawOval(const SkRect& r, const SkPaint& paint) override; |
+ void onDrawRect(const SkRect&, const PaintFlags&) override; |
+ void onDrawPath(const SkPath& path, const PaintFlags& paint) override; |
+ void onDrawOval(const SkRect& r, const PaintFlags& paint) override; |
void onDrawArc(const SkRect& r, |
SkScalar start_angle, |
SkScalar sweep_angle, |
bool use_center, |
- const SkPaint& paint) override; |
- void onDrawRRect(const SkRRect& rr, const SkPaint& paint) override; |
+ const PaintFlags& paint) override; |
+ void onDrawRRect(const SkRRect& rr, const PaintFlags& paint) override; |
void onDrawImageNine(const SkImage* image, |
const SkIRect& center, |
const SkRect& dst, |
- const SkPaint* paint) override; |
+ const PaintFlags* paint) override; |
ImageDecodeCache* image_decode_cache_; |