From be59a35641616a4cf23c4a13fa0632624b021c1b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 20 Nov 2017 10:33:36 +0100 Subject: BASELINE: Update Chromium to 62.0.3202.101 Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac Reviewed-by: Alexandru Croitor --- chromium/cc/paint/record_paint_canvas.h | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'chromium/cc/paint/record_paint_canvas.h') diff --git a/chromium/cc/paint/record_paint_canvas.h b/chromium/cc/paint/record_paint_canvas.h index d5b6d898a97..b54c9efc6bf 100644 --- a/chromium/cc/paint/record_paint_canvas.h +++ b/chromium/cc/paint/record_paint_canvas.h @@ -19,12 +19,12 @@ namespace cc { -class PaintOpBuffer; +class DisplayItemList; class PaintFlags; class CC_PAINT_EXPORT RecordPaintCanvas final : public PaintCanvas { public: - explicit RecordPaintCanvas(PaintOpBuffer* buffer, const SkRect& bounds); + RecordPaintCanvas(DisplayItemList* list, const SkRect& bounds); ~RecordPaintCanvas() override; SkMetaData& getMetaData() override; @@ -71,15 +71,6 @@ class CC_PAINT_EXPORT RecordPaintCanvas final : public PaintCanvas { void drawDRRect(const SkRRect& outer, const SkRRect& inner, const PaintFlags& flags) override; - void drawCircle(SkScalar cx, - SkScalar cy, - SkScalar radius, - const PaintFlags& flags) override; - void drawArc(const SkRect& oval, - SkScalar start_angle, - SkScalar sweep_angle, - bool use_center, - const PaintFlags& flags) override; void drawRoundRect(const SkRect& rect, SkScalar rx, SkScalar ry, @@ -99,15 +90,6 @@ class CC_PAINT_EXPORT RecordPaintCanvas final : public PaintCanvas { SkScalar top, const PaintFlags* flags) override; - void drawText(const void* text, - size_t byte_length, - SkScalar x, - SkScalar y, - const PaintFlags& flags) override; - void drawPosText(const void* text, - size_t byte_length, - const SkPoint pos[], - const PaintFlags& flags) override; void drawTextBlob(sk_sp blob, SkScalar x, SkScalar y, @@ -136,7 +118,7 @@ class CC_PAINT_EXPORT RecordPaintCanvas final : public PaintCanvas { const SkNoDrawCanvas* GetCanvas() const; SkNoDrawCanvas* GetCanvas(); - PaintOpBuffer* buffer_; + DisplayItemList* list_; // TODO(enne): Although RecordPaintCanvas is mostly a write-only interface // where paint commands are stored, occasionally users of PaintCanvas want -- cgit v1.2.3