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

Cleanup GM:pictureshadertile

Browse Source 
Post review cleanup for https://codereview.chromium.org/733203005/

TBR=robertphillips@google.com

Review URL: https://codereview.chromium.org/784053002
This commit is contained in:
fmalita 2014-12-09 05:23:20 -08:00 committed by Commit bot
parent 0c4aba6edb
commit 6cd1181bc1
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gm/pictureshadertile.cpp
View File

@ -57,31 +57,54 @@ static const struct {
{ -0.25f, -0.25f, 1, 0.5f, 0, 0 },
};
static void draw_scene(SkCanvas* canvas, SkScalar pictureSize) {
canvas->clear(SK_ColorWHITE);
SkPaint paint;
paint.setColor(SK_ColorGREEN);
paint.setStyle(SkPaint::kFill_Style);
paint.setAntiAlias(true);
canvas->drawCircle(pictureSize / 4, pictureSize / 4, pictureSize / 4, paint);
canvas->drawRect(SkRect::MakeXYWH(pictureSize / 2, pictureSize / 2,
pictureSize / 2, pictureSize / 2), paint);
paint.setColor(SK_ColorRED);
canvas->drawLine(pictureSize / 2, pictureSize * 1 / 3,
pictureSize / 2, pictureSize * 2 / 3, paint);
canvas->drawLine(pictureSize * 1 / 3, pictureSize / 2,
pictureSize * 2 / 3, pictureSize / 2, paint);
paint.setColor(SK_ColorBLACK);
paint.setStyle(SkPaint::kStroke_Style);
canvas->drawRect(SkRect::MakeWH(pictureSize, pictureSize), paint);
}
class PictureShaderTileGM : public skiagm::GM {
protected:
virtual uint32_t onGetFlags() const SK_OVERRIDE {
uint32_t onGetFlags() const SK_OVERRIDE {
return kSkipTiled_Flag;
}
virtual SkString onShortName() SK_OVERRIDE {
SkString onShortName() SK_OVERRIDE {
return SkString("pictureshadertile");
}
virtual SkISize onISize() SK_OVERRIDE {
SkISize onISize() SK_OVERRIDE {
return SkISize::Make(800, 600);
}
virtual void onOnceBeforeDraw() SK_OVERRIDE {
void onOnceBeforeDraw() SK_OVERRIDE {
SkPictureRecorder recorder;
SkCanvas* pictureCanvas = recorder.beginRecording(kPictureSize, kPictureSize);
drawScene(pictureCanvas, kPictureSize);
draw_scene(pictureCanvas, kPictureSize);
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
SkPoint offset = SkPoint::Make(100, 100);
pictureCanvas = recorder.beginRecording(SkRect::MakeXYWH(offset.x(), offset.y(),
kPictureSize, kPictureSize));
pictureCanvas->translate(offset.x(), offset.y());
drawScene(pictureCanvas, kPictureSize);
draw_scene(pictureCanvas, kPictureSize);
SkAutoTUnref<SkPicture> offsetPicture(recorder.endRecording());
for (unsigned i = 0; i < SK_ARRAY_COUNT(tiles); ++i) {
@ -105,14 +128,14 @@ protected:
}
fShaders[i].reset(SkShader::CreatePictureShader(picturePtr,
SkShader::kRepeat_TileMode,
SkShader::kRepeat_TileMode,
&localMatrix,
tilePtr));
SkShader::kRepeat_TileMode,
SkShader::kRepeat_TileMode,
&localMatrix,
tilePtr));
}
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->clear(SK_ColorBLACK);
SkPaint paint;
@ -130,29 +153,6 @@ protected:
}
private:
void drawScene(SkCanvas* canvas, SkScalar pictureSize) {
canvas->clear(SK_ColorWHITE);
SkPaint paint;
paint.setColor(SK_ColorGREEN);
paint.setStyle(SkPaint::kFill_Style);
paint.setAntiAlias(true);
canvas->drawCircle(pictureSize / 4, pictureSize / 4, pictureSize / 4, paint);
canvas->drawRect(SkRect::MakeXYWH(pictureSize / 2, pictureSize / 2,
pictureSize / 2, pictureSize / 2), paint);
paint.setColor(SK_ColorRED);
canvas->drawLine(pictureSize / 2, pictureSize * 1 / 3,
pictureSize / 2, pictureSize * 2 / 3, paint);
canvas->drawLine(pictureSize * 1 / 3, pictureSize / 2,
pictureSize * 2 / 3, pictureSize / 2, paint);
paint.setColor(SK_ColorBLACK);
paint.setStyle(SkPaint::kStroke_Style);
canvas->drawRect(SkRect::MakeWH(pictureSize, pictureSize), paint);
}
SkAutoTUnref<SkShader> fShaders[SK_ARRAY_COUNT(tiles)];
typedef GM INHERITED;