05c4a4322e
Reason for revert: Re-landing: Chromium-side fix to be landed with the roll (https://codereview.chromium.org/607853003/) Original issue's description: > Revert of Fix SkTextBlob offset semantics. (patchset #2 id:20001 of https://codereview.chromium.org/605533002/) > > Reason for revert: > Breaking the Chrome builds with the error: > > [14:54:14.317833] ../../skia/ext/pixel_ref_utils.cc:221:16: error: 'drawPosText' marked 'override' but does not override any member functions > [14:54:14.318022] virtual void drawPosText(const SkDraw& draw, > [14:54:14.318082] ^ > > Original issue's description: > > Fix SkTextBlob offset semantics. > > > > Implement proper x/y drawTextBlob() handling by plumbing a > > drawPosText() offset parameter (to act as an additional glyph pos > > translation) throughout the device layer. > > > > The new offset superceeds the existing constY, with a minor semantic > > tweak: whereas previous implementations were ignoring constY in 2D > > positioning mode (scalarsPerGlyph == 2), now the offset is always > > observed, in all positioning modes. We can do this because existing > > drawPosText() clients always pass constY == 0 for full positioning mode. > > > > R=reed@google.com, jvanverth@google.com, robertphillips@google.com > > > > Committed: https://skia.googlesource.com/skia/+/c13bc571d3e61a43b87eb97f0719abd304cafaf2 > > TBR=jvanverth@google.com,reed@google.com,bsalomon@google.com,fmalita@chromium.org > NOTREECHECKS=true > NOTRY=true > > Committed: https://skia.googlesource.com/skia/+/d46b8d2bab7cfba8458432248e1568ac377429e9 R=jvanverth@google.com, reed@google.com, bsalomon@google.com, robertphillips@google.com TBR=bsalomon@google.com, jvanverth@google.com, reed@google.com, robertphillips@google.com NOTREECHECKS=true NOTRY=true Author: fmalita@chromium.org Review URL: https://codereview.chromium.org/607413003
156 lines
5.9 KiB
C++
156 lines
5.9 KiB
C++
|
|
/*
|
|
* Copyright 2006 The Android Open Source Project
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
|
|
#ifndef SkDraw_DEFINED
|
|
#define SkDraw_DEFINED
|
|
|
|
#include "SkCanvas.h"
|
|
#include "SkMask.h"
|
|
#include "SkPaint.h"
|
|
|
|
class SkBitmap;
|
|
class SkClipStack;
|
|
class SkBaseDevice;
|
|
class SkBlitter;
|
|
class SkMatrix;
|
|
class SkPath;
|
|
class SkRegion;
|
|
class SkRasterClip;
|
|
struct SkDrawProcs;
|
|
struct SkRect;
|
|
class SkRRect;
|
|
|
|
class SkDraw {
|
|
public:
|
|
SkDraw();
|
|
SkDraw(const SkDraw& src);
|
|
|
|
void drawPaint(const SkPaint&) const;
|
|
void drawPoints(SkCanvas::PointMode, size_t count, const SkPoint[],
|
|
const SkPaint&, bool forceUseDevice = false) const;
|
|
void drawRect(const SkRect&, const SkPaint&) const;
|
|
void drawRRect(const SkRRect&, const SkPaint&) const;
|
|
/**
|
|
* To save on mallocs, we allow a flag that tells us that srcPath is
|
|
* mutable, so that we don't have to make copies of it as we transform it.
|
|
*
|
|
* If prePathMatrix is not null, it should logically be applied before any
|
|
* stroking or other effects. If there are no effects on the paint that
|
|
* affect the geometry/rasterization, then the pre matrix can just be
|
|
* pre-concated with the current matrix.
|
|
*/
|
|
void drawPath(const SkPath& path, const SkPaint& paint,
|
|
const SkMatrix* prePathMatrix, bool pathIsMutable) const {
|
|
this->drawPath(path, paint, prePathMatrix, pathIsMutable, false);
|
|
}
|
|
|
|
void drawPath(const SkPath& path, const SkPaint& paint,
|
|
SkBlitter* customBlitter = NULL) const {
|
|
this->drawPath(path, paint, NULL, false, false, customBlitter);
|
|
}
|
|
|
|
void drawBitmap(const SkBitmap&, const SkMatrix&, const SkPaint&) const;
|
|
void drawSprite(const SkBitmap&, int x, int y, const SkPaint&) const;
|
|
void drawText(const char text[], size_t byteLength, SkScalar x,
|
|
SkScalar y, const SkPaint& paint) const;
|
|
void drawPosText(const char text[], size_t byteLength,
|
|
const SkScalar pos[], int scalarsPerPosition,
|
|
const SkPoint& offset, const SkPaint& paint) const;
|
|
void drawTextOnPath(const char text[], size_t byteLength,
|
|
const SkPath&, const SkMatrix*, const SkPaint&) const;
|
|
void drawVertices(SkCanvas::VertexMode mode, int count,
|
|
const SkPoint vertices[], const SkPoint textures[],
|
|
const SkColor colors[], SkXfermode* xmode,
|
|
const uint16_t indices[], int ptCount,
|
|
const SkPaint& paint) const;
|
|
|
|
/**
|
|
* Overwrite the target with the path's coverage (i.e. its mask).
|
|
* Will overwrite the entire device, so it need not be zero'd first.
|
|
*
|
|
* Only device A8 is supported right now.
|
|
*/
|
|
void drawPathCoverage(const SkPath& src, const SkPaint& paint,
|
|
SkBlitter* customBlitter = NULL) const {
|
|
this->drawPath(src, paint, NULL, false, true, customBlitter);
|
|
}
|
|
|
|
/** Helper function that creates a mask from a path and an optional maskfilter.
|
|
Note however, that the resulting mask will not have been actually filtered,
|
|
that must be done afterwards (by calling filterMask). The maskfilter is provided
|
|
solely to assist in computing the mask's bounds (if the mode requests that).
|
|
*/
|
|
static bool DrawToMask(const SkPath& devPath, const SkIRect* clipBounds,
|
|
const SkMaskFilter*, const SkMatrix* filterMatrix,
|
|
SkMask* mask, SkMask::CreateMode mode,
|
|
SkPaint::Style style);
|
|
|
|
enum RectType {
|
|
kHair_RectType,
|
|
kFill_RectType,
|
|
kStroke_RectType,
|
|
kPath_RectType
|
|
};
|
|
|
|
/**
|
|
* Based on the paint's style, strokeWidth, and the matrix, classify how
|
|
* to draw the rect. If no special-case is available, returns
|
|
* kPath_RectType.
|
|
*
|
|
* Iff RectType == kStroke_RectType, then strokeSize is set to the device
|
|
* width and height of the stroke.
|
|
*/
|
|
static RectType ComputeRectType(const SkPaint&, const SkMatrix&,
|
|
SkPoint* strokeSize);
|
|
|
|
static bool ShouldDrawTextAsPaths(const SkPaint&, const SkMatrix&);
|
|
void drawText_asPaths(const char text[], size_t byteLength,
|
|
SkScalar x, SkScalar y, const SkPaint&) const;
|
|
void drawPosText_asPaths(const char text[], size_t byteLength,
|
|
const SkScalar pos[], int scalarsPerPosition,
|
|
const SkPoint& offset, const SkPaint&) const;
|
|
|
|
private:
|
|
void drawDevMask(const SkMask& mask, const SkPaint&) const;
|
|
void drawBitmapAsMask(const SkBitmap&, const SkPaint&) const;
|
|
|
|
void drawPath(const SkPath&, const SkPaint&, const SkMatrix* preMatrix,
|
|
bool pathIsMutable, bool drawCoverage,
|
|
SkBlitter* customBlitter = NULL) const;
|
|
|
|
/**
|
|
* Return the current clip bounds, in local coordinates, with slop to account
|
|
* for antialiasing or hairlines (i.e. device-bounds outset by 1, and then
|
|
* run through the inverse of the matrix).
|
|
*
|
|
* If the matrix cannot be inverted, or the current clip is empty, return
|
|
* false and ignore bounds parameter.
|
|
*/
|
|
bool SK_WARN_UNUSED_RESULT
|
|
computeConservativeLocalClipBounds(SkRect* bounds) const;
|
|
|
|
public:
|
|
const SkBitmap* fBitmap; // required
|
|
const SkMatrix* fMatrix; // required
|
|
const SkRegion* fClip; // DEPRECATED
|
|
const SkRasterClip* fRC; // required
|
|
|
|
const SkClipStack* fClipStack; // optional
|
|
SkBaseDevice* fDevice; // optional
|
|
SkDrawProcs* fProcs; // optional
|
|
|
|
#ifdef SK_DEBUG
|
|
void validate() const;
|
|
#else
|
|
void validate() const {}
|
|
#endif
|
|
};
|
|
|
|
#endif
|