diff options
| -rw-r--r-- | gn/utils.gni | 1 | ||||
| -rw-r--r-- | include/core/SkCanvas.h | 1 | ||||
| -rw-r--r-- | include/utils/SkNoDrawCanvas.h | 2 | ||||
| -rw-r--r-- | include/utils/SkNoSaveLayerCanvas.h | 35 |
4 files changed, 1 insertions, 38 deletions
diff --git a/gn/utils.gni b/gn/utils.gni index b99e6708d4..432f48cbda 100644 --- a/gn/utils.gni +++ b/gn/utils.gni @@ -18,7 +18,6 @@ skia_utils_sources = [ "$_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", diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index fdea19fd2f..9887211057 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1623,7 +1623,6 @@ private: 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>) diff --git a/include/utils/SkNoDrawCanvas.h b/include/utils/SkNoDrawCanvas.h index 376fa7c32e..0330251ede 100644 --- a/include/utils/SkNoDrawCanvas.h +++ b/include/utils/SkNoDrawCanvas.h @@ -29,4 +29,4 @@ private: typedef SkCanvas INHERITED; }; -#endif // SkNoSaveLayerCanvas_DEFINED +#endif // SkNoDrawCanvas_DEFINED diff --git a/include/utils/SkNoSaveLayerCanvas.h b/include/utils/SkNoSaveLayerCanvas.h deleted file mode 100644 index 3d15cf9fef..0000000000 --- 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 |