diff options
author | reed <reed@google.com> | 2014-08-26 11:30:01 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-08-26 11:30:01 -0700 |
commit | 99ae881a7f55a03c2b16fb5704e6e90ea86d965d (patch) | |
tree | 63c37173411d0347f262c8aa20975ca67baa2592 | |
parent | 1790e25e1829ed4091fb149764425df7a3c9c0e0 (diff) |
remove (unused) scale parameter from measureText
BUG=skia:
R=bungeman@google.com, djsollen@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/510433002
-rw-r--r-- | include/core/SkPaint.h | 7 | ||||
-rw-r--r-- | samplecode/SampleMeasure.cpp | 18 | ||||
-rw-r--r-- | src/core/SkPaint.cpp | 11 | ||||
-rw-r--r-- | tests/PaintTest.cpp | 2 |
4 files changed, 10 insertions, 28 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 4d5c54ef58..af5978d7b3 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -862,12 +862,9 @@ public: * @param length Number of bytes of text to measure * @param bounds If not NULL, returns the bounds of the text, * 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 */ - SkScalar measureText(const void* text, size_t length, - SkRect* bounds, SkScalar scale = 0) const; + SkScalar measureText(const void* text, size_t length, SkRect* bounds) const; /** Return the width of the text. This will return the vertical measure * if isVerticalText() is true, in which case the returned value should @@ -878,7 +875,7 @@ public: * @return The advance width of the text */ 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() diff --git a/samplecode/SampleMeasure.cpp b/samplecode/SampleMeasure.cpp index 257f7d99e0..86f9b52516 100644 --- a/samplecode/SampleMeasure.cpp +++ b/samplecode/SampleMeasure.cpp @@ -23,22 +23,15 @@ // exercise scale/linear/devkern struct Setting { - SkScalar fScale; bool fLinearText; bool fDevKernText; }; -static const SkScalar ONE = SkIntToScalar(9999)/10000; - static const Setting gSettings[] = { - { 0, false, false }, - { 0, false, true }, - { 0, true, false }, - { 0, true, true }, - { ONE, false, false }, - { ONE, false, true }, - { ONE, true, false }, - { ONE, true, true } + { false, false }, + { false, true }, + { true, false }, + { true, true }, }; 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++) { p.setLinearText(gSettings[i].fLinearText); p.setDevKernText(gSettings[i].fDevKernText); - SkScalar scale = gSettings[i].fScale; 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.setColor(0x8888FF88); diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 954680b8dc..d19efb0aa4 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -1100,8 +1100,7 @@ SkScalar SkPaint::measure_text(SkGlyphCache* cache, return Sk48Dot16ToScalar(x); } -SkScalar SkPaint::measureText(const void* textData, size_t length, - SkRect* bounds, SkScalar zoom) const { +SkScalar SkPaint::measureText(const void* textData, size_t length, SkRect* bounds) const { const char* text = (const char*)textData; SkASSERT(text != NULL || length == 0); @@ -1109,13 +1108,7 @@ SkScalar SkPaint::measureText(const void* textData, size_t length, const SkPaint& paint = canon.getPaint(); SkScalar scale = canon.getScale(); - SkMatrix zoomMatrix, *zoomPtr = NULL; - if (zoom) { - zoomMatrix.setScale(zoom, zoom); - zoomPtr = &zoomMatrix; - } - - SkAutoGlyphCache autoCache(paint, NULL, zoomPtr); + SkAutoGlyphCache autoCache(paint, NULL, NULL); SkGlyphCache* cache = autoCache.getCache(); SkScalar width = 0; diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index dbe701688d..5106057728 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -309,7 +309,7 @@ DEF_TEST(Paint_regression_measureText, reporter) { r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN); // test that the rect was reset - paint.measureText("", 0, &r, 1.0f); + paint.measureText("", 0, &r); REPORTER_ASSERT(reporter, r.isEmpty()); } |