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

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

Issue 933483002: add Method param to drawTextOnPath, supporting SVG spec Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 10 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
« no previous file with comments | « src/core/SkPictureData.h ('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 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkCanvas.h" 8 #include "SkCanvas.h"
9 #include "SkPatchUtils.h" 9 #include "SkPatchUtils.h"
10 #include "SkPictureData.h" 10 #include "SkPictureData.h"
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 canvas->drawText(text.text(), text.length(), ptr[0], ptr[1], pai nt); 356 canvas->drawText(text.text(), text.length(), ptr[0], ptr[1], pai nt);
357 } 357 }
358 } break; 358 } break;
359 case DRAW_TEXT_ON_PATH: { 359 case DRAW_TEXT_ON_PATH: {
360 const SkPaint& paint = *fPictureData->getPaint(reader); 360 const SkPaint& paint = *fPictureData->getPaint(reader);
361 TextContainer text; 361 TextContainer text;
362 get_text(reader, &text); 362 get_text(reader, &text);
363 const SkPath& path = fPictureData->getPath(reader); 363 const SkPath& path = fPictureData->getPath(reader);
364 SkMatrix matrix; 364 SkMatrix matrix;
365 reader->readMatrix(&matrix); 365 reader->readMatrix(&matrix);
366 canvas->drawTextOnPath(text.text(), text.length(), path, &matrix, pa int); 366 SkCanvas::TextOnPathMethod method = SkCanvas::kStretch_TextOnPathMet hod;
367 if (fPictureData->version() >= SkReadBuffer::kTextOnPathMethod_Versi on) {
368 method = (SkCanvas::TextOnPathMethod)reader->readInt();
369 }
370 canvas->drawTextOnPath(text.text(), text.length(), path, &matrix, me thod, paint);
367 } break; 371 } break;
368 case DRAW_VERTICES: { 372 case DRAW_VERTICES: {
369 SkAutoTUnref<SkXfermode> xfer; 373 SkAutoTUnref<SkXfermode> xfer;
370 const SkPaint& paint = *fPictureData->getPaint(reader); 374 const SkPaint& paint = *fPictureData->getPaint(reader);
371 DrawVertexFlags flags = (DrawVertexFlags)reader->readInt(); 375 DrawVertexFlags flags = (DrawVertexFlags)reader->readInt();
372 SkCanvas::VertexMode vmode = (SkCanvas::VertexMode)reader->readInt() ; 376 SkCanvas::VertexMode vmode = (SkCanvas::VertexMode)reader->readInt() ;
373 int vCount = reader->readInt(); 377 int vCount = reader->readInt();
374 const SkPoint* verts = (const SkPoint*)reader->skip(vCount * sizeof( SkPoint)); 378 const SkPoint* verts = (const SkPoint*)reader->skip(vCount * sizeof( SkPoint));
375 const SkPoint* texs = NULL; 379 const SkPoint* texs = NULL;
376 const SkColor* colors = NULL; 380 const SkColor* colors = NULL;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 case TRANSLATE: { 437 case TRANSLATE: {
434 SkScalar dx = reader->readScalar(); 438 SkScalar dx = reader->readScalar();
435 SkScalar dy = reader->readScalar(); 439 SkScalar dy = reader->readScalar();
436 canvas->translate(dx, dy); 440 canvas->translate(dx, dy);
437 } break; 441 } break;
438 default: 442 default:
439 SkASSERTF(false, "Unknown draw type: %d", op); 443 SkASSERTF(false, "Unknown draw type: %d", op);
440 } 444 }
441 } 445 }
442 446
OLDNEW
« no previous file with comments | « src/core/SkPictureData.h ('k') | src/core/SkPictureRecord.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698