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

Side by Side Diff: skia/ext/analysis_canvas.cc

Issue 132593005: skia: Stop overriding drawPosTextOnPath() on AnalysisCanvas. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « skia/ext/analysis_canvas.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/debug/trace_event.h" 5 #include "base/debug/trace_event.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "skia/ext/analysis_canvas.h" 7 #include "skia/ext/analysis_canvas.h"
8 #include "third_party/skia/include/core/SkDevice.h" 8 #include "third_party/skia/include/core/SkDevice.h"
9 #include "third_party/skia/include/core/SkDraw.h" 9 #include "third_party/skia/include/core/SkDraw.h"
10 #include "third_party/skia/include/core/SkRRect.h" 10 #include "third_party/skia/include/core/SkRRect.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 const void* text, 257 const void* text,
258 size_t len, 258 size_t len,
259 const SkPath& path, 259 const SkPath& path,
260 const SkMatrix* matrix, 260 const SkMatrix* matrix,
261 const SkPaint& paint) { 261 const SkPaint& paint) {
262 is_solid_color_ = false; 262 is_solid_color_ = false;
263 is_transparent_ = false; 263 is_transparent_ = false;
264 has_text_ = true; 264 has_text_ = true;
265 } 265 }
266 266
267 #ifdef SK_BUILD_FOR_ANDROID
268 void AnalysisDevice::drawPosTextOnPath(const SkDraw& draw,
269 const void* text,
270 size_t len,
271 const SkPoint pos[],
272 const SkPaint& paint,
273 const SkPath& path,
274 const SkMatrix* matrix) {
275 is_solid_color_ = false;
276 is_transparent_ = false;
277 has_text_ = true;
278 }
279 #endif
280
281 void AnalysisDevice::drawVertices(const SkDraw& draw, 267 void AnalysisDevice::drawVertices(const SkDraw& draw,
282 SkCanvas::VertexMode, 268 SkCanvas::VertexMode,
283 int vertex_count, 269 int vertex_count,
284 const SkPoint verts[], 270 const SkPoint verts[],
285 const SkPoint texs[], 271 const SkPoint texs[],
286 const SkColor colors[], 272 const SkColor colors[],
287 SkXfermode* xmode, 273 SkXfermode* xmode,
288 const uint16_t indices[], 274 const uint16_t indices[],
289 int index_count, 275 int index_count,
290 const SkPaint& paint) { 276 const SkPaint& paint) {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 (static_cast<AnalysisDevice*>(getDevice()))->SetForceNotTransparent( 404 (static_cast<AnalysisDevice*>(getDevice()))->SetForceNotTransparent(
419 false); 405 false);
420 force_not_transparent_stack_level_ = kNoLayer; 406 force_not_transparent_stack_level_ = kNoLayer;
421 } 407 }
422 } 408 }
423 } 409 }
424 410
425 } // namespace skia 411 } // namespace skia
426 412
427 413
OLDNEW
« no previous file with comments | « skia/ext/analysis_canvas.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698