summaryrefslogtreecommitdiff
path: root/xfa/fgas/layout
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-06-07 10:10:45 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-07 10:10:45 -0700
commit705f829624bfc53e316f750bf91a32c8ae3ad1b5 (patch)
treee5ec525491a494bc34f2a34bbace458d2b433331 /xfa/fgas/layout
parent8975902470dbfc15289b69f41e43ad0433ca51ae (diff)
downloadpdfium-705f829624bfc53e316f750bf91a32c8ae3ad1b5.tar.xz
Remove FDE_HVISUALOBJ.
This CL removes the FDE_HVISUALOBJ in favour of the concrete FDE_TEXTEDITPIECE class. The parameter was removed from any method which didn't use it and the non-implemented methods were removed. Review-Url: https://codereview.chromium.org/2047693002
Diffstat (limited to 'xfa/fgas/layout')
-rw-r--r--xfa/fgas/layout/fgas_textbreak.cpp4
-rw-r--r--xfa/fgas/layout/fgas_textbreak.h10
2 files changed, 9 insertions, 5 deletions
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp
index e09b5c8abf..85cff44349 100644
--- a/xfa/fgas/layout/fgas_textbreak.cpp
+++ b/xfa/fgas/layout/fgas_textbreak.cpp
@@ -1170,7 +1170,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
return 0;
}
IFX_TxtAccess* pAccess = pTxtRun->pAccess;
- void* pIdentity = pTxtRun->pIdentity;
+ const FDE_TEXTEDITPIECE* pIdentity = pTxtRun->pIdentity;
const FX_WCHAR* pStr = pTxtRun->wsStr.c_str();
int32_t* pWidths = pTxtRun->pWidths;
int32_t iLength = pTxtRun->iLength - 1;
@@ -1555,7 +1555,7 @@ int32_t CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun,
return 0;
}
IFX_TxtAccess* pAccess = pTxtRun->pAccess;
- void* pIdentity = pTxtRun->pIdentity;
+ const FDE_TEXTEDITPIECE* pIdentity = pTxtRun->pIdentity;
const FX_WCHAR* pStr = pTxtRun->wsStr.c_str();
int32_t* pWidths = pTxtRun->pWidths;
int32_t iLength = pTxtRun->iLength;
diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h
index 01e688f15d..db0b7f604e 100644
--- a/xfa/fgas/layout/fgas_textbreak.h
+++ b/xfa/fgas/layout/fgas_textbreak.h
@@ -70,11 +70,15 @@ class IFX_TxtAccess;
#define FX_TXTLINEALIGNMENT_HigherMask 0x0C
#define FX_TXTBREAK_MinimumTabWidth 160000
+struct FDE_TEXTEDITPIECE;
+
class IFX_TxtAccess {
public:
virtual ~IFX_TxtAccess() {}
- virtual FX_WCHAR GetChar(void* pIdentity, int32_t index) const = 0;
- virtual int32_t GetWidth(void* pIdentity, int32_t index) const = 0;
+ virtual FX_WCHAR GetChar(const FDE_TEXTEDITPIECE* pIdentity,
+ int32_t index) const = 0;
+ virtual int32_t GetWidth(const FDE_TEXTEDITPIECE* pIdentity,
+ int32_t index) const = 0;
};
struct FX_TXTRUN {
@@ -95,7 +99,7 @@ struct FX_TXTRUN {
bSkipSpace(TRUE) {}
IFX_TxtAccess* pAccess;
- void* pIdentity;
+ const FDE_TEXTEDITPIECE* pIdentity;
CFX_WideString wsStr;
int32_t* pWidths;
int32_t iLength;