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

Side by Side Diff: src/utils/SkDeferredCanvas.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, 2 months 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/pipe/SkGPipeWrite.cpp ('k') | src/utils/SkDumpCanvas.cpp » ('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 2013 Google Inc. 3 * Copyright 2013 Google Inc.
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 #include "SkDeferredCanvas.h" 9 #include "SkDeferredCanvas.h"
10 10
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 this->drawingCanvas()->drawPoints(mode, count, pts, paint); 839 this->drawingCanvas()->drawPoints(mode, count, pts, paint);
840 this->recordedDrawCommand(); 840 this->recordedDrawCommand();
841 } 841 }
842 842
843 void SkDeferredCanvas::drawOval(const SkRect& rect, const SkPaint& paint) { 843 void SkDeferredCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
844 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); 844 AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
845 this->drawingCanvas()->drawOval(rect, paint); 845 this->drawingCanvas()->drawOval(rect, paint);
846 this->recordedDrawCommand(); 846 this->recordedDrawCommand();
847 } 847 }
848 848
849 void SkDeferredCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) { 849 void SkDeferredCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
850 if (fDeferredDrawing && this->isFullFrame(&rect, &paint) && 850 if (fDeferredDrawing && this->isFullFrame(&rect, &paint) &&
851 isPaintOpaque(&paint)) { 851 isPaintOpaque(&paint)) {
852 this->getDeferredDevice()->skipPendingCommands(); 852 this->getDeferredDevice()->skipPendingCommands();
853 } 853 }
854 854
855 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); 855 AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
856 this->drawingCanvas()->drawRect(rect, paint); 856 this->drawingCanvas()->drawRect(rect, paint);
857 this->recordedDrawCommand(); 857 this->recordedDrawCommand();
858 } 858 }
859 859
860 void SkDeferredCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { 860 void SkDeferredCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
861 if (rrect.isRect()) { 861 if (rrect.isRect()) {
862 this->SkDeferredCanvas::drawRect(rrect.getBounds(), paint); 862 this->SkDeferredCanvas::drawRect(rrect.getBounds(), paint);
863 } else if (rrect.isOval()) { 863 } else if (rrect.isOval()) {
864 this->SkDeferredCanvas::drawOval(rrect.getBounds(), paint); 864 this->SkDeferredCanvas::drawOval(rrect.getBounds(), paint);
865 } else { 865 } else {
866 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); 866 AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
867 this->drawingCanvas()->drawRRect(rrect, paint); 867 this->drawingCanvas()->drawRRect(rrect, paint);
868 this->recordedDrawCommand(); 868 this->recordedDrawCommand();
869 } 869 }
870 } 870 }
871 871
872 void SkDeferredCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { 872 void SkDeferredCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
873 AutoImmediateDrawIfNeeded autoDraw(*this, &paint); 873 AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
874 this->drawingCanvas()->drawPath(path, paint); 874 this->drawingCanvas()->drawPath(path, paint);
875 this->recordedDrawCommand(); 875 this->recordedDrawCommand();
876 } 876 }
877 877
878 void SkDeferredCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left, 878 void SkDeferredCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left,
879 SkScalar top, const SkPaint* paint) { 879 SkScalar top, const SkPaint* paint) {
880 SkRect bitmapRect = SkRect::MakeXYWH(left, top, 880 SkRect bitmapRect = SkRect::MakeXYWH(left, top,
881 SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())); 881 SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height()));
882 if (fDeferredDrawing && 882 if (fDeferredDrawing &&
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) { 1003 SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) {
1004 this->drawingCanvas()->setDrawFilter(filter); 1004 this->drawingCanvas()->setDrawFilter(filter);
1005 this->INHERITED::setDrawFilter(filter); 1005 this->INHERITED::setDrawFilter(filter);
1006 this->recordedDrawCommand(); 1006 this->recordedDrawCommand();
1007 return filter; 1007 return filter;
1008 } 1008 }
1009 1009
1010 SkCanvas* SkDeferredCanvas::canvasForDrawIter() { 1010 SkCanvas* SkDeferredCanvas::canvasForDrawIter() {
1011 return this->drawingCanvas(); 1011 return this->drawingCanvas();
1012 } 1012 }
OLDNEW
« no previous file with comments | « src/pipe/SkGPipeWrite.cpp ('k') | src/utils/SkDumpCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698