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

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

Issue 61743017: drawPosTextOnPath is now deprecated, removing all overrides and impls (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « include/core/SkDraw.h ('k') | src/core/SkCanvas.cpp » ('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 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 "SkDraw.h" 10 #include "SkDraw.h"
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 draw.drawPosText((const char*)text, len, xpos, y, scalarsPerPos, paint); 359 draw.drawPosText((const char*)text, len, xpos, y, scalarsPerPos, paint);
360 } 360 }
361 361
362 void SkBitmapDevice::drawTextOnPath(const SkDraw& draw, const void* text, 362 void SkBitmapDevice::drawTextOnPath(const SkDraw& draw, const void* text,
363 size_t len, const SkPath& path, 363 size_t len, const SkPath& path,
364 const SkMatrix* matrix, 364 const SkMatrix* matrix,
365 const SkPaint& paint) { 365 const SkPaint& paint) {
366 draw.drawTextOnPath((const char*)text, len, path, matrix, paint); 366 draw.drawTextOnPath((const char*)text, len, path, matrix, paint);
367 } 367 }
368 368
369 #ifdef SK_BUILD_FOR_ANDROID
370 void SkBitmapDevice::drawPosTextOnPath(const SkDraw& draw, const void* text, siz e_t len,
371 const SkPoint pos[], const SkPaint& paint ,
372 const SkPath& path, const SkMatrix* matri x) {
373 draw.drawPosTextOnPath((const char*)text, len, pos, paint, path, matrix);
374 }
375 #endif
376
377 void SkBitmapDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode , 369 void SkBitmapDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode ,
378 int vertexCount, 370 int vertexCount,
379 const SkPoint verts[], const SkPoint textures[ ], 371 const SkPoint verts[], const SkPoint textures[ ],
380 const SkColor colors[], SkXfermode* xmode, 372 const SkColor colors[], SkXfermode* xmode,
381 const uint16_t indices[], int indexCount, 373 const uint16_t indices[], int indexCount,
382 const SkPaint& paint) { 374 const SkPaint& paint) {
383 draw.drawVertices(vmode, vertexCount, verts, textures, colors, xmode, 375 draw.drawVertices(vmode, vertexCount, verts, textures, colors, xmode,
384 indices, indexCount, paint); 376 indices, indexCount, paint);
385 } 377 }
386 378
(...skipping 18 matching lines...) Expand all
405 paint.getStyle() != SkPaint::kFill_Style || 397 paint.getStyle() != SkPaint::kFill_Style ||
406 !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)) { 398 !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)) {
407 // turn off lcd 399 // turn off lcd
408 flags->fFlags = paint.getFlags() & ~SkPaint::kLCDRenderText_Flag; 400 flags->fFlags = paint.getFlags() & ~SkPaint::kLCDRenderText_Flag;
409 flags->fHinting = paint.getHinting(); 401 flags->fHinting = paint.getHinting();
410 return true; 402 return true;
411 } 403 }
412 // we're cool with the paint as is 404 // we're cool with the paint as is
413 return false; 405 return false;
414 } 406 }
OLDNEW
« no previous file with comments | « include/core/SkDraw.h ('k') | src/core/SkCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698