summaryrefslogtreecommitdiff
path: root/xfa/src/fgas/include/fx_tbk.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-02-24 11:23:20 -0800
committerTom Sepez <tsepez@chromium.org>2016-02-24 11:23:20 -0800
commit86b5c31dc7c98af877a5e8952c5b55b9ea611f3c (patch)
treeab1c624008578cd4fcb70b30ffab091375769d95 /xfa/src/fgas/include/fx_tbk.h
parent4ca48d1b10998f6c77683f184b8c8c53c7121b9b (diff)
downloadpdfium-86b5c31dc7c98af877a5e8952c5b55b9ea611f3c.tar.xz
Moar _CAPS naming, part 4
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1731483004 .
Diffstat (limited to 'xfa/src/fgas/include/fx_tbk.h')
-rw-r--r--xfa/src/fgas/include/fx_tbk.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h
index 5063aec142..073228883d 100644
--- a/xfa/src/fgas/include/fx_tbk.h
+++ b/xfa/src/fgas/include/fx_tbk.h
@@ -77,8 +77,9 @@ class IFX_TxtAccess {
virtual FX_WCHAR GetChar(void* pIdentity, int32_t index) const = 0;
virtual int32_t GetWidth(void* pIdentity, int32_t index) const = 0;
};
-typedef struct _FX_TXTRUN {
- _FX_TXTRUN() {
+
+struct FX_TXTRUN {
+ FX_TXTRUN() {
pAccess = NULL;
pIdentity = NULL;
pStr = NULL;
@@ -95,6 +96,7 @@ typedef struct _FX_TXTRUN {
wLineBreakChar = L'\n';
bSkipSpace = TRUE;
}
+
IFX_TxtAccess* pAccess;
void* pIdentity;
const FX_WCHAR* pStr;
@@ -110,8 +112,8 @@ typedef struct _FX_TXTRUN {
FX_LPCRECTF pRect;
FX_WCHAR wLineBreakChar;
FX_BOOL bSkipSpace;
-} FX_TXTRUN, *FX_LPTXTRUN;
-typedef FX_TXTRUN const* FX_LPCTXTRUN;
+};
+
class CFX_TxtPiece : public CFX_Target {
public:
CFX_TxtPiece()
@@ -206,12 +208,12 @@ class IFX_TxtBreak {
virtual void ClearBreakPieces() = 0;
virtual void Reset() = 0;
virtual int32_t GetDisplayPos(
- FX_LPCTXTRUN pTxtRun,
+ const FX_TXTRUN* pTxtRun,
FXTEXT_CHARPOS* pCharPos,
FX_BOOL bCharCode = FALSE,
CFX_WideString* pWSForms = NULL,
FX_AdjustCharDisplayPos pAdjustPos = NULL) const = 0;
- virtual int32_t GetCharRects(FX_LPCTXTRUN pTxtRun,
+ virtual int32_t GetCharRects(const FX_TXTRUN* pTxtRun,
CFX_RectFArray& rtArray,
FX_BOOL bCharBBox = FALSE) const = 0;
};