diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 17:21:03 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 16:25:15 +0000 |
commit | c551f43206405019121bd2b2c93714319a0a3300 (patch) | |
tree | 1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/cc/paint/skia_paint_canvas.h | |
parent | 7961cea6d1041e3e454dae6a1da660b453efd238 (diff) |
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/paint/skia_paint_canvas.h')
-rw-r--r-- | chromium/cc/paint/skia_paint_canvas.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chromium/cc/paint/skia_paint_canvas.h b/chromium/cc/paint/skia_paint_canvas.h index 6ba29a621d1..3dc125172fa 100644 --- a/chromium/cc/paint/skia_paint_canvas.h +++ b/chromium/cc/paint/skia_paint_canvas.h @@ -53,6 +53,10 @@ class CC_PAINT_EXPORT SkiaPaintCanvas final : public PaintCanvas { SkImageInfo imageInfo() const override; + void* accessTopLayerPixels(SkImageInfo* info, + size_t* rowBytes, + SkIPoint* origin = nullptr) override; + void flush() override; int save() override; @@ -122,7 +126,6 @@ class CC_PAINT_EXPORT SkiaPaintCanvas final : public PaintCanvas { void drawPicture(sk_sp<const PaintRecord> record) override; bool isClipEmpty() const override; - bool isClipRect() const override; const SkMatrix& getTotalMatrix() const override; void Annotate(AnnotationType type, @@ -130,9 +133,9 @@ class CC_PAINT_EXPORT SkiaPaintCanvas final : public PaintCanvas { sk_sp<SkData> data) override; // Don't shadow non-virtual helper functions. + using PaintCanvas::clipPath; using PaintCanvas::clipRect; using PaintCanvas::clipRRect; - using PaintCanvas::clipPath; using PaintCanvas::drawColor; using PaintCanvas::drawImage; using PaintCanvas::drawPicture; @@ -152,6 +155,7 @@ class CC_PAINT_EXPORT SkiaPaintCanvas final : public PaintCanvas { } SkCanvas* canvas_; + SkBitmap bitmap_; std::unique_ptr<SkCanvas> owned_; ImageProvider* image_provider_ = nullptr; |