diff options
| author |  herb <herb@google.com> | 2015-08-19 07:47:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-19 07:47:55 -0700 |
| commit | 82a02c9620e9d3ffb1ddc27dcac0d69e74a89edd (patch) | |
| tree | c8c2b82d152508bd333fc0b287fd43983d65f4df /src | |
| parent | 3cc0dfffb70c0bd08ed8899efcd2e98da86a6ec7 (diff) | |
Revert of SkCanvas::onDrawPicture() quick-reject (patchset #3 id:40001 of https://codereview.chromium.org/1264133003/ )
Reason for revert:
Seems to be breaking some blink tests.
https://storage.googleapis.com/chromium-layout-test-archives/linux_blink_rel/75812/layout-test-results/results.html
Original issue's description:
> SkCanvas::onDrawPicture() quick-reject
>
> R=reed@google.com,mtklein@google.com
>
> Committed: https://skia.googlesource.com/skia/+/48ed62b29d45e42b971aac8858da06781c93e6d7
>
> Committed: https://skia.googlesource.com/skia/+/d3d07245e29504dbffa0083e84ace5bab85853d4
TBR=mtklein@google.com,reed@google.com,mtklein@chromium.org,fmalita@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1301973002
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkCanvas.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 417f853ff3..fe6694d154 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2774,19 +2774,6 @@ void SkCanvas::drawPicture(const SkPicture* picture, const SkMatrix* matrix, con void SkCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint) { - if (!paint || paint->canComputeFastBounds()) { - SkRect bounds = picture->cullRect(); - if (paint) { - paint->computeFastBounds(bounds, &bounds); - } - if (matrix) { - matrix->mapRect(&bounds); - } - if (this->quickReject(bounds)) { - return; - } - } - SkBaseDevice* device = this->getTopDevice(); if (device) { // Canvas has to first give the device the opportunity to render |