diff options
| author | Raph Levien <raph@google.com> | 2016-04-13 16:11:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-13 16:11:56 +0000 |
| commit | b1203b648acb109fddd537f8d76d168b7f70103e (patch) | |
| tree | 395a13ba41e575f64a7cee81e1c311b9221a2efa | |
| parent | 6c60831cfce24b0749f50f37231e0a56d8fd4b85 (diff) | |
| parent | 879e8a3a479b2cedd05e652f082683a02aa57dcf (diff) | |
| download | android_frameworks_minikin-b1203b648acb109fddd537f8d76d168b7f70103e.tar.gz android_frameworks_minikin-b1203b648acb109fddd537f8d76d168b7f70103e.tar.bz2 android_frameworks_minikin-b1203b648acb109fddd537f8d76d168b7f70103e.zip | |
Merge "Clear mLineWidths in LineBreaker::finish()" into nyc-dev
| -rw-r--r-- | include/minikin/LineBreaker.h | 3 | ||||
| -rw-r--r-- | libs/minikin/LineBreaker.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/minikin/LineBreaker.h b/include/minikin/LineBreaker.h index e28f11d..1d81404 100644 --- a/include/minikin/LineBreaker.h +++ b/include/minikin/LineBreaker.h @@ -69,6 +69,9 @@ class LineWidths { } return width; } + void clear() { + mIndents.clear(); + } private: float mFirstWidth; int mFirstWidthLineCount; diff --git a/libs/minikin/LineBreaker.cpp b/libs/minikin/LineBreaker.cpp index 9c4ff6f..2a71f04 100644 --- a/libs/minikin/LineBreaker.cpp +++ b/libs/minikin/LineBreaker.cpp @@ -419,6 +419,7 @@ size_t LineBreaker::computeBreaks() { void LineBreaker::finish() { mWordBreaker.finish(); mWidth = 0; + mLineWidths.clear(); mCandidates.clear(); mBreaks.clear(); mWidths.clear(); |