diff options
| author | tsepez <tsepez@chromium.org> | 2016-08-30 10:32:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-30 10:32:36 -0700 |
| commit | fbda17d61de1e02799f5d77dceb23df3688b764e (patch) | |
| tree | ad15940f6c9bf31ca390a711636981ecd0e52ff6 /fpdfsdk | |
| parent | f7252a074ed013e2ad3cc11e08eba90502262ce0 (diff) | |
| download | pdfium-fbda17d61de1e02799f5d77dceb23df3688b764e.tar.xz | |
Make CPDF_TextState have a CPDF_TextStateData rather than inheriting one.
Review-Url: https://codereview.chromium.org/2287313004
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fxedit/fxet_edit.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index 479fa970a1..098ef7f10b 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -161,16 +161,17 @@ CPDF_TextObject* AddTextObjToPageObjects(CPDF_PageObjectHolder* pObjectHolder, const CFX_FloatPoint& point, const CFX_ByteString& text) { std::unique_ptr<CPDF_TextObject> pTxtObj(new CPDF_TextObject); - CPDF_TextStateData* pTextStateData = pTxtObj->m_TextState.GetPrivateCopy(); - pTextStateData->m_pFont = pFont; - pTextStateData->m_FontSize = fFontSize; - pTextStateData->m_CharSpace = fCharSpace; - pTextStateData->m_WordSpace = 0; - pTextStateData->m_TextMode = TextRenderingMode::MODE_FILL; - pTextStateData->m_Matrix[0] = nHorzScale / 100.0f; - pTextStateData->m_Matrix[1] = 0; - pTextStateData->m_Matrix[2] = 0; - pTextStateData->m_Matrix[3] = 1; + pTxtObj->m_TextState.SetFont(pFont); + pTxtObj->m_TextState.SetFontSize(fFontSize); + pTxtObj->m_TextState.SetCharSpace(fCharSpace); + pTxtObj->m_TextState.SetWordSpace(0); + pTxtObj->m_TextState.SetTextMode(TextRenderingMode::MODE_FILL); + + FX_FLOAT* matrix = pTxtObj->m_TextState.GetMutableMatrix(); + matrix[0] = nHorzScale / 100.0f; + matrix[1] = 0; + matrix[2] = 0; + matrix[3] = 1; FX_FLOAT rgb[3]; rgb[0] = FXARGB_R(crText) / 255.0f; |