AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SkPackedID

Browse Source 
Since the unichar to X system has been removed from SkStrike, there
is no need for having SkPackedID be a super class of the last remaining
class SkPackedGlyphID.

+ misc cleanups

Change-Id: I796cdff83b745ac0443df27b1ab56909226e72d3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/215605
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Herb Derby 2019-05-23 11:35:56 -04:00 committed by Skia Commit-Bot
parent f73b8db50b
commit 8207b641f5
1 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/core/SkGlyph.h
View File

@ -25,45 +25,39 @@ class SkScalerContext;
#define kMaxGlyphWidth (1<<13)
/** (glyph-index or unicode-point) + subpixel-pos */
struct SkPackedID {
static constexpr uint32_t kImpossibleID = ~0;
/** SkGlyphID + subpixel-pos */
struct SkPackedGlyphID {
static constexpr uint32_t kImpossibleID = ~0u;
enum {
kSubBits = 2,
kSubMask = ((1 << kSubBits) - 1),
kSubShift = 24, // must be large enough for glyphs and unichars
kCodeMask = ((1 << kSubShift) - 1),
kSubBits = 2u,
kSubMask = ((1u << kSubBits) - 1),
kSubShift = 24u, // must be large enough for glyphs and unichars
kCodeMask = ((1u << kSubShift) - 1),
// relative offsets for X and Y subpixel bits
kSubShiftX = kSubBits,
kSubShiftY = 0
};
SkPackedID(uint32_t code) {
SkASSERT(code <= kCodeMask);
SkASSERT(code != kImpossibleID);
fID = code;
constexpr explicit SkPackedGlyphID(SkGlyphID glyphID)
: fID{glyphID} { }
constexpr SkPackedGlyphID(SkGlyphID glyphID, SkFixed x, SkFixed y)
: fID {PackIDXY(glyphID, x, y)} {
SkASSERT(fID != kImpossibleID);
}
SkPackedID(uint32_t code, SkFixed x, SkFixed y) {
SkASSERT(code <= kCodeMask);
x = FixedToSub(x);
y = FixedToSub(y);
uint32_t ID = (x << (kSubShift + kSubShiftX)) |
(y << (kSubShift + kSubShiftY)) |
code;
SkASSERT(ID != kImpossibleID);
fID = ID;
}
constexpr SkPackedGlyphID(SkGlyphID code, SkIPoint pt)
: SkPackedGlyphID(code, pt.fX, pt.fY) { }
constexpr SkPackedID() : fID(kImpossibleID) {}
constexpr SkPackedGlyphID() : fID{kImpossibleID} {}
bool operator==(const SkPackedID& that) const {
bool operator==(const SkPackedGlyphID& that) const {
return fID == that.fID;
}
bool operator!=(const SkPackedID& that) const {
bool operator!=(const SkPackedGlyphID& that) const {
return !(*this == that);
}
bool operator<(SkPackedID that) const {
bool operator<(SkPackedGlyphID that) const {
return this->fID < that.fID;
}
@ -94,42 +88,38 @@ struct SkPackedID {
}
private:
static unsigned ID2SubX(uint32_t id) {
static constexpr uint32_t PackIDXY(SkGlyphID glyphID, SkFixed x, SkFixed y) {
return (FixedToSub(x) << (kSubShift + kSubShiftX))
| (FixedToSub(y) << (kSubShift + kSubShiftY))
| glyphID;
}
static constexpr unsigned ID2SubX(uint32_t id) {
return id >> (kSubShift + kSubShiftX);
}
static unsigned ID2SubY(uint32_t id) {
static constexpr unsigned ID2SubY(uint32_t id) {
return (id >> (kSubShift + kSubShiftY)) & kSubMask;
}
static unsigned FixedToSub(SkFixed n) {
static constexpr unsigned FixedToSub(SkFixed n) {
return (n >> (16 - kSubBits)) & kSubMask;
}
static SkFixed SubToFixed(unsigned sub) {
static constexpr SkFixed SubToFixed(uint32_t sub) {
SkASSERT(sub <= kSubMask);
return sub << (16 - kSubBits);
return sub << (16u - kSubBits);
}
uint32_t fID;
};
struct SkPackedGlyphID : public SkPackedID {
SkPackedGlyphID(SkGlyphID code) : SkPackedID(code) { }
SkPackedGlyphID(SkGlyphID code, SkFixed x, SkFixed y) : SkPackedID(code, x, y) { }
SkPackedGlyphID(SkGlyphID code, SkIPoint pt) : SkPackedID(code, pt.x(), pt.y()) { }
constexpr SkPackedGlyphID() = default;
SkGlyphID code() const {
return SkTo<SkGlyphID>(SkPackedID::code());
}
};
class SkGlyph {
struct PathData;
public:
constexpr explicit SkGlyph(SkPackedGlyphID id) : fID{id} {}
static constexpr SkFixed kSubpixelRound = SK_FixedHalf >> SkPackedID::kSubBits;
static constexpr SkFixed kSubpixelRound = SK_FixedHalf >> SkPackedGlyphID::kSubBits;
bool isEmpty() const { return fWidth == 0 || fHeight == 0; }
bool isJustAdvance() const { return MASK_FORMAT_JUST_ADVANCE == fMaskFormat; }