diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-08-23 10:39:35 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-23 15:11:19 +0000 |
| commit | 12db7515f17228798d1aa38fce0fee3e7d2d36b6 (patch) | |
| tree | e291daf9e6a88ba0248670b9f1ba3a555f052538 /core/fxge/fx_ge_linux.cpp | |
| parent | 3bb0a34cc75abe49a59c6390353957bbb5c5ab38 (diff) | |
| download | pdfium-12db7515f17228798d1aa38fce0fee3e7d2d36b6.tar.xz | |
Convert string Find methods to return an Optional
The Find and ReverseFind methods for WideString, WideStringC,
ByteString, and ByteStringC have been converted from returning a raw
FX_STRSIZE, to returning Optional<FX_STRSIZE>, so that success/failure
can be indicated without using FX_STRNPOS.
This allows for removing FX_STRNPOS and by association makes the
conversion of FX_STRSIZE to size_t easier, since it forces checking
the return value of Find to be explictly done as well as taking the
error value out of the range of FX_STRSIZE.
New Contains methods have been added for cases where the success or
failure is all the call site to Find cared about, and the actual
position was ignored.
BUG=pdfium:828
Change-Id: Id827e508c8660affa68cc08a13d96121369364b7
Reviewed-on: https://pdfium-review.googlesource.com/11350
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/fx_ge_linux.cpp')
| -rw-r--r-- | core/fxge/fx_ge_linux.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/fxge/fx_ge_linux.cpp b/core/fxge/fx_ge_linux.cpp index 0552f1c58c..d17ddf2d3d 100644 --- a/core/fxge/fx_ge_linux.cpp +++ b/core/fxge/fx_ge_linux.cpp @@ -45,18 +45,16 @@ size_t GetJapanesePreference(const char* facearr, int weight, int pitch_family) { CFX_ByteString face = facearr; - if (face.Find("Gothic") != FX_STRNPOS || - face.Find("\x83\x53\x83\x56\x83\x62\x83\x4e") != FX_STRNPOS) { - if (face.Find("PGothic") != FX_STRNPOS || - face.Find("\x82\x6f\x83\x53\x83\x56\x83\x62\x83\x4e") != FX_STRNPOS) { + if (face.Contains("Gothic") || + face.Contains("\x83\x53\x83\x56\x83\x62\x83\x4e")) { + if (face.Contains("PGothic") || + face.Contains("\x82\x6f\x83\x53\x83\x56\x83\x62\x83\x4e")) { return 0; } return 1; } - if (face.Find("Mincho") != FX_STRNPOS || - face.Find("\x96\xbe\x92\xa9") != FX_STRNPOS) { - if (face.Find("PMincho") != FX_STRNPOS || - face.Find("\x82\x6f\x96\xbe\x92\xa9") != FX_STRNPOS) { + if (face.Contains("Mincho") || face.Contains("\x96\xbe\x92\xa9")) { + if (face.Contains("PMincho") || face.Contains("\x82\x6f\x96\xbe\x92\xa9")) { return 2; } return 3; |