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

Unified Diff: src/core/SkRecorder.cpp

Issue 484673003: Record concat as setMatrix. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove no-op INHERITED calls Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkRecordDraw.cpp ('k') | src/core/SkRecords.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkRecorder.cpp
diff --git a/src/core/SkRecorder.cpp b/src/core/SkRecorder.cpp
index d49de20e6865bb87a1757357237f27e80d32ef9f..1ee24fff5695922959c0a1ed6e97c178f45bf71c 100644
--- a/src/core/SkRecorder.cpp
+++ b/src/core/SkRecorder.cpp
@@ -218,20 +218,17 @@ void SkRecorder::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
void SkRecorder::willSave() {
APPEND(Save);
- INHERITED(willSave);
}
SkCanvas::SaveLayerStrategy SkRecorder::willSaveLayer(const SkRect* bounds,
const SkPaint* paint,
SkCanvas::SaveFlags flags) {
APPEND(SaveLayer, this->copy(bounds), this->copy(paint), flags);
- INHERITED(willSaveLayer, bounds, paint, flags);
return SkCanvas::kNoLayer_SaveLayerStrategy;
}
void SkRecorder::didRestore() {
APPEND(Restore, this->devBounds(), this->getTotalMatrix());
- INHERITED(didRestore);
}
void SkRecorder::onPushCull(const SkRect& rect) {
@@ -243,14 +240,12 @@ void SkRecorder::onPopCull() {
}
void SkRecorder::didConcat(const SkMatrix& matrix) {
- APPEND(Concat, matrix);
- INHERITED(didConcat, matrix);
+ this->didSetMatrix(this->getTotalMatrix());
}
void SkRecorder::didSetMatrix(const SkMatrix& matrix) {
SkASSERT(matrix == this->getTotalMatrix());
APPEND(SetMatrix, matrix);
- INHERITED(didSetMatrix, matrix);
}
void SkRecorder::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
« no previous file with comments | « src/core/SkRecordDraw.cpp ('k') | src/core/SkRecords.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698