Revert of Revert "De-virtualize SkCanvas save/restore."

experimental/PdfViewer/SkNulCanvas.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkNulCanvas_DEFINED
 #define SkNulCanvas_DEFINED
 
 #include "SkCanvas.h"
 
 /** \class SkNulCanvas
  *
  *   Nul Canvas is a canvas that does nothing. It is used to measure the perf of just parsing
  *   a pdf, without actually rendering anything.
  *
  */
 class SK_API SkNulCanvas : public SkCanvas {
 public:
     SK_DECLARE_INST_COUNT(SkNulCanvas);
 
     SkNulCanvas() {}
     explicit SkNulCanvas(SkBaseDevice* device) : SkCanvas(device) {}
 
     explicit SkNulCanvas(const SkBitmap& bitmap) : SkCanvas(bitmap) {}
     virtual ~SkNulCanvas() {}
 
-    virtual int save(SaveFlags flags = kMatrixClip_SaveFlag) SK_OVERRIDE {return 0;}
-    virtual int saveLayer(const SkRect* bounds, const SkPaint* paint,
-                          SaveFlags flags = kARGB_ClipLayer_SaveFlag) SK_OVERRIDE {return 0;}
-    int saveLayerAlpha(const SkRect* bounds, U8CPU alpha,
-                       SaveFlags flags = kARGB_ClipLayer_SaveFlag) {return 0;}
-    virtual void restore() SK_OVERRIDE {}
-    int getSaveCount() const {return 0;}
     virtual bool isDrawingToLayer() const SK_OVERRIDE {return false;}
     virtual bool translate(SkScalar dx, SkScalar dy) SK_OVERRIDE {return true;}
     virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE {return true;}
     virtual bool rotate(SkScalar degrees) SK_OVERRIDE {return true;}
     virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE {return true;}
     virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE {return true;}
     virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE {}
     virtual void clear(SkColor) SK_OVERRIDE {}
     virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE {}
     virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
@@ skipping 53 matching lines @@
         if (NULL != bounds) {
             bounds->setLargest();
         }
         return true;
     }
 
 protected:
     virtual SkCanvas* canvasForDrawIter() {return NULL;}
     virtual SkBaseDevice* setDevice(SkBaseDevice* device) {return NULL;}
 
+    virtual bool onSaveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags)
+        SK_OVERRIDE {
+        this->INHERITED::onSaveLayer(bounds, paint, flags);
+        return false;
+    }
+
     virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {}
     virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {}
     virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {}
     virtual void onClipRegion(const SkRegion&, SkRegion::Op)  SK_OVERRIDE {}
 
 private:
     typedef SkCanvas INHERITED;
 };
 
 #endif  // SkNulCanvas_DEFINED