Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(439)

Unified Diff: gm/pictureshader.cpp

Issue 852213002: SkPictureShader should handle negative scaling gracefully. (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: rerebased Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « expectations/gm/ignored-tests.txt ('k') | src/core/SkPictureShader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/pictureshader.cpp
diff --git a/gm/pictureshader.cpp b/gm/pictureshader.cpp
index c622ee3fae5eaac94e8c6a3e5349de3dc77218c2..461f7e96973870a68b665960570d29bebaf41838 100644
--- a/gm/pictureshader.cpp
+++ b/gm/pictureshader.cpp
@@ -51,7 +51,7 @@ protected:
}
SkISize onISize() SK_OVERRIDE {
- return SkISize::Make(1400, 1250);
+ return SkISize::Make(1400, 1450);
}
void onDraw(SkCanvas* canvas) SK_OVERRIDE {
@@ -61,6 +61,28 @@ protected:
this->drawSceneColumn(canvas, SkPoint::Make(fSceneSize * 2.4f, fSceneSize * 6.4f), 1, 1, 2);
this->drawSceneColumn(canvas, SkPoint::Make(fSceneSize * 4.8f, 0), 2, 1, 0);
this->drawSceneColumn(canvas, SkPoint::Make(fSceneSize * 9.6f, 0), 2, 2, 0);
+
+ // One last custom row to exercise negative scaling
+ SkMatrix ctm, localMatrix;
+ ctm.setTranslate(fSceneSize * 2.1f, fSceneSize * 13.8f);
+ ctm.preScale(-1, -1);
+ localMatrix.setScale(2, 2);
+ this->drawScene(canvas, ctm, localMatrix, 0);
+
+ ctm.setTranslate(fSceneSize * 2.4f, fSceneSize * 12.8f);
+ localMatrix.setScale(-1, -1);
+ this->drawScene(canvas, ctm, localMatrix, 0);
+
+ ctm.setTranslate(fSceneSize * 4.8f, fSceneSize * 12.3f);
+ ctm.preScale(2, 2);
+ this->drawScene(canvas, ctm, localMatrix, 0);
+
+ ctm.setTranslate(fSceneSize * 13.8f, fSceneSize * 14.3f);
+ ctm.preScale(-2, -2);
+ localMatrix.setTranslate(fTileSize / 4, fTileSize / 4);
+ localMatrix.preRotate(45);
+ localMatrix.preScale(-2, -2);
+ this->drawScene(canvas, ctm, localMatrix, 0);
}
private:
« no previous file with comments | « expectations/gm/ignored-tests.txt ('k') | src/core/SkPictureShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698