pdfviewer: remove save/restore used with q/Q operators (we already do there save and restore)

experimental/PdfViewer/SkPdfRenderer.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkDevice.h"
 #include "SkForceLinking.h"
@@ skipping 707 matching lines @@
     if (!skobj || !skobj->hasStream()) {
         return kIgnoreError_PdfResult;
     }
 
     if (!skobj->has_BBox()) {
         return kIgnoreError_PdfResult;
     }
 
     PdfOp_q(pdfContext, canvas, NULL);
 
-    canvas->save();
-
 
     if (skobj->Resources(pdfContext->fPdfDoc)) {
         pdfContext->fGraphicsState.fResources = skobj->Resources(pdfContext->fPdfDoc);
     }
 
     SkTraceMatrix(pdfContext->fGraphicsState.fCTM, "Current matrix");
 
     if (skobj->has_Matrix()) {
         pdfContext->fGraphicsState.fCTM.preConcat(skobj->Matrix(pdfContext->fPdfDoc));
         SkMatrix matrix = pdfContext->fGraphicsState.fCTM;
@@ skipping 30 matching lines @@
         delete tokenizer;
     }
 
     // TODO(edisonn): should we restore the variable stack at the same state?
     // There could be operands left, that could be consumed by a parent tokenizer when we pop.
 
     if (skobj->has_Group()) {
         canvas->restore();
     }
 
-    canvas->restore();
     PdfOp_Q(pdfContext, canvas, NULL);
     return kPartial_PdfResult;
 }
 
 
 // TODO(edisonn): Extract a class like ObjWithStream
 static PdfResult doXObject_Pattern(PdfContext* pdfContext, SkCanvas* canvas, SkPdfType1PatternDictionary* skobj) {
     if (!skobj || !skobj->hasStream()) {
         return kIgnoreError_PdfResult;
     }
 
     if (!skobj->has_BBox()) {
         return kIgnoreError_PdfResult;
     }
 
     PdfOp_q(pdfContext, canvas, NULL);
 
-    canvas->save();
-
 
     if (skobj->Resources(pdfContext->fPdfDoc)) {
         pdfContext->fGraphicsState.fResources = skobj->Resources(pdfContext->fPdfDoc);
     }
 
     SkTraceMatrix(pdfContext->fGraphicsState.fContentStreamMatrix, "Current Content stream matrix");
 
     if (skobj->has_Matrix()) {
         pdfContext->fGraphicsState.fContentStreamMatrix.preConcat(skobj->Matrix(pdfContext->fPdfDoc));
     }
@@ skipping 15 matching lines @@
             pdfContext->fPdfDoc->tokenizerOfStream(stream, pdfContext->fTmpPageAllocator);
     if (tokenizer != NULL) {
         PdfMainLooper looper(NULL, tokenizer, pdfContext, canvas);
         looper.loop();
         delete tokenizer;
     }
 
     // TODO(edisonn): should we restore the variable stack at the same state?
     // There could be operands left, that could be consumed by a parent tokenizer when we pop.
 
-    canvas->restore();
     PdfOp_Q(pdfContext, canvas, NULL);
     return kPartial_PdfResult;
 }
 
 
 //static PdfResult doXObject_PS(PdfContext* pdfContext, SkCanvas* canvas, const SkPdfObject* obj) {
 //    return kNYI_PdfResult;
 //}
 
 PdfResult doType3Char(PdfContext* pdfContext, SkCanvas* canvas, const SkPdfObject* skobj, SkRect bBox, SkMatrix matrix, double textSize) {
     if (!skobj || !skobj->hasStream()) {
         return kIgnoreError_PdfResult;
     }
 
     PdfOp_q(pdfContext, canvas, NULL);
-    canvas->save();
 
     pdfContext->fGraphicsState.fMatrixTm.preConcat(matrix);
     pdfContext->fGraphicsState.fMatrixTm.preScale(SkDoubleToScalar(textSize), SkDoubleToScalar(textSize));
     pdfContext->fGraphicsState.fMatrixTlm = pdfContext->fGraphicsState.fMatrixTm;
 
     pdfContext->fGraphicsState.fCTM = pdfContext->fGraphicsState.fMatrixTm;
     pdfContext->fGraphicsState.fCTM.preScale(SkDoubleToScalar(1), SkDoubleToScalar(-1));
 
     SkTraceMatrix(pdfContext->fGraphicsState.fCTM, "Total matrix");
 
@@ skipping 14 matching lines @@
     SkPdfNativeTokenizer* tokenizer =
             pdfContext->fPdfDoc->tokenizerOfStream(stream, pdfContext->fTmpPageAllocator);
     if (tokenizer != NULL) {
         PdfMainLooper looper(NULL, tokenizer, pdfContext, canvas);
         looper.loop();
         delete tokenizer;
     }
 
     // TODO(edisonn): should we restore the variable stack at the same state?
     // There could be operands left, that could be consumed by a parent tokenizer when we pop.
-    canvas->restore();
     PdfOp_Q(pdfContext, canvas, NULL);
 
     return kPartial_PdfResult;
 }
 
 
 // TODO(edisonn): make sure the pointer is unique
 std::set<const SkPdfObject*> gInRendering;
 
 class CheckRecursiveRendering {
@@ skipping 380 matching lines @@
 
         canvas->drawPath(path, paint);
     } else {
         if (fill) {
             if (strncmp((char*)pdfContext->fGraphicsState.fNonStroking.fColorSpace.fBuffer, "Pattern", strlen("Pattern")) == 0 &&
                 pdfContext->fGraphicsState.fNonStroking.fPattern != NULL) {
 
                 // TODO(edisonn): we can use a shader here, like imageshader to draw fast. ultimately,
                 // if this is not possible, and we are in rasper mode, and the cells don't intersect, we could even have multiple cpus.
 
-                canvas->save();
                 PdfOp_q(pdfContext, canvas, NULL);
 
                 if (evenOdd) {
                     path.setFillType(SkPath::kEvenOdd_FillType);
                 }
                 canvas->clipPath(path);
 
                 if (pdfContext->fPdfDoc->mapper()->mapType1PatternDictionary(pdfContext->fGraphicsState.fNonStroking.fPattern) != kNone_SkPdfObjectType) {
                     SkPdfType1PatternDictionary* pattern = (SkPdfType1PatternDictionary*)pdfContext->fGraphicsState.fNonStroking.fPattern;
 
@@ skipping 35 matching lines @@
                             y += SkIntToScalar(yStep);
                         }
                         pdfContext->fGraphicsState.fContentStreamMatrix.preTranslate(SkIntToScalar(0), SkIntToScalar(totaly));
                     }
                 }
 
                 // apply matrix
                 // get xstep, y step, bbox ... for cliping, and bos of the path
 
                 PdfOp_Q(pdfContext, canvas, NULL);
-                canvas->restore();
             } else {
                 paint.setStyle(SkPaint::kFill_Style);
                 if (evenOdd) {
                     path.setFillType(SkPath::kEvenOdd_FillType);
                 }
 
                 pdfContext->fGraphicsState.applyGraphicsState(&paint, false);
 
                 canvas->drawPath(path, paint);
             }
@@ skipping 1309 matching lines @@
 
     rect = SkRect::MakeWH(width, height);
 
     setup_bitmap(output, (int)SkScalarToDouble(width), (int)SkScalarToDouble(height));
 
     SkAutoTUnref<SkDevice> device(SkNEW_ARGS(SkDevice, (*output)));
     SkCanvas canvas(device);
 
     return renderer.renderPage(page, &canvas, rect);
 }