diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-16 14:18:50 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-16 14:18:50 -0700 |
| commit | 24e733ef26280268ac6ede6d73fac7475aedd1a9 (patch) | |
| tree | b067396d52855d4e7a63d040fd99029f76ac6b94 /core/src/fxcrt/fx_unicode.cpp | |
| parent | db0be96179f0cd5f1787564cbccf86320a4d54ae (diff) | |
| download | pdfium-24e733ef26280268ac6ede6d73fac7475aedd1a9.tar.xz | |
fxcrt convergence - XFA side.
Take extern tables portion only of fx_bidi change.
Take itoa fixes and corresponding unit test.
Merge typo in skia font mgr.
Kill some null checks after new.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1409223002 .
Diffstat (limited to 'core/src/fxcrt/fx_unicode.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_unicode.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/core/src/fxcrt/fx_unicode.cpp b/core/src/fxcrt/fx_unicode.cpp index f05aeb5efb..67ff009513 100644 --- a/core/src/fxcrt/fx_unicode.cpp +++ b/core/src/fxcrt/fx_unicode.cpp @@ -6,41 +6,38 @@ #include "../../include/fxcrt/fx_ucd.h" -extern const FX_DWORD gs_FX_TextLayout_CodeProperties[65536]; -extern const FX_WCHAR gs_FX_TextLayout_VerticalMirror[64]; -extern const FX_WCHAR gs_FX_TextLayout_BidiMirror[512]; FX_DWORD FX_GetUnicodeProperties(FX_WCHAR wch) { - return gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; + return kTextLayoutCodeProperties[(FX_WORD)wch]; } FX_BOOL FX_IsCtrlCode(FX_WCHAR ch) { FX_DWORD dwRet = - (gs_FX_TextLayout_CodeProperties[(FX_WORD)ch] & FX_CHARTYPEBITSMASK); + (kTextLayoutCodeProperties[(FX_WORD)ch] & FX_CHARTYPEBITSMASK); return dwRet == FX_CHARTYPE_Tab || dwRet == FX_CHARTYPE_Control; } FX_BOOL FX_IsRotationCode(FX_WCHAR ch) { - return (gs_FX_TextLayout_CodeProperties[(FX_WORD)ch] & 0x8000) != 0; + return (kTextLayoutCodeProperties[(FX_WORD)ch] & 0x8000) != 0; } FX_BOOL FX_IsCombinationChar(FX_WCHAR wch) { FX_DWORD dwProps = - (gs_FX_TextLayout_CodeProperties[(FX_WORD)wch] & FX_CHARTYPEBITSMASK); + (kTextLayoutCodeProperties[(FX_WORD)wch] & FX_CHARTYPEBITSMASK); return dwProps == FX_CHARTYPE_Combination; } FX_BOOL FX_IsBidiChar(FX_WCHAR wch) { - FX_DWORD dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; + FX_DWORD dwProps = kTextLayoutCodeProperties[(FX_WORD)wch]; int32_t iBidiCls = (dwProps & FX_BIDICLASSBITSMASK) >> FX_BIDICLASSBITS; return (FX_BIDICLASS_R == iBidiCls || FX_BIDICLASS_AL == iBidiCls); } FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bRTL, FX_BOOL bVertical) { - FX_DWORD dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; + FX_DWORD dwProps = kTextLayoutCodeProperties[(FX_WORD)wch]; FX_DWORD dwTemp = (dwProps & 0xFF800000); if (bRTL && dwTemp < 0xFF800000) { - wch = gs_FX_TextLayout_BidiMirror[dwTemp >> 23]; - dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; + wch = kFXTextLayoutBidiMirror[dwTemp >> 23]; + dwProps = kTextLayoutCodeProperties[(FX_WORD)wch]; } if (bVertical) { dwTemp = (dwProps & 0x007E0000); if (dwTemp < 0x007E0000) { - wch = gs_FX_TextLayout_VerticalMirror[dwTemp >> 17]; + wch = kFXTextLayoutVerticalMirror[dwTemp >> 17]; } } return wch; @@ -51,13 +48,13 @@ FX_WCHAR FX_GetMirrorChar(FX_WCHAR wch, FX_BOOL bVertical) { FX_DWORD dwTemp = (dwProps & 0xFF800000); if (bRTL && dwTemp < 0xFF800000) { - wch = gs_FX_TextLayout_BidiMirror[dwTemp >> 23]; - dwProps = gs_FX_TextLayout_CodeProperties[(FX_WORD)wch]; + wch = kFXTextLayoutBidiMirror[dwTemp >> 23]; + dwProps = kTextLayoutCodeProperties[(FX_WORD)wch]; } if (bVertical) { dwTemp = (dwProps & 0x007E0000); if (dwTemp < 0x007E0000) { - wch = gs_FX_TextLayout_VerticalMirror[dwTemp >> 17]; + wch = kFXTextLayoutVerticalMirror[dwTemp >> 17]; } } return wch; |