diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-14 20:09:43 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-14 20:09:43 +0000 |
commit | 0821c95ee9f132f77f3670a7dbbf114a82a6b9a0 (patch) | |
tree | fd736c2764ee7b1e187995548a608ed431601ac7 /xfa/fxfa/cxfa_ffimageedit.cpp | |
parent | dcbb8e53e604178dc97d12846ddbdef88be41297 (diff) | |
download | pdfium-0821c95ee9f132f77f3670a7dbbf114a82a6b9a0.tar.xz |
Fold CXFA_ValueData into CXFA_Value
The CXFA_ValueData class is a thin wrapper around the CXFA_Value, this
CL moves the methods from CXFA_ValueData into CXFA_Value.
Change-Id: I2c57e93e5c4675b82af71cf75f2dfc0fb12e4b20
Reviewed-on: https://pdfium-review.googlesource.com/21170
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffimageedit.cpp')
-rw-r--r-- | xfa/fxfa/cxfa_ffimageedit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp index 558e597992..6d63514a18 100644 --- a/xfa/fxfa/cxfa_ffimageedit.cpp +++ b/xfa/fxfa/cxfa_ffimageedit.cpp @@ -18,6 +18,7 @@ #include "xfa/fxfa/cxfa_fffield.h" #include "xfa/fxfa/cxfa_ffpageview.h" #include "xfa/fxfa/cxfa_ffwidget.h" +#include "xfa/fxfa/parser/cxfa_value.h" CXFA_FFImageEdit::CXFA_FFImageEdit(CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pDataAcc), m_pOldDelegate(nullptr) {} @@ -77,9 +78,9 @@ void CXFA_FFImageEdit::RenderWidget(CXFA_Graphics* pGS, } XFA_AttributeEnum iAspect = XFA_AttributeEnum::Fit; - CXFA_ValueData valueData = m_pDataAcc->GetFormValueData(); - if (valueData.HasValidNode()) { - CXFA_ImageData imageData = valueData.GetImageData(); + CXFA_Value* value = m_pDataAcc->GetFormValue(); + if (value) { + CXFA_ImageData imageData = value->GetImageData(); if (imageData.HasValidNode()) iAspect = imageData.GetAspect(); } |