Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: src/core/SkCanvas.cpp

Issue 35543002: Revert "If the path is a rect, call drawRect to raster the geometry in SkCanvas::drawPath to get be… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/core/SkBBoxRecord.cpp ('k') | src/core/SkPictureRecord.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2008 The Android Open Source Project 3 * Copyright 2008 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 1613 matching lines...) Expand 10 before | Expand all | Expand 10 after
1624 1624
1625 LOOPER_BEGIN(paint, SkDrawFilter::kPoint_Type) 1625 LOOPER_BEGIN(paint, SkDrawFilter::kPoint_Type)
1626 1626
1627 while (iter.next()) { 1627 while (iter.next()) {
1628 iter.fDevice->drawPoints(iter, mode, count, pts, looper.paint()); 1628 iter.fDevice->drawPoints(iter, mode, count, pts, looper.paint());
1629 } 1629 }
1630 1630
1631 LOOPER_END 1631 LOOPER_END
1632 } 1632 }
1633 1633
1634 void SkCanvas::onDrawRect(const SkRect& r, const SkPaint& paint) { 1634 void SkCanvas::drawRect(const SkRect& r, const SkPaint& paint) {
1635 CHECK_SHADER_NOSETCONTEXT(paint); 1635 CHECK_SHADER_NOSETCONTEXT(paint);
1636 1636
1637 if (paint.canComputeFastBounds()) { 1637 if (paint.canComputeFastBounds()) {
1638 SkRect storage; 1638 SkRect storage;
1639 if (this->quickReject(paint.computeFastBounds(r, &storage))) { 1639 if (this->quickReject(paint.computeFastBounds(r, &storage))) {
1640 return; 1640 return;
1641 } 1641 }
1642 } 1642 }
1643 1643
1644 LOOPER_BEGIN(paint, SkDrawFilter::kRect_Type) 1644 LOOPER_BEGIN(paint, SkDrawFilter::kRect_Type)
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
1692 LOOPER_BEGIN(paint, SkDrawFilter::kRRect_Type) 1692 LOOPER_BEGIN(paint, SkDrawFilter::kRRect_Type)
1693 1693
1694 while (iter.next()) { 1694 while (iter.next()) {
1695 iter.fDevice->drawRRect(iter, rrect, looper.paint()); 1695 iter.fDevice->drawRRect(iter, rrect, looper.paint());
1696 } 1696 }
1697 1697
1698 LOOPER_END 1698 LOOPER_END
1699 } 1699 }
1700 1700
1701 1701
1702 void SkCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { 1702 void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
1703 CHECK_SHADER_NOSETCONTEXT(paint); 1703 CHECK_SHADER_NOSETCONTEXT(paint);
1704 1704
1705 if (!path.isFinite()) { 1705 if (!path.isFinite()) {
1706 return; 1706 return;
1707 } 1707 }
1708 1708
1709 if (!path.isInverseFillType() && paint.canComputeFastBounds()) { 1709 if (!path.isInverseFillType() && paint.canComputeFastBounds()) {
1710 SkRect storage; 1710 SkRect storage;
1711 const SkRect& bounds = path.getBounds(); 1711 const SkRect& bounds = path.getBounds();
1712 if (this->quickReject(paint.computeFastBounds(bounds, &storage))) { 1712 if (this->quickReject(paint.computeFastBounds(bounds, &storage))) {
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
2222 return *paint; 2222 return *paint;
2223 } 2223 }
2224 2224
2225 const SkRegion& SkCanvas::LayerIter::clip() const { return fImpl->getClip(); } 2225 const SkRegion& SkCanvas::LayerIter::clip() const { return fImpl->getClip(); }
2226 int SkCanvas::LayerIter::x() const { return fImpl->getX(); } 2226 int SkCanvas::LayerIter::x() const { return fImpl->getX(); }
2227 int SkCanvas::LayerIter::y() const { return fImpl->getY(); } 2227 int SkCanvas::LayerIter::y() const { return fImpl->getY(); }
2228 2228
2229 /////////////////////////////////////////////////////////////////////////////// 2229 ///////////////////////////////////////////////////////////////////////////////
2230 2230
2231 SkCanvas::ClipVisitor::~ClipVisitor() { } 2231 SkCanvas::ClipVisitor::~ClipVisitor() { }
OLDNEW
« no previous file with comments | « src/core/SkBBoxRecord.cpp ('k') | src/core/SkPictureRecord.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698