зеркало из https://github.com/mozilla/moz-skia.git
Simple Build fix. Unreviewed.
git-svn-id: http://skia.googlecode.com/svn/trunk@7313 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
f3b1223e6d
Коммит
3f5ecd6cb4
|
@ -537,12 +537,12 @@ static void computeFontMetricsTopBottom(const SkPaint& paint, SkScalar topbot[2]
|
|||
|
||||
void SkPictureRecord::addFontMetricsTopBottom(const SkPaint& paint, const SkFlatData& flat,
|
||||
SkScalar minY, SkScalar maxY) {
|
||||
if (!flat->isTopBotWritten()) {
|
||||
computeFontMetricsTopBottom(paint, flat->writableTopBot());
|
||||
SkASSERT(flat->isTopBotWritten());
|
||||
if (!flat.isTopBotWritten()) {
|
||||
computeFontMetricsTopBottom(paint, flat.writableTopBot());
|
||||
SkASSERT(flat.isTopBotWritten());
|
||||
}
|
||||
addScalar(flat->topBot()[0] + minY);
|
||||
addScalar(flat->topBot()[1] + maxY);
|
||||
addScalar(flat.topBot()[0] + minY);
|
||||
addScalar(flat.topBot()[1] + maxY);
|
||||
}
|
||||
|
||||
void SkPictureRecord::drawText(const void* text, size_t byteLength, SkScalar x,
|
||||
|
|
|
@ -75,7 +75,7 @@ public:
|
|||
virtual void drawData(const void*, size_t) SK_OVERRIDE;
|
||||
virtual bool isDrawingToLayer() const SK_OVERRIDE;
|
||||
|
||||
void addFontMetricsTopBottom(const SkPaint& paint, const SkFlatData*,
|
||||
void addFontMetricsTopBottom(const SkPaint& paint, const SkFlatData&,
|
||||
SkScalar minY, SkScalar maxY);
|
||||
|
||||
const SkTDArray<SkPicture* >& getPictureRefs() const {
|
||||
|
|
Загрузка…
Ссылка в новой задаче