remove guarded code - there are no more callers
BUG=skia:
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/343783002
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index a08e828..8640d72 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1111,15 +1111,6 @@
virtual ClipType getClipType() const;
#endif
-#ifdef SK_SUPPORT_LEGACY_GETTOTALCLIP
- /** DEPRECATED -- need to move this guy to private/friend
- * Return the current device clip (concatenation of all clip calls).
- * This does not account for the translate in any of the devices.
- * @return the current device clip (concatenation of all clip calls).
- */
- const SkRegion& getTotalClip() const;
-#endif
-
/** Return the clip stack. The clip stack stores all the individual
* clips organized by the save/restore frame in which they were
* added.
diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h
index 9d4c823..c061be6 100644
--- a/include/effects/SkLayerRasterizer.h
+++ b/include/effects/SkLayerRasterizer.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2006 The Android Open Source Project
*
@@ -6,7 +5,6 @@
* found in the LICENSE file.
*/
-
#ifndef SkLayerRasterizer_DEFINED
#define SkLayerRasterizer_DEFINED
@@ -64,24 +62,9 @@
SkDeque* fLayers;
};
-#ifdef SK_SUPPORT_LEGACY_LAYERRASTERIZER_API
- void addLayer(const SkPaint& paint) {
- this->addLayer(paint, 0, 0);
- }
-
- /** Add a new layer (above any previous layers) to the rasterizer.
- The layer will extract those fields that affect the mask from
- the specified paint, but will not retain a reference to the paint
- object itself, so it may be reused without danger of side-effects.
- */
- void addLayer(const SkPaint& paint, SkScalar dx, SkScalar dy);
-#endif
-
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLayerRasterizer)
protected:
- SkLayerRasterizer(SkDeque* layers);
- SkLayerRasterizer(SkReadBuffer&);
virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
// override from SkRasterizer
@@ -89,17 +72,12 @@
const SkIRect* clipBounds,
SkMask* mask, SkMask::CreateMode mode) const;
-#ifdef SK_SUPPORT_LEGACY_LAYERRASTERIZER_API
-public:
-#endif
- SkLayerRasterizer();
-
private:
-#ifdef SK_SUPPORT_LEGACY_LAYERRASTERIZER_API
- SkDeque* fLayers;
-#else
const SkDeque* const fLayers;
-#endif
+
+ SkLayerRasterizer();
+ SkLayerRasterizer(SkDeque* layers);
+ SkLayerRasterizer(SkReadBuffer&);
static SkDeque* ReadLayers(SkReadBuffer& buffer);
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index bdbcd3b..c062895 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-
#include "SkCanvas.h"
#include "SkBitmapDevice.h"
#include "SkDeviceImageFilterProxy.h"
@@ -1773,12 +1772,6 @@
}
#endif
-#ifdef SK_SUPPORT_LEGACY_GETTOTALCLIP
-const SkRegion& SkCanvas::getTotalClip() const {
- return fMCRec->fRasterClip->forceGetBW();
-}
-#endif
-
const SkRegion& SkCanvas::internal_private_getTotalClip() const {
return fMCRec->fRasterClip->forceGetBW();
}
diff --git a/src/core/SkPaintPriv.cpp b/src/core/SkPaintPriv.cpp
index a8b52e9..3e484de 100644
--- a/src/core/SkPaintPriv.cpp
+++ b/src/core/SkPaintPriv.cpp
@@ -89,9 +89,6 @@
#ifdef SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX
|| paint.getShader()
#endif
-#ifdef SK_SUPPORT_LEGACY_LAYERRASTERIZER_API
- || paint.getRasterizer()
-#endif
|| paint.getImageFilter()
;
}
diff --git a/src/effects/SkLayerRasterizer.cpp b/src/effects/SkLayerRasterizer.cpp
index 90fd59b..720d2f0 100644
--- a/src/effects/SkLayerRasterizer.cpp
+++ b/src/effects/SkLayerRasterizer.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2006 The Android Open Source Project
*
@@ -6,7 +5,6 @@
* found in the LICENSE file.
*/
-
#include "SkLayerRasterizer.h"
#include "SkDraw.h"
#include "SkReadBuffer.h"
@@ -50,17 +48,6 @@
clean_up_layers(const_cast<SkDeque*>(fLayers));
}
-#ifdef SK_SUPPORT_LEGACY_LAYERRASTERIZER_API
-void SkLayerRasterizer::addLayer(const SkPaint& paint, SkScalar dx,
- SkScalar dy) {
- SkASSERT(fLayers);
- SkLayerRasterizer_Rec* rec = (SkLayerRasterizer_Rec*)fLayers->push_back();
-
- SkNEW_PLACEMENT_ARGS(&rec->fPaint, SkPaint, (paint));
- rec->fOffset.set(dx, dy);
-}
-#endif
-
static bool compute_bounds(const SkDeque& layers, const SkPath& path,
const SkMatrix& matrix,
const SkIRect* clipBounds, SkIRect* bounds) {