diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-13 10:16:05 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-13 15:46:47 +0000 |
| commit | 575898e6251c1dbb8de0d40a5b6ce90762aa2af2 (patch) | |
| tree | c9b30307e04200c2621bfd98e4152c47653efcb6 /xfa/fgas/layout | |
| parent | 068d34426272bd7f02ffc12139ddd33ee2e237e6 (diff) | |
| download | pdfium-575898e6251c1dbb8de0d40a5b6ce90762aa2af2.tar.xz | |
Remove some single use interfaces
Remove interfaces which are only implemented once.
Change-Id: I73ceaa7bfd7ef2a630479c7eebed5e32ecb99940
Reviewed-on: https://pdfium-review.googlesource.com/2944
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fgas/layout')
| -rw-r--r-- | xfa/fgas/layout/fgas_textbreak.cpp | 4 | ||||
| -rw-r--r-- | xfa/fgas/layout/fgas_textbreak.h | 13 |
2 files changed, 4 insertions, 13 deletions
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp index 6442f1fb55..68930db919 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/fgas_textbreak.cpp @@ -874,7 +874,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun, if (!pTxtRun || pTxtRun->iLength < 1) return 0; - IFX_TxtAccess* pAccess = pTxtRun->pAccess; + CFDE_TxtEdtPage* pAccess = pTxtRun->pAccess; const FDE_TEXTEDITPIECE* pIdentity = pTxtRun->pIdentity; const FX_WCHAR* pStr = pTxtRun->wsStr.c_str(); int32_t* pWidths = pTxtRun->pWidths; @@ -1138,7 +1138,7 @@ std::vector<CFX_RectF> CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun, if (!pTxtRun || pTxtRun->iLength < 1) return std::vector<CFX_RectF>(); - IFX_TxtAccess* pAccess = pTxtRun->pAccess; + CFDE_TxtEdtPage* pAccess = pTxtRun->pAccess; const FDE_TEXTEDITPIECE* pIdentity = pTxtRun->pIdentity; const FX_WCHAR* pStr = pTxtRun->wsStr.c_str(); int32_t* pWidths = pTxtRun->pWidths; diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h index 0bc5768d78..1070a7bce4 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h @@ -14,13 +14,13 @@ #include "core/fxcrt/fx_ucd.h" #include "core/fxge/cfx_renderdevice.h" #include "third_party/base/stl_util.h" +#include "xfa/fde/cfde_txtedtpage.h" #include "xfa/fgas/crt/fgas_utils.h" class CFX_Char; class CFGAS_GEFont; class CFX_TxtChar; class CFX_TxtPiece; -class IFX_TxtAccess; struct FDE_TEXTEDITPIECE; #define FX_TXTLAYOUTSTYLE_SingleLine 0x0200 @@ -47,21 +47,12 @@ inline bool CFX_BreakTypeNoneOrPiece(CFX_BreakType type) { return type == CFX_BreakType::None || type == CFX_BreakType::Piece; } -class IFX_TxtAccess { - public: - virtual ~IFX_TxtAccess() {} - 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 { FX_TXTRUN(); FX_TXTRUN(const FX_TXTRUN& other); ~FX_TXTRUN(); - IFX_TxtAccess* pAccess; + CFDE_TxtEdtPage* pAccess; const FDE_TEXTEDITPIECE* pIdentity; CFX_WideString wsStr; int32_t* pWidths; |