OLD | NEW |
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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 | 9 |
10 #include "SkColorPriv.h" | 10 #include "SkColorPriv.h" |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 } | 251 } |
252 } | 252 } |
253 return commandString; | 253 return commandString; |
254 } | 254 } |
255 | 255 |
256 void SkDebugCanvas::toggleFilter(bool toggle) { | 256 void SkDebugCanvas::toggleFilter(bool toggle) { |
257 fFilter = toggle; | 257 fFilter = toggle; |
258 } | 258 } |
259 | 259 |
260 void SkDebugCanvas::clear(SkColor color) { | 260 void SkDebugCanvas::clear(SkColor color) { |
261 addDrawCommand(new Clear(color)); | 261 addDrawCommand(new SkClearCommand(color)); |
262 } | 262 } |
263 | 263 |
264 bool SkDebugCanvas::clipPath(const SkPath& path, SkRegion::Op op, bool doAA) { | 264 bool SkDebugCanvas::clipPath(const SkPath& path, SkRegion::Op op, bool doAA) { |
265 addDrawCommand(new ClipPath(path, op, doAA)); | 265 addDrawCommand(new SkClipPathCommand(path, op, doAA)); |
266 return true; | 266 return true; |
267 } | 267 } |
268 | 268 |
269 bool SkDebugCanvas::clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) { | 269 bool SkDebugCanvas::clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) { |
270 addDrawCommand(new ClipRect(rect, op, doAA)); | 270 addDrawCommand(new SkClipRectCommand(rect, op, doAA)); |
271 return true; | 271 return true; |
272 } | 272 } |
273 | 273 |
274 bool SkDebugCanvas::clipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA)
{ | 274 bool SkDebugCanvas::clipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA)
{ |
275 addDrawCommand(new ClipRRect(rrect, op, doAA)); | 275 addDrawCommand(new SkClipRRectCommand(rrect, op, doAA)); |
276 return true; | 276 return true; |
277 } | 277 } |
278 | 278 |
279 bool SkDebugCanvas::clipRegion(const SkRegion& region, SkRegion::Op op) { | 279 bool SkDebugCanvas::clipRegion(const SkRegion& region, SkRegion::Op op) { |
280 addDrawCommand(new ClipRegion(region, op)); | 280 addDrawCommand(new SkClipRegionCommand(region, op)); |
281 return true; | 281 return true; |
282 } | 282 } |
283 | 283 |
284 bool SkDebugCanvas::concat(const SkMatrix& matrix) { | 284 bool SkDebugCanvas::concat(const SkMatrix& matrix) { |
285 addDrawCommand(new Concat(matrix)); | 285 addDrawCommand(new SkConcatCommand(matrix)); |
286 return true; | 286 return true; |
287 } | 287 } |
288 | 288 |
289 void SkDebugCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left, | 289 void SkDebugCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left, |
290 SkScalar top, const SkPaint* paint = NULL) { | 290 SkScalar top, const SkPaint* paint = NULL) { |
291 addDrawCommand(new DrawBitmap(bitmap, left, top, paint)); | 291 addDrawCommand(new SkDrawBitmapCommand(bitmap, left, top, paint)); |
292 } | 292 } |
293 | 293 |
294 void SkDebugCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, | 294 void SkDebugCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, |
295 const SkRect* src, const SkRect& dst, const SkPaint* paint) { | 295 const SkRect* src, const SkRect& dst, const SkPaint* paint) { |
296 addDrawCommand(new DrawBitmapRect(bitmap, src, dst, paint)); | 296 addDrawCommand(new SkDrawBitmapRectCommand(bitmap, src, dst, paint)); |
297 } | 297 } |
298 | 298 |
299 void SkDebugCanvas::drawBitmapMatrix(const SkBitmap& bitmap, | 299 void SkDebugCanvas::drawBitmapMatrix(const SkBitmap& bitmap, |
300 const SkMatrix& matrix, const SkPaint* paint) { | 300 const SkMatrix& matrix, const SkPaint* paint) { |
301 addDrawCommand(new DrawBitmapMatrix(bitmap, matrix, paint)); | 301 addDrawCommand(new SkDrawBitmapMatrixCommand(bitmap, matrix, paint)); |
302 } | 302 } |
303 | 303 |
304 void SkDebugCanvas::drawBitmapNine(const SkBitmap& bitmap, | 304 void SkDebugCanvas::drawBitmapNine(const SkBitmap& bitmap, |
305 const SkIRect& center, const SkRect& dst, const SkPaint* paint) { | 305 const SkIRect& center, const SkRect& dst, const SkPaint* paint) { |
306 addDrawCommand(new DrawBitmapNine(bitmap, center, dst, paint)); | 306 addDrawCommand(new SkDrawBitmapNineCommand(bitmap, center, dst, paint)); |
307 } | 307 } |
308 | 308 |
309 void SkDebugCanvas::drawData(const void* data, size_t length) { | 309 void SkDebugCanvas::drawData(const void* data, size_t length) { |
310 addDrawCommand(new DrawData(data, length)); | 310 addDrawCommand(new SkDrawDataCommand(data, length)); |
311 } | 311 } |
312 | 312 |
313 void SkDebugCanvas::beginCommentGroup(const char* description) { | 313 void SkDebugCanvas::beginCommentGroup(const char* description) { |
314 addDrawCommand(new BeginCommentGroup(description)); | 314 addDrawCommand(new SkBeginCommentGroupCommand(description)); |
315 } | 315 } |
316 | 316 |
317 void SkDebugCanvas::addComment(const char* kywd, const char* value) { | 317 void SkDebugCanvas::addComment(const char* kywd, const char* value) { |
318 addDrawCommand(new Comment(kywd, value)); | 318 addDrawCommand(new SkCommentCommand(kywd, value)); |
319 } | 319 } |
320 | 320 |
321 void SkDebugCanvas::endCommentGroup() { | 321 void SkDebugCanvas::endCommentGroup() { |
322 addDrawCommand(new EndCommentGroup()); | 322 addDrawCommand(new SkEndCommentGroupCommand()); |
323 } | 323 } |
324 | 324 |
325 void SkDebugCanvas::drawOval(const SkRect& oval, const SkPaint& paint) { | 325 void SkDebugCanvas::drawOval(const SkRect& oval, const SkPaint& paint) { |
326 addDrawCommand(new DrawOval(oval, paint)); | 326 addDrawCommand(new SkDrawOvalCommand(oval, paint)); |
327 } | 327 } |
328 | 328 |
329 void SkDebugCanvas::drawPaint(const SkPaint& paint) { | 329 void SkDebugCanvas::drawPaint(const SkPaint& paint) { |
330 addDrawCommand(new DrawPaint(paint)); | 330 addDrawCommand(new SkDrawPaintCommand(paint)); |
331 } | 331 } |
332 | 332 |
333 void SkDebugCanvas::drawPath(const SkPath& path, const SkPaint& paint) { | 333 void SkDebugCanvas::drawPath(const SkPath& path, const SkPaint& paint) { |
334 addDrawCommand(new DrawPath(path, paint)); | 334 addDrawCommand(new SkDrawPathCommand(path, paint)); |
335 } | 335 } |
336 | 336 |
337 void SkDebugCanvas::drawPicture(SkPicture& picture) { | 337 void SkDebugCanvas::drawPicture(SkPicture& picture) { |
338 addDrawCommand(new DrawPicture(picture)); | 338 addDrawCommand(new SkDrawPictureCommand(picture)); |
339 } | 339 } |
340 | 340 |
341 void SkDebugCanvas::drawPoints(PointMode mode, size_t count, | 341 void SkDebugCanvas::drawPoints(PointMode mode, size_t count, |
342 const SkPoint pts[], const SkPaint& paint) { | 342 const SkPoint pts[], const SkPaint& paint) { |
343 addDrawCommand(new DrawPoints(mode, count, pts, paint)); | 343 addDrawCommand(new SkDrawPointsCommand(mode, count, pts, paint)); |
344 } | 344 } |
345 | 345 |
346 void SkDebugCanvas::drawPosText(const void* text, size_t byteLength, | 346 void SkDebugCanvas::drawPosText(const void* text, size_t byteLength, |
347 const SkPoint pos[], const SkPaint& paint) { | 347 const SkPoint pos[], const SkPaint& paint) { |
348 addDrawCommand(new DrawPosText(text, byteLength, pos, paint)); | 348 addDrawCommand(new SkDrawPosTextCommand(text, byteLength, pos, paint)); |
349 } | 349 } |
350 | 350 |
351 void SkDebugCanvas::drawPosTextH(const void* text, size_t byteLength, | 351 void SkDebugCanvas::drawPosTextH(const void* text, size_t byteLength, |
352 const SkScalar xpos[], SkScalar constY, const SkPaint& paint) { | 352 const SkScalar xpos[], SkScalar constY, const SkPaint& paint) { |
353 addDrawCommand(new DrawPosTextH(text, byteLength, xpos, constY, paint)); | 353 addDrawCommand( |
| 354 new SkDrawPosTextHCommand(text, byteLength, xpos, constY, paint)); |
354 } | 355 } |
355 | 356 |
356 void SkDebugCanvas::drawRect(const SkRect& rect, const SkPaint& paint) { | 357 void SkDebugCanvas::drawRect(const SkRect& rect, const SkPaint& paint) { |
357 // NOTE(chudy): Messing up when renamed to DrawRect... Why? | 358 // NOTE(chudy): Messing up when renamed to DrawRect... Why? |
358 addDrawCommand(new DrawRectC(rect, paint)); | 359 addDrawCommand(new SkDrawRectCommand(rect, paint)); |
359 } | 360 } |
360 | 361 |
361 void SkDebugCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { | 362 void SkDebugCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) { |
362 addDrawCommand(new DrawRRect(rrect, paint)); | 363 addDrawCommand(new SkDrawRRectCommand(rrect, paint)); |
363 } | 364 } |
364 | 365 |
365 void SkDebugCanvas::drawSprite(const SkBitmap& bitmap, int left, int top, | 366 void SkDebugCanvas::drawSprite(const SkBitmap& bitmap, int left, int top, |
366 const SkPaint* paint = NULL) { | 367 const SkPaint* paint = NULL) { |
367 addDrawCommand(new DrawSprite(bitmap, left, top, paint)); | 368 addDrawCommand(new SkDrawSpriteCommand(bitmap, left, top, paint)); |
368 } | 369 } |
369 | 370 |
370 void SkDebugCanvas::drawText(const void* text, size_t byteLength, SkScalar x, | 371 void SkDebugCanvas::drawText(const void* text, size_t byteLength, SkScalar x, |
371 SkScalar y, const SkPaint& paint) { | 372 SkScalar y, const SkPaint& paint) { |
372 addDrawCommand(new DrawTextC(text, byteLength, x, y, paint)); | 373 addDrawCommand(new SkDrawTextCommand(text, byteLength, x, y, paint)); |
373 } | 374 } |
374 | 375 |
375 void SkDebugCanvas::drawTextOnPath(const void* text, size_t byteLength, | 376 void SkDebugCanvas::drawTextOnPath(const void* text, size_t byteLength, |
376 const SkPath& path, const SkMatrix* matrix, const SkPaint& paint) { | 377 const SkPath& path, const SkMatrix* matrix, const SkPaint& paint) { |
377 addDrawCommand(new DrawTextOnPath(text, byteLength, path, matrix, paint)); | 378 addDrawCommand( |
| 379 new SkDrawTextOnPathCommand(text, byteLength, path, matrix, paint)); |
378 } | 380 } |
379 | 381 |
380 void SkDebugCanvas::drawVertices(VertexMode vmode, int vertexCount, | 382 void SkDebugCanvas::drawVertices(VertexMode vmode, int vertexCount, |
381 const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], | 383 const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], |
382 SkXfermode*, const uint16_t indices[], int indexCount, | 384 SkXfermode*, const uint16_t indices[], int indexCount, |
383 const SkPaint& paint) { | 385 const SkPaint& paint) { |
384 addDrawCommand(new DrawVertices(vmode, vertexCount, vertices, texs, colors, | 386 addDrawCommand(new SkDrawVerticesCommand(vmode, vertexCount, vertices, |
385 NULL, indices, indexCount, paint)); | 387 texs, colors, NULL, indices, indexCount, paint)); |
386 } | 388 } |
387 | 389 |
388 void SkDebugCanvas::restore() { | 390 void SkDebugCanvas::restore() { |
389 addDrawCommand(new Restore()); | 391 addDrawCommand(new SkRestoreCommand()); |
390 } | 392 } |
391 | 393 |
392 bool SkDebugCanvas::rotate(SkScalar degrees) { | 394 bool SkDebugCanvas::rotate(SkScalar degrees) { |
393 addDrawCommand(new Rotate(degrees)); | 395 addDrawCommand(new SkRotateCommand(degrees)); |
394 return true; | 396 return true; |
395 } | 397 } |
396 | 398 |
397 int SkDebugCanvas::save(SaveFlags flags) { | 399 int SkDebugCanvas::save(SaveFlags flags) { |
398 addDrawCommand(new Save(flags)); | 400 addDrawCommand(new SkSaveCommand(flags)); |
399 return true; | 401 return true; |
400 } | 402 } |
401 | 403 |
402 int SkDebugCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint, | 404 int SkDebugCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint, |
403 SaveFlags flags) { | 405 SaveFlags flags) { |
404 addDrawCommand(new SaveLayer(bounds, paint, flags)); | 406 addDrawCommand(new SkSaveLayerCommand(bounds, paint, flags)); |
405 return true; | 407 return true; |
406 } | 408 } |
407 | 409 |
408 bool SkDebugCanvas::scale(SkScalar sx, SkScalar sy) { | 410 bool SkDebugCanvas::scale(SkScalar sx, SkScalar sy) { |
409 addDrawCommand(new Scale(sx, sy)); | 411 addDrawCommand(new SkScaleCommand(sx, sy)); |
410 return true; | 412 return true; |
411 } | 413 } |
412 | 414 |
413 void SkDebugCanvas::setMatrix(const SkMatrix& matrix) { | 415 void SkDebugCanvas::setMatrix(const SkMatrix& matrix) { |
414 addDrawCommand(new SetMatrix(matrix)); | 416 addDrawCommand(new SkSetMatrixCommand(matrix)); |
415 } | 417 } |
416 | 418 |
417 bool SkDebugCanvas::skew(SkScalar sx, SkScalar sy) { | 419 bool SkDebugCanvas::skew(SkScalar sx, SkScalar sy) { |
418 addDrawCommand(new Skew(sx, sy)); | 420 addDrawCommand(new SkSkewCommand(sx, sy)); |
419 return true; | 421 return true; |
420 } | 422 } |
421 | 423 |
422 bool SkDebugCanvas::translate(SkScalar dx, SkScalar dy) { | 424 bool SkDebugCanvas::translate(SkScalar dx, SkScalar dy) { |
423 addDrawCommand(new Translate(dx, dy)); | 425 addDrawCommand(new SkTranslateCommand(dx, dy)); |
424 return true; | 426 return true; |
425 } | 427 } |
426 | 428 |
427 void SkDebugCanvas::toggleCommand(int index, bool toggle) { | 429 void SkDebugCanvas::toggleCommand(int index, bool toggle) { |
428 SkASSERT(index < fCommandVector.count()); | 430 SkASSERT(index < fCommandVector.count()); |
429 fCommandVector[index]->setVisible(toggle); | 431 fCommandVector[index]->setVisible(toggle); |
430 } | 432 } |
OLD | NEW |