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

Side by Side Diff: src/gpu/GrPathRendering.cpp

Issue 939123002: Make fID and MixedID calculations private (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Support android build 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 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 "GrPathRendering.h" 8 #include "GrPathRendering.h"
9 #include "SkDescriptor.h" 9 #include "SkDescriptor.h"
10 #include "SkGlyph.h" 10 #include "SkGlyph.h"
(...skipping 12 matching lines...) Expand all
23 virtual ~GlyphGenerator() { 23 virtual ~GlyphGenerator() {
24 SkDescriptor::Free(fDesc); 24 SkDescriptor::Free(fDesc);
25 } 25 }
26 26
27 int getNumPaths() SK_OVERRIDE { 27 int getNumPaths() SK_OVERRIDE {
28 return fScalerContext->getGlyphCount(); 28 return fScalerContext->getGlyphCount();
29 } 29 }
30 30
31 void generatePath(int glyphID, SkPath* out) SK_OVERRIDE { 31 void generatePath(int glyphID, SkPath* out) SK_OVERRIDE {
32 SkGlyph skGlyph; 32 SkGlyph skGlyph;
33 skGlyph.init(SkGlyph::MakeID(glyphID)); 33 skGlyph.initWithGlyphID(glyphID);
34 fScalerContext->getMetrics(&skGlyph); 34 fScalerContext->getMetrics(&skGlyph);
35 35
36 fScalerContext->getPath(skGlyph, out); 36 fScalerContext->getPath(skGlyph, out);
37 out->transform(fFlipMatrix); // Load glyphs with the inverted y-directio n. 37 out->transform(fFlipMatrix); // Load glyphs with the inverted y-directio n.
38 } 38 }
39 39
40 bool isEqualTo(const SkDescriptor& desc) const SK_OVERRIDE { 40 bool isEqualTo(const SkDescriptor& desc) const SK_OVERRIDE {
41 return fDesc->equals(desc); 41 return fDesc->equals(desc);
42 } 42 }
43 43
(...skipping 26 matching lines...) Expand all
70 SkAutoDescriptor ad(sizeof(rec) + SkDescriptor::ComputeOverhead(1)); 70 SkAutoDescriptor ad(sizeof(rec) + SkDescriptor::ComputeOverhead(1));
71 SkDescriptor* genericDesc = ad.getDesc(); 71 SkDescriptor* genericDesc = ad.getDesc();
72 72
73 genericDesc->init(); 73 genericDesc->init();
74 genericDesc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec); 74 genericDesc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
75 genericDesc->computeChecksum(); 75 genericDesc->computeChecksum();
76 76
77 SkAutoTUnref<GlyphGenerator> generator(SkNEW_ARGS(GlyphGenerator, (*typeface , *genericDesc))); 77 SkAutoTUnref<GlyphGenerator> generator(SkNEW_ARGS(GlyphGenerator, (*typeface , *genericDesc)));
78 return this->createPathRange(generator, stroke); 78 return this->createPathRange(generator, stroke);
79 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698