diff options
author | Mike Reed <reed@google.com> | 2017-03-02 20:22:35 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-02 20:22:48 +0000 |
commit | ea5e676a7b75600edcde3912886486004ccd7626 (patch) | |
tree | 1ed67f45d493bd4efdef0f0fb83941529aabb2a6 /src/core/SkBitmapDevice.h | |
parent | d7875f57bd5f17ac27f1cb2ace25224299ff2389 (diff) |
Revert "Remove SkDraw from device-draw methods, and enable device-centric clipping."
This reverts commit c77e33f73d3e86cfabf925d6f2e1166f81022575.
Reason for revert: breaks isClipRect
- this CL inspected the conservative clip for this, which is (by definition) a rect
- probably need to query the device for this info
Original change's description:
> Remove SkDraw from device-draw methods, and enable device-centric clipping.
>
> BUG=skia:6214
>
> Change-Id: I593900724310d09133ae4791ef68d38c43762fc2
> Reviewed-on: https://skia-review.googlesource.com/8806
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=bsalomon@google.com,halcanary@google.com,msarett@google.com,robertphillips@google.com,fmalita@chromium.org,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:6214
Change-Id: I9090cbbb9f45b2dd204d9fdc187de2ff714b93f6
Reviewed-on: https://skia-review.googlesource.com/9172
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkBitmapDevice.h')
-rw-r--r-- | src/core/SkBitmapDevice.h | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/core/SkBitmapDevice.h b/src/core/SkBitmapDevice.h index 7f5a8463b3..266b2d9513 100644 --- a/src/core/SkBitmapDevice.h +++ b/src/core/SkBitmapDevice.h @@ -21,6 +21,7 @@ #include "SkSize.h" #include "SkSurfaceProps.h" +class SkDraw; class SkImageFilterCache; class SkMatrix; class SkPaint; @@ -69,12 +70,12 @@ protected: and are handling any looping from the paint, and any effects from the DrawFilter. */ - void drawPaint(const SkPaint& paint) override; - void drawPoints(SkCanvas::PointMode mode, size_t count, + void drawPaint(const SkDraw&, const SkPaint& paint) override; + void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, const SkPoint[], const SkPaint& paint) override; - void drawRect(const SkRect& r, const SkPaint& paint) override; - void drawOval(const SkRect& oval, const SkPaint& paint) override; - void drawRRect(const SkRRect& rr, const SkPaint& paint) override; + void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint) override; + void drawOval(const SkDraw&, const SkRect& oval, const SkPaint& paint) override; + void drawRRect(const SkDraw&, const SkRRect& rr, const SkPaint& paint) override; /** * If pathIsMutable, then the implementation is allowed to cast path to a @@ -87,34 +88,34 @@ protected: * affect the geometry/rasterization, then the pre matrix can just be * pre-concated with the current matrix. */ - void drawPath(const SkPath&, const SkPaint&, const SkMatrix* prePathMatrix, + void drawPath(const SkDraw&, const SkPath&, const SkPaint&, const SkMatrix* prePathMatrix, bool pathIsMutable) override; - void drawBitmap(const SkBitmap&, const SkMatrix&, const SkPaint&) override; - void drawSprite(const SkBitmap&, int x, int y, const SkPaint&) override; + void drawBitmap(const SkDraw&, const SkBitmap&, const SkMatrix&, const SkPaint&) override; + void drawSprite(const SkDraw&, const SkBitmap&, int x, int y, const SkPaint&) override; /** * The default impl. will create a bitmap-shader from the bitmap, * and call drawRect with it. */ - void drawBitmapRect(const SkBitmap&, const SkRect*, const SkRect&, + void drawBitmapRect(const SkDraw&, const SkBitmap&, const SkRect*, const SkRect&, const SkPaint&, SkCanvas::SrcRectConstraint) override; /** * Does not handle text decoration. * Decorations (underline and stike-thru) will be handled by SkCanvas. */ - void drawText(const void* text, size_t len, SkScalar x, SkScalar y, + void drawText(const SkDraw&, const void* text, size_t len, SkScalar x, SkScalar y, const SkPaint&) override; - void drawPosText(const void* text, size_t len, const SkScalar pos[], + void drawPosText(const SkDraw&, const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, const SkPoint& offset, const SkPaint& paint) override; - void drawVertices(SkCanvas::VertexMode, int vertexCount, const SkPoint verts[], + void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount, const SkPoint verts[], const SkPoint texs[], const SkColor colors[], SkBlendMode, const uint16_t indices[], int indexCount, const SkPaint&) override; - void drawDevice(SkBaseDevice*, int x, int y, const SkPaint&) override; + void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, const SkPaint&) override; /////////////////////////////////////////////////////////////////////////// - void drawSpecial(SkSpecialImage*, int x, int y, const SkPaint&) override; + void drawSpecial(const SkDraw&, SkSpecialImage*, int x, int y, const SkPaint&) override; sk_sp<SkSpecialImage> makeSpecial(const SkBitmap&) override; sk_sp<SkSpecialImage> makeSpecial(const SkImage*) override; sk_sp<SkSpecialImage> snapSpecial() override; @@ -133,8 +134,6 @@ protected: void onClipPath(const SkPath& path, SkClipOp, bool aa) override; void onClipRegion(const SkRegion& deviceRgn, SkClipOp) override; void onSetDeviceClipRestriction(SkIRect* mutableClipRestriction) override; - bool onClipIsAA() const override; - void onAsRgnClip(SkRegion*) const override; void validateDevBounds(const SkIRect& r) override; private: @@ -143,9 +142,8 @@ private: friend class SkDraw; friend class SkDrawIter; friend class SkDeviceFilteredPaint; - friend class SkSurface_Raster; - class BDDraw; + friend class SkSurface_Raster; // used to change the backend's pixels (and possibly config/rowbytes) // but cannot change the width/height, so there should be no change to |