diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
| commit | 62a70f90c49cf7714c960186eb063ad55333e6f3 (patch) | |
| tree | 84b5d0f70b770e6a9ec261342d46638f4d5102bd /xfa/fee | |
| parent | 4161c5ca6c5438476bf07b6dacfafb61ea611cc5 (diff) | |
| download | pdfium-62a70f90c49cf7714c960186eb063ad55333e6f3.tar.xz | |
Remove FX_WORD in favor of uint16_t.
It isn't buying us anthing, and it looks strange in
a struct when other uint types are already present.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1821043003 .
Diffstat (limited to 'xfa/fee')
| -rw-r--r-- | xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp | 4 | ||||
| -rw-r--r-- | xfa/fee/fx_wordbreak/fx_wordbreak_impl.h | 2 | ||||
| -rw-r--r-- | xfa/fee/fx_wordbreak/fx_wordbreakdata.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp index d1b079edb1..6b8ae806d6 100644 --- a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp +++ b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp @@ -158,8 +158,8 @@ FX_BOOL CFX_WordBreak::FindNextBreakPos(IFX_CharIter* pIter, pIter->Next(bPrev); FX_WCHAR wcTemp = pIter->GetChar(); eNextType = FX_GetWordBreakProperty(wcTemp); - FX_WORD wBreak = - gs_FX_WordBreak_Table[eCurType] & ((FX_WORD)(1 << eNextType)); + uint16_t wBreak = + gs_FX_WordBreak_Table[eCurType] & ((uint16_t)(1 << eNextType)); if (wBreak) { if (pIter->IsEOF(!bPrev)) { pIter->Next(!bPrev); diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h index 95f5a43eb0..e7421ca1af 100644 --- a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h +++ b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.h @@ -15,7 +15,7 @@ #include "xfa/fee/fx_wordbreak/fx_wordbreak_impl.h" #include "xfa/fee/ifde_txtedtengine.h" -extern const FX_WORD gs_FX_WordBreak_Table[16]; +extern const uint16_t gs_FX_WordBreak_Table[16]; extern const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1]; enum FX_WordBreakProp { FX_WordBreakProp_None = 0, diff --git a/xfa/fee/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/fee/fx_wordbreak/fx_wordbreakdata.cpp index ffb4889954..b632d5fafc 100644 --- a/xfa/fee/fx_wordbreak/fx_wordbreakdata.cpp +++ b/xfa/fee/fx_wordbreak/fx_wordbreakdata.cpp @@ -6,7 +6,7 @@ #include "xfa/fee/fx_wordbreak/fx_wordbreak_impl.h" -const FX_WORD gs_FX_WordBreak_Table[16] = { +const uint16_t gs_FX_WordBreak_Table[16] = { 0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B, 0xFFFB, 0xFFFB, 0xFFFB, 0xE77B, 0xE73B, 0xFFFB, 0xFFFB, 0xFFFB, }; |