AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove (unused) scale parameter from measureText

Browse Source 
BUG=skia:
R=bungeman@google.com, djsollen@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/510433002
This commit is contained in:
reed 2014-08-26 11:30:01 -07:00 committed by Commit bot
parent 1790e25e18
commit 99ae881a7f
4 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/core/SkPaint.h
View File

@ -862,12 +862,9 @@ public:
* @param length Number of bytes of text to measure * @param length Number of bytes of text to measure
* @param bounds If not NULL, returns the bounds of the text, * @param bounds If not NULL, returns the bounds of the text,
* relative to (0, 0). * relative to (0, 0).
* @param scale If not 0, return width as if the canvas were scaled
* by this value
* @return The advance width of the text * @return The advance width of the text
*/ */
SkScalar measureText(const void* text, size_t length, SkScalar measureText(const void* text, size_t length, SkRect* bounds) const;
SkRect* bounds, SkScalar scale = 0) const;
/** Return the width of the text. This will return the vertical measure /** Return the width of the text. This will return the vertical measure
* if isVerticalText() is true, in which case the returned value should * if isVerticalText() is true, in which case the returned value should
@ -878,7 +875,7 @@ public:
* @return The advance width of the text * @return The advance width of the text
*/ */
SkScalar measureText(const void* text, size_t length) const { SkScalar measureText(const void* text, size_t length) const {
return this->measureText(text, length, NULL, 0); return this->measureText(text, length, NULL);
} }
/** Specify the direction the text buffer should be processed in breakText() /** Specify the direction the text buffer should be processed in breakText()

18
samplecode/SampleMeasure.cpp
View File

@ -23,22 +23,15 @@
// exercise scale/linear/devkern // exercise scale/linear/devkern
struct Setting { struct Setting {
SkScalar fScale;
bool fLinearText; bool fLinearText;
bool fDevKernText; bool fDevKernText;
}; };
static const SkScalar ONE = SkIntToScalar(9999)/10000;
static const Setting gSettings[] = { static const Setting gSettings[] = {
{ 0, false, false }, { false, false },
{ 0, false, true }, { false, true },
{ 0, true, false }, { true, false },
{ 0, true, true }, { true, true },
{ ONE, false, false },
{ ONE, false, true },
{ ONE, true, false },
{ ONE, true, true }
}; };
static void doMeasure(SkCanvas* canvas, const SkPaint& paint, const char text[]) { static void doMeasure(SkCanvas* canvas, const SkPaint& paint, const char text[]) {
@ -55,10 +48,9 @@ static void doMeasure(SkCanvas* canvas, const SkPaint& paint, const char text[])
for (size_t i = 0; i < SK_ARRAY_COUNT(gSettings); i++) { for (size_t i = 0; i < SK_ARRAY_COUNT(gSettings); i++) {
p.setLinearText(gSettings[i].fLinearText); p.setLinearText(gSettings[i].fLinearText);
p.setDevKernText(gSettings[i].fDevKernText); p.setDevKernText(gSettings[i].fDevKernText);
SkScalar scale = gSettings[i].fScale;
int n = p.getTextWidths(text, len, widths, rects); int n = p.getTextWidths(text, len, widths, rects);
SkScalar w = p.measureText(text, len, &bounds, scale); SkScalar w = p.measureText(text, len, &bounds);
p.setStyle(SkPaint::kFill_Style); p.setStyle(SkPaint::kFill_Style);
p.setColor(0x8888FF88); p.setColor(0x8888FF88);

11
src/core/SkPaint.cpp
View File

@ -1100,8 +1100,7 @@ SkScalar SkPaint::measure_text(SkGlyphCache* cache,
return Sk48Dot16ToScalar(x); return Sk48Dot16ToScalar(x);
} }
SkScalar SkPaint::measureText(const void* textData, size_t length, SkScalar SkPaint::measureText(const void* textData, size_t length, SkRect* bounds) const {
SkRect* bounds, SkScalar zoom) const {
const char* text = (const char*)textData; const char* text = (const char*)textData;
SkASSERT(text != NULL || length == 0); SkASSERT(text != NULL || length == 0);
@ -1109,13 +1108,7 @@ SkScalar SkPaint::measureText(const void* textData, size_t length,
const SkPaint& paint = canon.getPaint(); const SkPaint& paint = canon.getPaint();
SkScalar scale = canon.getScale(); SkScalar scale = canon.getScale();
SkMatrix zoomMatrix, *zoomPtr = NULL; SkAutoGlyphCache autoCache(paint, NULL, NULL);
if (zoom) {
zoomMatrix.setScale(zoom, zoom);
zoomPtr = &zoomMatrix;
}
SkAutoGlyphCache autoCache(paint, NULL, zoomPtr);
SkGlyphCache* cache = autoCache.getCache(); SkGlyphCache* cache = autoCache.getCache();
SkScalar width = 0; SkScalar width = 0;

2
tests/PaintTest.cpp
View File

@ -309,7 +309,7 @@ DEF_TEST(Paint_regression_measureText, reporter) {
r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN); r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN);
// test that the rect was reset // test that the rect was reset
paint.measureText("", 0, &r, 1.0f); paint.measureText("", 0, &r);
REPORTER_ASSERT(reporter, r.isEmpty()); REPORTER_ASSERT(reporter, r.isEmpty());
} }