commit d03c2c732e2e914f8429cfc8b077a7b9b853dd8e
author edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 11 18:26:45 2013 +0000
committer edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 11 18:26:45 2013 +0000
tree 9a4b77a021ff95bf1042f7d80b4225c49d7c8041
parent 29d4e638641d6d089a0361619ff2a583fd1a827f

pdfviewer: more code comments + concat the pdf matrix with the existing matrix in canvas, instead of reseting it.

Review URL: https://codereview.chromium.org/27057003

git-svn-id: http://skia.googlecode.com/svn/trunk@11735 2bbb7eff-a529-9590-31e7-b0007b416f81

experimental/PdfViewer/SkPdfRenderer.cpp

diff --git a/experimental/PdfViewer/SkPdfRenderer.cpp b/experimental/PdfViewer/SkPdfRenderer.cpp
index 2a78765..6c6c666 100644
--- a/experimental/PdfViewer/SkPdfRenderer.cpp
+++ b/experimental/PdfViewer/SkPdfRenderer.cpp
@@ -3062,6 +3062,8 @@
     SkAssertResult(pdfContext.fOriginalMatrix.setPolyToPoly(pdfSpace, skiaSpace, 4));
     SkTraceMatrix(pdfContext.fOriginalMatrix, "Original matrix");
 
+    pdfContext.fOriginalMatrix.postConcat(canvas->getTotalMatrix());
+
     pdfContext.fGraphicsState.fCTM = pdfContext.fOriginalMatrix;
     pdfContext.fGraphicsState.fContentStreamMatrix = pdfContext.fOriginalMatrix;
     pdfContext.fGraphicsState.fMatrixTm = pdfContext.fGraphicsState.fCTM;
@@ -3071,7 +3073,7 @@
     canvas->clipRect(dst, SkRegion::kIntersect_Op, true);
 #endif
 
-    canvas->setMatrix(pdfContext.fOriginalMatrix);
+    canvas->concat(pdfContext.fOriginalMatrix);
 
     doPage(&pdfContext, canvas, fPdfDoc->page(page));