diff options
| author | tsepez <tsepez@chromium.org> | 2016-03-25 15:18:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 15:18:36 -0700 |
| commit | b5e8f14e3eefc5da995b332788d3203cee204883 (patch) | |
| tree | 34fc80504d2034013b18f30df1b0f6f1a94e2d70 /core/fxcrt/fx_unicode.cpp | |
| parent | 6d18bd3b8ec82ae3c24a439f5c7925786a0e2d8b (diff) | |
| download | pdfium-chromium/2695.tar.xz | |
Remove FX_DWORD from core/ and delete definitionchromium/2695chromium/2694chromium/2693chromium/2692
Review URL: https://codereview.chromium.org/1832173003
Diffstat (limited to 'core/fxcrt/fx_unicode.cpp')
| -rw-r--r-- | core/fxcrt/fx_unicode.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fxcrt/fx_unicode.cpp b/core/fxcrt/fx_unicode.cpp index 296ead84bb..d042283a32 100644 --- a/core/fxcrt/fx_unicode.cpp +++ b/core/fxcrt/fx_unicode.cpp @@ -6,7 +6,7 @@ #include "core/fxcrt/include/fx_ucd.h" -FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch) { +uint32_t FX_GetUnicodeProperties(FX_WCHAR wch) { size_t idx = static_cast<size_t>(wch); if (idx < kTextLayoutCodePropertiesSize) return kTextLayoutCodeProperties[(uint16_t)wch]; @@ -15,14 +15,14 @@ FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch) { #ifdef PDF_ENABLE_XFA FX_BOOL FX_IsCtrlCode(FX_WCHAR ch) { - FX_DWORD dwRet = (FX_GetUnicodeProperties(ch) & FX_CHARTYPEBITSMASK); + uint32_t dwRet = (FX_GetUnicodeProperties(ch) & FX_CHARTYPEBITSMASK); return dwRet == FX_CHARTYPE_Tab || dwRet == FX_CHARTYPE_Control; } #endif // PDF_ENABLE_XFA FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical) { - FX_DWORD dwProps = FX_GetUnicodeProperties(wch); - FX_DWORD dwTemp = (dwProps & 0xFF800000); + uint32_t dwProps = FX_GetUnicodeProperties(wch); + uint32_t dwTemp = (dwProps & 0xFF800000); if (bRTL && dwTemp < 0xFF800000) { size_t idx = dwTemp >> 23; if (idx < kFXTextLayoutBidiMirrorSize) { @@ -43,10 +43,10 @@ FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical) { #ifdef PDF_ENABLE_XFA FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, - FX_DWORD dwProps, + uint32_t dwProps, FX_BOOL bRTL, FX_BOOL bVertical) { - FX_DWORD dwTemp = (dwProps & 0xFF800000); + uint32_t dwTemp = (dwProps & 0xFF800000); if (bRTL && dwTemp < 0xFF800000) { size_t idx = dwTemp >> 23; if (idx < kFXTextLayoutBidiMirrorSize) { |