8f924ac0ce
This reverts commit c56e2e5aa6.
Reason for revert: suspected of breaking chrome roll
Original change's description:
> Add new virts, hide old ones
>
> Add virtuals for the draw methods that now take sampling/filtermode.
>
> drawImage
> drawImageRect
> drawImageLattice
> drawAtlas
>
> Add a flag that can remove the older virtuals, once each client has
> stopped overriding them. In that situation, the older public methods
> will simplify extract the sampling from the paint, and call the new
> public methods.
>
> Bug: skia:11105, skia:7650
> Change-Id: I8b0029727295caa983e8148fc743a55cfbecd043
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347022
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,fmalita@chromium.org,reed@google.com
Change-Id: I0a90952c11a180d918126ea06a630f4a0bf9b49b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:11105
Bug: skia:7650
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348194
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
82 lines
4.1 KiB
C++
82 lines
4.1 KiB
C++
/*
|
|
* Copyright 2018 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkCanvasVirtualEnforcer_DEFINED
|
|
#define SkCanvasVirtualEnforcer_DEFINED
|
|
|
|
#include "include/core/SkCanvas.h"
|
|
|
|
// If you would ordinarily want to inherit from Base (eg SkCanvas, SkNWayCanvas), instead
|
|
// inherit from SkCanvasVirtualEnforcer<Base>, which will make the build fail if you forget
|
|
// to override one of SkCanvas' key virtual hooks.
|
|
template <typename Base>
|
|
class SkCanvasVirtualEnforcer : public Base {
|
|
public:
|
|
using Base::Base;
|
|
|
|
protected:
|
|
void onDrawPaint(const SkPaint& paint) override = 0;
|
|
void onDrawBehind(const SkPaint&) override {} // make zero after android updates
|
|
void onDrawRect(const SkRect& rect, const SkPaint& paint) override = 0;
|
|
void onDrawRRect(const SkRRect& rrect, const SkPaint& paint) override = 0;
|
|
void onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
|
|
const SkPaint& paint) override = 0;
|
|
void onDrawOval(const SkRect& rect, const SkPaint& paint) override = 0;
|
|
void onDrawArc(const SkRect& rect, SkScalar startAngle, SkScalar sweepAngle, bool useCenter,
|
|
const SkPaint& paint) override = 0;
|
|
void onDrawPath(const SkPath& path, const SkPaint& paint) override = 0;
|
|
void onDrawRegion(const SkRegion& region, const SkPaint& paint) override = 0;
|
|
|
|
void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
|
|
const SkPaint& paint) override = 0;
|
|
|
|
void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
|
|
const SkPoint texCoords[4], SkBlendMode mode,
|
|
const SkPaint& paint) override = 0;
|
|
void onDrawPoints(SkCanvas::PointMode mode, size_t count, const SkPoint pts[],
|
|
const SkPaint& paint) override = 0;
|
|
|
|
// restore me later when clients are updated
|
|
// void onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint&) override = 0;
|
|
|
|
void onDrawImage(const SkImage* image, SkScalar dx, SkScalar dy,
|
|
const SkPaint* paint) override = 0;
|
|
void onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
|
|
const SkPaint* paint, SkCanvas::SrcRectConstraint constraint) override = 0;
|
|
void onDrawImageLattice(const SkImage* image, const SkCanvas::Lattice& lattice,
|
|
const SkRect& dst, const SkPaint* paint) override = 0;
|
|
|
|
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
|
|
// This is under active development for Chrome and not used in Android. Hold off on adding
|
|
// implementations in Android's SkCanvas subclasses until this stabilizes.
|
|
void onDrawEdgeAAQuad(const SkRect& rect, const SkPoint clip[4],
|
|
SkCanvas::QuadAAFlags aaFlags, const SkColor4f& color, SkBlendMode mode) override {}
|
|
void onDrawEdgeAAImageSet(const SkCanvas::ImageSetEntry imageSet[], int count,
|
|
const SkPoint dstClips[], const SkMatrix preViewMatrices[], const SkPaint* paint,
|
|
SkCanvas::SrcRectConstraint constraint) override {}
|
|
#else
|
|
void onDrawEdgeAAQuad(const SkRect& rect, const SkPoint clip[4],
|
|
SkCanvas::QuadAAFlags aaFlags, const SkColor4f& color, SkBlendMode mode) override = 0;
|
|
void onDrawEdgeAAImageSet(const SkCanvas::ImageSetEntry imageSet[], int count,
|
|
const SkPoint dstClips[], const SkMatrix preViewMatrices[], const SkPaint* paint,
|
|
SkCanvas::SrcRectConstraint constraint) override = 0;
|
|
#endif
|
|
|
|
void onDrawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect rect[],
|
|
const SkColor colors[], int count, SkBlendMode mode, const SkRect* cull,
|
|
const SkPaint* paint) override = 0;
|
|
|
|
void onDrawAnnotation(const SkRect& rect, const char key[], SkData* value) override = 0;
|
|
void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&) override = 0;
|
|
|
|
void onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) override = 0;
|
|
void onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
|
|
const SkPaint* paint) override = 0;
|
|
};
|
|
|
|
#endif
|