зеркало из https://github.com/mozilla/moz-skia.git
safeUnref() -> SkSafeUnref()
git-svn-id: http://skia.googlecode.com/svn/trunk@785 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
1b7c1b6fa8
Коммит
dd53d91b60
|
@ -16,9 +16,9 @@ static inline SkPMColor rgb2gray(SkPMColor c)
|
||||||
unsigned r = SkGetPackedR32(c);
|
unsigned r = SkGetPackedR32(c);
|
||||||
unsigned g = SkGetPackedG32(c);
|
unsigned g = SkGetPackedG32(c);
|
||||||
unsigned b = SkGetPackedB32(c);
|
unsigned b = SkGetPackedB32(c);
|
||||||
|
|
||||||
unsigned x = r * 5 + g * 7 + b * 4 >> 4;
|
unsigned x = r * 5 + g * 7 + b * 4 >> 4;
|
||||||
|
|
||||||
return SkPackARGB32(0, x, x, x) | (c & (SK_A32_MASK << SK_A32_SHIFT));
|
return SkPackARGB32(0, x, x, x) | (c & (SK_A32_MASK << SK_A32_SHIFT));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ public:
|
||||||
for (int i = 0; i < count; i++)
|
for (int i = 0; i < count; i++)
|
||||||
result[i] = src[i] & mask;
|
result[i] = src[i] & mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SkPMColor fMask;
|
SkPMColor fMask;
|
||||||
};
|
};
|
||||||
|
@ -66,7 +66,7 @@ public:
|
||||||
virtual void flatten(SkFlattenableWriteBuffer& buffer)
|
virtual void flatten(SkFlattenableWriteBuffer& buffer)
|
||||||
{
|
{
|
||||||
this->INHERITED::flatten(buffer);
|
this->INHERITED::flatten(buffer);
|
||||||
|
|
||||||
buffer.writeScalar(fRadius);
|
buffer.writeScalar(fRadius);
|
||||||
}
|
}
|
||||||
virtual Factory getFactory() { return CreateProc; }
|
virtual Factory getFactory() { return CreateProc; }
|
||||||
|
@ -86,7 +86,7 @@ protected:
|
||||||
}
|
}
|
||||||
dst->addCircle(loc.fX, loc.fY, fRadius);
|
dst->addCircle(loc.fX, loc.fY, fRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
Dot2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
|
Dot2DPathEffect(SkFlattenableReadBuffer& buffer) : Sk2DPathEffect(buffer)
|
||||||
{
|
{
|
||||||
fRadius = buffer.readScalar();
|
fRadius = buffer.readScalar();
|
||||||
|
@ -147,7 +147,7 @@ typedef void (*raster_proc)(SkLayerRasterizer*, SkPaint&);
|
||||||
#include "SkXfermode.h"
|
#include "SkXfermode.h"
|
||||||
|
|
||||||
static void apply_shader(SkPaint* paint, float scale)
|
static void apply_shader(SkPaint* paint, float scale)
|
||||||
{
|
{
|
||||||
SkPaint p;
|
SkPaint p;
|
||||||
SkLayerRasterizer* rast = new SkLayerRasterizer;
|
SkLayerRasterizer* rast = new SkLayerRasterizer;
|
||||||
|
|
||||||
|
@ -169,10 +169,10 @@ public:
|
||||||
fInterp = 0;
|
fInterp = 0;
|
||||||
fDx = SK_Scalar1/64;
|
fDx = SK_Scalar1/64;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~ClockFaceView()
|
virtual ~ClockFaceView()
|
||||||
{
|
{
|
||||||
fFace->safeUnref();
|
SkSafeUnref(fFace);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -186,22 +186,22 @@ protected:
|
||||||
}
|
}
|
||||||
return this->INHERITED::onQuery(evt);
|
return this->INHERITED::onQuery(evt);
|
||||||
}
|
}
|
||||||
|
|
||||||
void drawBG(SkCanvas* canvas)
|
void drawBG(SkCanvas* canvas)
|
||||||
{
|
{
|
||||||
// canvas->drawColor(0xFFDDDDDD);
|
// canvas->drawColor(0xFFDDDDDD);
|
||||||
canvas->drawColor(SK_ColorWHITE);
|
canvas->drawColor(SK_ColorWHITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void drawdots(SkCanvas* canvas, const SkPaint& orig) {
|
static void drawdots(SkCanvas* canvas, const SkPaint& orig) {
|
||||||
SkTDArray<SkPoint> pts;
|
SkTDArray<SkPoint> pts;
|
||||||
SkPathEffect* pe = makepe(0, &pts);
|
SkPathEffect* pe = makepe(0, &pts);
|
||||||
|
|
||||||
SkScalar width = -1;
|
SkScalar width = -1;
|
||||||
SkPath path, dstPath;
|
SkPath path, dstPath;
|
||||||
orig.getTextPath("9", 1, 0, 0, &path);
|
orig.getTextPath("9", 1, 0, 0, &path);
|
||||||
pe->filterPath(&dstPath, path, &width);
|
pe->filterPath(&dstPath, path, &width);
|
||||||
|
|
||||||
SkPaint p;
|
SkPaint p;
|
||||||
p.setAntiAlias(true);
|
p.setAntiAlias(true);
|
||||||
p.setStrokeWidth(10);
|
p.setStrokeWidth(10);
|
||||||
|
@ -209,14 +209,14 @@ protected:
|
||||||
canvas->drawPoints(SkCanvas::kPoints_PointMode, pts.count(), pts.begin(),
|
canvas->drawPoints(SkCanvas::kPoints_PointMode, pts.count(), pts.begin(),
|
||||||
p);
|
p);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void onDraw(SkCanvas* canvas) {
|
virtual void onDraw(SkCanvas* canvas) {
|
||||||
this->drawBG(canvas);
|
this->drawBG(canvas);
|
||||||
|
|
||||||
SkScalar x = SkIntToScalar(20);
|
SkScalar x = SkIntToScalar(20);
|
||||||
SkScalar y = SkIntToScalar(300);
|
SkScalar y = SkIntToScalar(300);
|
||||||
SkPaint paint;
|
SkPaint paint;
|
||||||
|
|
||||||
paint.setAntiAlias(true);
|
paint.setAntiAlias(true);
|
||||||
paint.setTextSize(SkIntToScalar(240));
|
paint.setTextSize(SkIntToScalar(240));
|
||||||
paint.setTypeface(SkTypeface::CreateFromName("sans-serif",
|
paint.setTypeface(SkTypeface::CreateFromName("sans-serif",
|
||||||
|
@ -225,7 +225,7 @@ protected:
|
||||||
SkString str("9");
|
SkString str("9");
|
||||||
|
|
||||||
paint.setTypeface(fFace);
|
paint.setTypeface(fFace);
|
||||||
|
|
||||||
apply_shader(&paint, fInterp);
|
apply_shader(&paint, fInterp);
|
||||||
canvas->drawText(str.c_str(), str.size(), x, y, paint);
|
canvas->drawText(str.c_str(), str.size(), x, y, paint);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче