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

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

Issue 933483002: add Method param to drawTextOnPath, supporting SVG spec Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: add guard for android 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
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 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 "SkBitmapDevice.h" 8 #include "SkBitmapDevice.h"
9 #include "SkConfig8888.h" 9 #include "SkConfig8888.h"
10 #include "SkDeviceProperties.h" 10 #include "SkDeviceProperties.h"
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 } 324 }
325 325
326 void SkBitmapDevice::drawPosText(const SkDraw& draw, const void* text, size_t le n, 326 void SkBitmapDevice::drawPosText(const SkDraw& draw, const void* text, size_t le n,
327 const SkScalar xpos[], int scalarsPerPos, 327 const SkScalar xpos[], int scalarsPerPos,
328 const SkPoint& offset, const SkPaint& paint) { 328 const SkPoint& offset, const SkPaint& paint) {
329 draw.drawPosText((const char*)text, len, xpos, scalarsPerPos, offset, paint) ; 329 draw.drawPosText((const char*)text, len, xpos, scalarsPerPos, offset, paint) ;
330 } 330 }
331 331
332 void SkBitmapDevice::drawTextOnPath(const SkDraw& draw, const void* text, 332 void SkBitmapDevice::drawTextOnPath(const SkDraw& draw, const void* text,
333 size_t len, const SkPath& path, 333 size_t len, const SkPath& path,
334 const SkMatrix* matrix, 334 const SkMatrix* matrix, SK_SUPPORT_LEGACY_DR AWTEXTONPATH_PARAM
335 const SkPaint& paint) { 335 const SkPaint& paint) {
336 draw.drawTextOnPath((const char*)text, len, path, matrix, paint); 336 SK_SUPPORT_LEGACY_DRAWTEXTONPATH_DEFAULT_METHOD
337 draw.drawTextOnPath((const char*)text, len, path, matrix, method, paint);
337 } 338 }
338 339
339 void SkBitmapDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode , 340 void SkBitmapDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode ,
340 int vertexCount, 341 int vertexCount,
341 const SkPoint verts[], const SkPoint textures[ ], 342 const SkPoint verts[], const SkPoint textures[ ],
342 const SkColor colors[], SkXfermode* xmode, 343 const SkColor colors[], SkXfermode* xmode,
343 const uint16_t indices[], int indexCount, 344 const uint16_t indices[], int indexCount,
344 const SkPaint& paint) { 345 const SkPaint& paint) {
345 draw.drawVertices(vmode, vertexCount, verts, textures, colors, xmode, 346 draw.drawVertices(vmode, vertexCount, verts, textures, colors, xmode,
346 indices, indexCount, paint); 347 indices, indexCount, paint);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 paint.getRasterizer() || 384 paint.getRasterizer() ||
384 paint.getPathEffect() || 385 paint.getPathEffect() ||
385 paint.isFakeBoldText() || 386 paint.isFakeBoldText() ||
386 paint.getStyle() != SkPaint::kFill_Style || 387 paint.getStyle() != SkPaint::kFill_Style ||
387 !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)) 388 !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode))
388 { 389 {
389 return true; 390 return true;
390 } 391 }
391 return false; 392 return false;
392 } 393 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698