diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-23 08:26:43 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-23 08:26:44 -0700 |
| commit | 36736a2dae94947e075ac9503d5de7799772a5f7 (patch) | |
| tree | 8b37f10b43268381d6638660a5c565a1e5ab5122 | |
| parent | 34e0ec40b10320765d4a4432f56e090556f9c75e (diff) | |
Remove SkCanvas::LayerIter guard
The LayerIter is no longer required by the Bazel build.
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1917693002
Review URL: https://codereview.chromium.org/1917693002
| -rw-r--r-- | include/core/SkCanvas.h | 40 | ||||
| -rw-r--r-- | public.bzl | 1 |
2 files changed, 18 insertions, 23 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 4f15af8647..611603715b 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1220,16 +1220,31 @@ public: /////////////////////////////////////////////////////////////////////////// -#ifndef SK_SUPPORT_LEGACY_LAYERITER + // don't call + GrRenderTarget* internal_private_accessTopLayerRenderTarget(); + + // don't call + static void Internal_Private_SetIgnoreSaveLayerBounds(bool); + static bool Internal_Private_GetIgnoreSaveLayerBounds(); + static void Internal_Private_SetTreatSpriteAsBitmap(bool); + static bool Internal_Private_GetTreatSpriteAsBitmap(); + + // TEMP helpers until we switch virtual over to const& for src-rect + void legacy_drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, + const SkPaint* paint, + SrcRectConstraint constraint = kStrict_SrcRectConstraint); + void legacy_drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, + const SkPaint* paint, + SrcRectConstraint constraint = kStrict_SrcRectConstraint); + protected: -#endif /** After calling saveLayer(), there can be any number of devices that make up the top-most drawing area. LayerIter can be used to iterate through those devices. Note that the iterator is only valid until the next API call made on the canvas. Ownership of all pointers in the iterator stays with the canvas, so none of them should be modified or deleted. */ - class SK_API LayerIter /*: SkNoncopyable*/ { + class LayerIter /*: SkNoncopyable*/ { public: /** Initialize iterator with canvas, and set values for 1st device */ LayerIter(SkCanvas*, bool skipEmptyClips); @@ -1261,25 +1276,6 @@ protected: bool fDone; }; - public: - // don't call - GrRenderTarget* internal_private_accessTopLayerRenderTarget(); - - // don't call - static void Internal_Private_SetIgnoreSaveLayerBounds(bool); - static bool Internal_Private_GetIgnoreSaveLayerBounds(); - static void Internal_Private_SetTreatSpriteAsBitmap(bool); - static bool Internal_Private_GetTreatSpriteAsBitmap(); - - // TEMP helpers until we switch virtual over to const& for src-rect - void legacy_drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, - const SkPaint* paint, - SrcRectConstraint constraint = kStrict_SrcRectConstraint); - void legacy_drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, - const SkPaint* paint, - SrcRectConstraint constraint = kStrict_SrcRectConstraint); - -protected: // default impl defers to getDevice()->newSurface(info) virtual sk_sp<SkSurface> onNewSurface(const SkImageInfo&, const SkSurfaceProps&); diff --git a/public.bzl b/public.bzl index 99ccde3808..ef99c9fb37 100644 --- a/public.bzl +++ b/public.bzl @@ -550,7 +550,6 @@ DEFINES_ALL = [ "SK_SUPPORT_LEGACY_COLORFILTER_PTR", "SK_SUPPORT_LEGACY_CREATESHADER_PTR", "SK_SUPPORT_LEGACY_IMAGEFILTER_PTR", - "SK_SUPPORT_LEGACY_LAYERITER", "SK_SUPPORT_LEGACY_MINOR_EFFECT_PTR", "SK_SUPPORT_LEGACY_NEW_SURFACE_API", "SK_SUPPORT_LEGACY_PATHEFFECT_PTR", |