diff options
| author |  reed <reed@chromium.org> | 2014-06-18 15:51:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-18 15:51:20 -0700 |
| commit | 9f0147143fbedba10bdae496d812a14995304924 (patch) | |
| tree | f3249e7af3a67ed85eec8da912950d69d09392bf /src | |
| parent | ffa9b500d7e83e7dddf6a8902f47c4355b608c30 (diff) | |
Revert of remove guarded code - there are no more callers (https://codereview.chromium.org/343783002/)
Reason for revert:
webkit still uses getTotalClip -- need to find where they define the guard.
../../skia/ext/skia_utils_mac.mm:400:42: error: no member named 'getTotalClip' in 'SkCanvas'
const SkRegion& clipRgn = canvas_->getTotalClip();
~~~~~~~ ^
Original issue's description:
> remove guarded code - there are no more callers
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/c5d5cf9489977aa6fba077d1dc242029fbb4859e
R=scroggo@google.com, reed@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/342843002
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkCanvas.cpp | 7 | ||||
| -rw-r--r-- | src/core/SkPaintPriv.cpp | 3 | ||||
| -rw-r--r-- | src/effects/SkLayerRasterizer.cpp | 13 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index c062895bf0..bdbcd3be74 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ + #include "SkCanvas.h" #include "SkBitmapDevice.h" #include "SkDeviceImageFilterProxy.h" @@ -1772,6 +1773,12 @@ SkCanvas::ClipType SkCanvas::getClipType() const { } #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 3e484de1a8..a8b52e998c 100644 --- a/src/core/SkPaintPriv.cpp +++ b/src/core/SkPaintPriv.cpp @@ -89,6 +89,9 @@ bool NeedsDeepCopy(const SkPaint& paint) { #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 720d2f0f88..90fd59b585 100644 --- a/src/effects/SkLayerRasterizer.cpp +++ b/src/effects/SkLayerRasterizer.cpp @@ -1,3 +1,4 @@ + /* * Copyright 2006 The Android Open Source Project * @@ -5,6 +6,7 @@ * found in the LICENSE file. */ + #include "SkLayerRasterizer.h" #include "SkDraw.h" #include "SkReadBuffer.h" @@ -48,6 +50,17 @@ SkLayerRasterizer::~SkLayerRasterizer() { 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) { |