commit 4b7b6f0229fa51f5beb71f92cb77ba84d39b41e1
author Florin Malita <fmalita@chromium.org> Thu Dec 01 15:46:26 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 02 14:16:33 2016 +0000
tree 1bd81bb5465f8a245cd871a9c2f67ab06c0c178e
parent 0164896de54748ccbfb7d0181ddc65d00e6f5273

Retire SkNoSaveLayerCanvas

No clients, superseded by SkNoDrawCanvas.

R=reed@google.com

Change-Id: I93352c6cfb24ec133ed8433c3b31a5fa5ab1ace8
Reviewed-on: https://skia-review.googlesource.com/5460
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>

gn/utils.gni

diff --git a/gn/utils.gni b/gn/utils.gni
index b99e670..432f48c 100644
--- a/gn/utils.gni
+++ b/gn/utils.gni
@@ -18,7 +18,6 @@
   "$_include/utils/SkLayer.h",
   "$_include/utils/SkMeshUtils.h",
   "$_include/utils/SkNoDrawCanvas.h",
-  "$_include/utils/SkNoSaveLayerCanvas.h",
   "$_include/utils/SkNWayCanvas.h",
   "$_include/utils/SkNullCanvas.h",
   "$_include/utils/SkPaintFilterCanvas.h",

include/core/SkCanvas.h

diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index fdea19f..9887211 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1623,7 +1623,6 @@
     friend class SkRecorder;        // InitFlags
     friend class SkLiteRecorder;        // InitFlags
     friend class SkNoDrawCanvas;        // InitFlags
-    friend class SkNoSaveLayerCanvas;   // InitFlags
     friend class SkNWayCanvas;          // InitFlags
     friend class SkPictureImageFilter;  // SkCanvas(SkBaseDevice*, SkSurfaceProps*, InitFlags)
     friend class SkPictureRecord;   // predrawNotify (why does it need it? <reed>)

include/utils/SkNoDrawCanvas.h

diff --git a/include/utils/SkNoDrawCanvas.h b/include/utils/SkNoDrawCanvas.h
index 376fa7c..0330251 100644
--- a/include/utils/SkNoDrawCanvas.h
+++ b/include/utils/SkNoDrawCanvas.h
@@ -29,4 +29,4 @@
     typedef SkCanvas INHERITED;
 };
 
-#endif // SkNoSaveLayerCanvas_DEFINED
+#endif // SkNoDrawCanvas_DEFINED

include/utils/SkNoSaveLayerCanvas.h

diff --git a/include/utils/SkNoSaveLayerCanvas.h b/include/utils/SkNoSaveLayerCanvas.h
deleted file mode 100644
index 3d15cf9..0000000
--- a/include/utils/SkNoSaveLayerCanvas.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkNoSaveLayerCanvas_DEFINED
-#define SkNoSaveLayerCanvas_DEFINED
-
-#include "SkCanvas.h"
-#include "SkRRect.h"
-
-// The NoSaveLayerCanvas is used to play back SkPictures when the saveLayer
-// functionality isn't required (e.g., during analysis of the draw calls).
-// It also simplifies the clipping calls to only use rectangles.
-//
-// DEPRECATED: use SkNoDrawCanvas instead.
-class SK_API SkNoSaveLayerCanvas : public SkCanvas {
-public:
-    SkNoSaveLayerCanvas(SkBaseDevice* device)
-        : INHERITED(device, kConservativeRasterClip_InitFlag)
-    {}
-
-protected:
-    SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec& rec) override {
-        (void)this->INHERITED::getSaveLayerStrategy(rec);
-        return kNoLayer_SaveLayerStrategy;
-    }
-
-private:
-    typedef SkCanvas INHERITED;
-};
-
-#endif // SkNoSaveLayerCanvas_DEFINED