diff options
| author |  Cary Clark <caryclark@google.com> | 2017-03-03 20:27:13 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-03 20:27:22 +0000 |
| commit | baf06bc89a0ee2ac4033281e7310f6c727faab79 (patch) | |
| tree | 13aca9c2e88a457a91f2d0dcf0f3418411ea63fc /src/core/SkRasterClipStack.h | |
| parent | 94fc0fe016bbfeb097c829df513673d4fcbb38b3 (diff) | |
Revert "Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping."""
This reverts commit cfaa63237b152ae216f1351207bce3ea9808814c.
Reason for revert: speculative revert to fix Google3
Original change's description:
> Revert[2] "Remove SkDraw from device-draw methods, and enable device-centric clipping.""
>
> passes new (augmented) CanvasClipType unittest
> fixed rasterclipstack::setnewsize
>
> This reverts commit ea5e676a7b75600edcde3912886486004ccd7626.
>
> BUG=skia:
>
> Change-Id: I004653e0f4d01454662f8516fccab0046486f273
> Reviewed-on: https://skia-review.googlesource.com/9185
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=bsalomon@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ibd7ee6383999f008eb6ee59c1c3f1c06a86044ea
Reviewed-on: https://skia-review.googlesource.com/9230
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'src/core/SkRasterClipStack.h')
| -rw-r--r-- | src/core/SkRasterClipStack.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/SkRasterClipStack.h b/src/core/SkRasterClipStack.h index f3e3b17df7..d553f24141 100644 --- a/src/core/SkRasterClipStack.h +++ b/src/core/SkRasterClipStack.h @@ -73,12 +73,8 @@ public: } void setNewSize(int w, int h) { - fRootBounds.setXYWH(0, 0, w, h); - SkASSERT(fStack.count() == 1); - Rec& rec = fStack.top(); - SkASSERT(rec.fDeferredCount == 0); - rec.fRC.setRect(fRootBounds); + fRootBounds.setXYWH(0, 0, w, h); } const SkRasterClip& rc() const { return fStack.top().fRC; } |