OLD | NEW |
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 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1213 } | 1213 } |
1214 } | 1214 } |
1215 LOOPER_END | 1215 LOOPER_END |
1216 } | 1216 } |
1217 | 1217 |
1218 ///////////////////////////////////////////////////////////////////////////// | 1218 ///////////////////////////////////////////////////////////////////////////// |
1219 void SkCanvas::didTranslate(SkScalar, SkScalar) { | 1219 void SkCanvas::didTranslate(SkScalar, SkScalar) { |
1220 // Do nothing. Subclasses may do something. | 1220 // Do nothing. Subclasses may do something. |
1221 } | 1221 } |
1222 | 1222 |
1223 bool SkCanvas::translate(SkScalar dx, SkScalar dy) { | 1223 void SkCanvas::translate(SkScalar dx, SkScalar dy) { |
1224 fDeviceCMDirty = true; | 1224 fDeviceCMDirty = true; |
1225 fCachedLocalClipBoundsDirty = true; | 1225 fCachedLocalClipBoundsDirty = true; |
1226 bool res = fMCRec->fMatrix->preTranslate(dx, dy); | 1226 fMCRec->fMatrix->preTranslate(dx, dy); |
1227 | 1227 |
1228 this->didTranslate(dx, dy); | 1228 this->didTranslate(dx, dy); |
1229 return res; | |
1230 } | 1229 } |
1231 | 1230 |
1232 void SkCanvas::didScale(SkScalar, SkScalar) { | 1231 void SkCanvas::didScale(SkScalar, SkScalar) { |
1233 // Do nothing. Subclasses may do something. | 1232 // Do nothing. Subclasses may do something. |
1234 } | 1233 } |
1235 | 1234 |
1236 bool SkCanvas::scale(SkScalar sx, SkScalar sy) { | 1235 void SkCanvas::scale(SkScalar sx, SkScalar sy) { |
1237 fDeviceCMDirty = true; | 1236 fDeviceCMDirty = true; |
1238 fCachedLocalClipBoundsDirty = true; | 1237 fCachedLocalClipBoundsDirty = true; |
1239 bool res = fMCRec->fMatrix->preScale(sx, sy); | 1238 fMCRec->fMatrix->preScale(sx, sy); |
1240 | 1239 |
1241 this->didScale(sx, sy); | 1240 this->didScale(sx, sy); |
1242 return res; | |
1243 } | 1241 } |
1244 | 1242 |
1245 void SkCanvas::didRotate(SkScalar) { | 1243 void SkCanvas::didRotate(SkScalar) { |
1246 // Do nothing. Subclasses may do something. | 1244 // Do nothing. Subclasses may do something. |
1247 } | 1245 } |
1248 | 1246 |
1249 bool SkCanvas::rotate(SkScalar degrees) { | 1247 void SkCanvas::rotate(SkScalar degrees) { |
1250 fDeviceCMDirty = true; | 1248 fDeviceCMDirty = true; |
1251 fCachedLocalClipBoundsDirty = true; | 1249 fCachedLocalClipBoundsDirty = true; |
1252 bool res = fMCRec->fMatrix->preRotate(degrees); | 1250 fMCRec->fMatrix->preRotate(degrees); |
1253 | 1251 |
1254 this->didRotate(degrees); | 1252 this->didRotate(degrees); |
1255 return res; | |
1256 } | 1253 } |
1257 | 1254 |
1258 void SkCanvas::didSkew(SkScalar, SkScalar) { | 1255 void SkCanvas::didSkew(SkScalar, SkScalar) { |
1259 // Do nothing. Subclasses may do something. | 1256 // Do nothing. Subclasses may do something. |
1260 } | 1257 } |
1261 | 1258 |
1262 bool SkCanvas::skew(SkScalar sx, SkScalar sy) { | 1259 void SkCanvas::skew(SkScalar sx, SkScalar sy) { |
1263 fDeviceCMDirty = true; | 1260 fDeviceCMDirty = true; |
1264 fCachedLocalClipBoundsDirty = true; | 1261 fCachedLocalClipBoundsDirty = true; |
1265 bool res = fMCRec->fMatrix->preSkew(sx, sy); | 1262 fMCRec->fMatrix->preSkew(sx, sy); |
1266 | 1263 |
1267 this->didSkew(sx, sy); | 1264 this->didSkew(sx, sy); |
1268 return res; | |
1269 } | 1265 } |
1270 | 1266 |
1271 void SkCanvas::didConcat(const SkMatrix&) { | 1267 void SkCanvas::didConcat(const SkMatrix&) { |
1272 // Do nothing. Subclasses may do something. | 1268 // Do nothing. Subclasses may do something. |
1273 } | 1269 } |
1274 | 1270 |
1275 bool SkCanvas::concat(const SkMatrix& matrix) { | 1271 void SkCanvas::concat(const SkMatrix& matrix) { |
1276 fDeviceCMDirty = true; | 1272 fDeviceCMDirty = true; |
1277 fCachedLocalClipBoundsDirty = true; | 1273 fCachedLocalClipBoundsDirty = true; |
1278 bool res = fMCRec->fMatrix->preConcat(matrix); | 1274 fMCRec->fMatrix->preConcat(matrix); |
1279 | 1275 |
1280 this->didConcat(matrix); | 1276 this->didConcat(matrix); |
1281 return res; | |
1282 } | 1277 } |
1283 | 1278 |
1284 void SkCanvas::didSetMatrix(const SkMatrix&) { | 1279 void SkCanvas::didSetMatrix(const SkMatrix&) { |
1285 // Do nothing. Subclasses may do something. | 1280 // Do nothing. Subclasses may do something. |
1286 } | 1281 } |
1287 | 1282 |
1288 void SkCanvas::setMatrix(const SkMatrix& matrix) { | 1283 void SkCanvas::setMatrix(const SkMatrix& matrix) { |
1289 fDeviceCMDirty = true; | 1284 fDeviceCMDirty = true; |
1290 fCachedLocalClipBoundsDirty = true; | 1285 fCachedLocalClipBoundsDirty = true; |
1291 *fMCRec->fMatrix = matrix; | 1286 *fMCRec->fMatrix = matrix; |
(...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2538 if (!bitmap.allocPixels(info)) { | 2533 if (!bitmap.allocPixels(info)) { |
2539 return NULL; | 2534 return NULL; |
2540 } | 2535 } |
2541 | 2536 |
2542 // should this functionality be moved into allocPixels()? | 2537 // should this functionality be moved into allocPixels()? |
2543 if (!bitmap.info().isOpaque()) { | 2538 if (!bitmap.info().isOpaque()) { |
2544 bitmap.eraseColor(0); | 2539 bitmap.eraseColor(0); |
2545 } | 2540 } |
2546 return SkNEW_ARGS(SkCanvas, (bitmap)); | 2541 return SkNEW_ARGS(SkCanvas, (bitmap)); |
2547 } | 2542 } |
OLD | NEW |