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/SkPictureRecord.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/SkPictureRecord.cpp')
-rw-r--r-- | src/core/SkPictureRecord.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp index 562f056c50..f2a0fd857c 100644 --- a/src/core/SkPictureRecord.cpp +++ b/src/core/SkPictureRecord.cpp @@ -219,7 +219,6 @@ void SkPictureRecord::didSetMatrix(const SkMatrix& matrix) { } void SkPictureRecord::didTranslateZ(SkScalar z) { -#ifdef SK_EXPERIMENTAL_SHADOWING this->validate(fWriter.bytesWritten(), 0); // op + scalar size_t size = 1 * kUInt32Size + 1 * sizeof(SkScalar); @@ -227,7 +226,6 @@ void SkPictureRecord::didTranslateZ(SkScalar z) { this->addScalar(z); this->validate(initialOffset, size); this->INHERITED::didTranslateZ(z); -#endif } static bool regionOpExpands(SkRegion::Op op) { @@ -674,27 +672,6 @@ void SkPictureRecord::onDrawPicture(const SkPicture* picture, const SkMatrix* ma this->validate(initialOffset, size); } -void SkPictureRecord::onDrawShadowedPicture(const SkPicture* picture, - const SkMatrix* matrix, - const SkPaint* paint) { - // op + picture index - size_t size = 2 * kUInt32Size; - size_t initialOffset; - - if (nullptr == matrix && nullptr == paint) { - initialOffset = this->addDraw(DRAW_PICTURE, &size); - this->addPicture(picture); - } else { - const SkMatrix& m = matrix ? *matrix : SkMatrix::I(); - size += m.writeToMemory(nullptr) + kUInt32Size; // matrix + paint - initialOffset = this->addDraw(DRAW_PICTURE_MATRIX_PAINT, &size); - this->addPaintPtr(paint); - this->addMatrix(m); - this->addPicture(picture); - } - this->validate(initialOffset, size); -} - void SkPictureRecord::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) { // op + drawable index size_t size = 2 * kUInt32Size; |