diff options
| author |  vjiaoblack <vjiaoblack@google.com> | 2016-07-21 09:24:16 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-21 09:24:16 -0700 |
| commit | 33d325890e549c113a258248002246b46e8040b2 (patch) | |
| tree | edb97ce0fe48078a14d82b2d1e8b3b5194025032 /src/core/SkCanvas.cpp | |
| parent | 5fa7f30331585f78cf0f81ac185abbff1fee1152 (diff) | |
Revert of Creating framework for drawShadowedPicture (patchset #14 id:260001 of https://codereview.chromium.org/2146073003/ )
Reason for revert:
Decided to re-wait for a final LGTM.
Already found a bug in variable naming to fix.
Original issue's description:
> Creating framework for drawShadowedPicture
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2146073003
>
> Committed: https://skia.googlesource.com/skia/+/0ae097d116f4332be02a135ffc99c162473dee6a
TBR=reed@google.com,robertphillips@google.com,bsalomon@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2167223002
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 2cfe8ae2da..050253fa68 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -663,9 +663,6 @@ SkBaseDevice* SkCanvas::init(SkBaseDevice* device, InitFlags flags) { fDeviceCMDirty = true; fSaveCount = 1; fMetaData = nullptr; -#ifdef SK_EXPERIMENTAL_SHADOWING - fLights = nullptr; -#endif fClipStack.reset(new SkClipStack); @@ -1522,7 +1519,6 @@ void SkCanvas::resetMatrix() { this->setMatrix(SkMatrix::I()); } -#ifdef SK_EXPERIMENTAL_SHADOWING void SkCanvas::translateZ(SkScalar z) { this->checkForDeferredSave(); this->fMCRec->fCurDrawDepth += z; @@ -1533,15 +1529,6 @@ SkScalar SkCanvas::getZ() const { return this->fMCRec->fCurDrawDepth; } -void SkCanvas::setLights(sk_sp<SkLights> lights) { - this->fLights = lights; -} - -sk_sp<SkLights> SkCanvas::getLights() const { - return this->fLights; -} -#endif - ////////////////////////////////////////////////////////////////////////////// void SkCanvas::clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) { @@ -3013,24 +3000,6 @@ void SkCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, picture->playback(this); } -#ifdef SK_EXPERIMENTAL_SHADOWING -void SkCanvas::drawShadowedPicture(const SkPicture* picture, - const SkMatrix* matrix, - const SkPaint* paint) { - RETURN_ON_NULL(picture); - - TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawShadowedPicture()"); - - this->onDrawShadowedPicture(picture, matrix, paint); -} - -void SkCanvas::onDrawShadowedPicture(const SkPicture* picture, - const SkMatrix* matrix, - const SkPaint* paint) { - this->onDrawPicture(picture, matrix, paint); -} -#endif - /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// |