Revert "[PDF] Add GM and infrastructure to test drawing shaders with an initial transform."
This reverts r3450
TBR=reed@google.com
Review URL: https://codereview.appspot.com/5864050
git-svn-id: http://skia.googlecode.com/svn/trunk@3451 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 1e63bb6..61095e1 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -264,10 +264,7 @@
}
}
-static void invokeGM(GM* gm, SkCanvas* canvas, bool isPDF = false) {
- if (!isPDF) {
- canvas->setMatrix(gm->getInitialTransform());
- }
+static void invokeGM(GM* gm, SkCanvas* canvas) {
installFilter(canvas);
gm->draw(canvas);
canvas->setDrawFilter(NULL);
@@ -326,26 +323,14 @@
static void generate_pdf(GM* gm, SkDynamicMemoryWStream& pdf) {
#ifdef SK_SUPPORT_PDF
- SkMatrix initialTransform = gm->getInitialTransform();
- SkISize pageSize = gm->getISize();
- SkPDFDevice* dev = NULL;
- if (initialTransform.isIdentity()) {
- dev = new SkPDFDevice(pageSize, pageSize, initialTransform);
- } else {
- SkRect content = SkRect::MakeWH(SkIntToScalar(pageSize.width()),
- SkIntToScalar(pageSize.height()));
- initialTransform.mapRect(&content);
- content.intersect(0, 0, SkIntToScalar(pageSize.width()),
- SkIntToScalar(pageSize.height()));
- SkISize contentSize =
- SkISize::Make(SkScalarRoundToInt(content.width()),
- SkScalarRoundToInt(content.height()));
- dev = new SkPDFDevice(pageSize, contentSize, initialTransform);
- }
+ SkISize size = gm->getISize();
+ SkMatrix identity;
+ identity.reset();
+ SkPDFDevice* dev = new SkPDFDevice(size, size, identity);
SkAutoUnref aur(dev);
SkCanvas c(dev);
- invokeGM(gm, &c, true);
+ invokeGM(gm, &c);
SkPDFDocument doc;
doc.appendPage(dev);