diff options
author | Seigo Nonaka <nona@google.com> | 2019-03-08 16:20:01 -0800 |
---|---|---|
committer | Seigo Nonaka <nona@google.com> | 2019-03-08 16:20:01 -0800 |
commit | c520fe1dab8e25a7e38a3fa2924e6ee019d2b3af (patch) | |
tree | 83604dc8346a4d4794b0cc59b2df49bcf4616e54 | |
parent | 0a03407193f728942e032b35caefaebd3d22dd77 (diff) | |
download | minikin-c520fe1dab8e25a7e38a3fa2924e6ee019d2b3af.tar.gz |
Change TabStop type from int to float
Bug: 124794899
Test: atest CtsTextTestCases
Test: atest CtsGraphicsTestCases
Change-Id: Ibeb7b7361de1d15c66d8aaf26a93c648db743e10
-rw-r--r-- | include/minikin/AndroidLineBreakerHelper.h | 4 | ||||
-rw-r--r-- | include/minikin/LineBreaker.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/minikin/AndroidLineBreakerHelper.h b/include/minikin/AndroidLineBreakerHelper.h index fc95f6c..302d2b1 100644 --- a/include/minikin/AndroidLineBreakerHelper.h +++ b/include/minikin/AndroidLineBreakerHelper.h @@ -85,8 +85,8 @@ public: float firstWidth, int32_t firstWidthLineCount, float restWidth, int32_t indentsOffset, // Tab stop arguments - const int32_t* tabStops, int32_t tabStopSize, - int32_t defaultTabStopWidth) const { + const float* tabStops, int32_t tabStopSize, + float defaultTabStopWidth) const { AndroidLineWidth lineWidth(firstWidth, firstWidthLineCount, restWidth, mIndents, indentsOffset); return breakIntoLines(textBuf, mStrategy, mFrequency, mIsJustified, measuredText, lineWidth, diff --git a/include/minikin/LineBreaker.h b/include/minikin/LineBreaker.h index 0155450..3410339 100644 --- a/include/minikin/LineBreaker.h +++ b/include/minikin/LineBreaker.h @@ -53,7 +53,7 @@ class WordBreaker; class TabStops { public: // Caller must free stops. stops can be nullprt. - TabStops(const int32_t* stops, size_t nStops, int32_t tabWidth) + TabStops(const float* stops, size_t nStops, float tabWidth) : mStops(stops), mStopsSize(nStops), mTabWidth(tabWidth) {} float nextTab(float widthSoFar) const { @@ -66,9 +66,9 @@ public: } private: - const int32_t* mStops; + const float* mStops; size_t mStopsSize; - int32_t mTabWidth; + float mTabWidth; }; // Implement this for the additional information during line breaking. |