Make CFXA_*Data class members private
Bug: pdfium:1680
Change-Id: I8cc25352c6475e49839ecc579a80dd0306995ecd
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/96710
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index ad0d347..ff8a74d 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -881,13 +881,19 @@
return !!m_pDIBitmap;
}
+ CFX_Size GetDpi() const { return CFX_Size(m_iImageXDpi, m_iImageYDpi); }
+ RetainPtr<CFX_DIBitmap> GetBitmap() { return m_pDIBitmap; }
+ void SetBitmap(RetainPtr<CFX_DIBitmap> pBitmap) {
+ m_pDIBitmap = std::move(pBitmap);
+ }
+
+ private:
+ CXFA_ImageLayoutData() = default;
+
bool m_bNamedImage = false;
int32_t m_iImageXDpi = 0;
int32_t m_iImageYDpi = 0;
RetainPtr<CFX_DIBitmap> m_pDIBitmap;
-
- private:
- CXFA_ImageLayoutData() = default;
};
class CXFA_FieldLayoutData : public CXFA_WidgetLayoutData {
@@ -964,13 +970,19 @@
return !!m_pDIBitmap;
}
+ CFX_Size GetDpi() const { return CFX_Size(m_iImageXDpi, m_iImageYDpi); }
+ RetainPtr<CFX_DIBitmap> GetBitmap() { return m_pDIBitmap; }
+ void SetBitmap(RetainPtr<CFX_DIBitmap> pBitmap) {
+ m_pDIBitmap = std::move(pBitmap);
+ }
+
+ private:
+ CXFA_ImageEditData() = default;
+
bool m_bNamedImage = false;
int32_t m_iImageXDpi = 0;
int32_t m_iImageYDpi = 0;
RetainPtr<CFX_DIBitmap> m_pDIBitmap;
-
- private:
- CXFA_ImageEditData() = default;
};
CXFA_Node::CXFA_Node(CXFA_Document* pDoc,
@@ -3434,14 +3446,13 @@
}
CFX_Size CXFA_Node::GetLayoutImageDpi() const {
- CXFA_ImageLayoutData* pData = m_pLayoutData->AsImageLayoutData();
- return CFX_Size(pData->m_iImageXDpi, pData->m_iImageYDpi);
+ return m_pLayoutData->AsImageLayoutData()->GetDpi();
}
CFX_Size CXFA_Node::GetEditImageDpi() const {
CXFA_ImageEditData* pData =
m_pLayoutData->AsFieldLayoutData()->AsImageEditData();
- return CFX_Size(pData->m_iImageXDpi, pData->m_iImageYDpi);
+ return pData->GetDpi();
}
float CXFA_Node::CalculateWidgetAutoWidth(float fWidthCalc) {
@@ -3898,28 +3909,28 @@
}
RetainPtr<CFX_DIBitmap> CXFA_Node::GetLayoutImage() {
- return m_pLayoutData ? m_pLayoutData->AsImageLayoutData()->m_pDIBitmap
+ return m_pLayoutData ? m_pLayoutData->AsImageLayoutData()->GetBitmap()
: nullptr;
}
RetainPtr<CFX_DIBitmap> CXFA_Node::GetEditImage() {
return m_pLayoutData ? m_pLayoutData->AsFieldLayoutData()
->AsImageEditData()
- ->m_pDIBitmap
+ ->GetBitmap()
: nullptr;
}
void CXFA_Node::SetLayoutImage(RetainPtr<CFX_DIBitmap> newImage) {
CXFA_ImageLayoutData* pData = m_pLayoutData->AsImageLayoutData();
- if (pData->m_pDIBitmap != newImage)
- pData->m_pDIBitmap = std::move(newImage);
+ if (pData->GetBitmap() != newImage)
+ pData->SetBitmap(std::move(newImage));
}
void CXFA_Node::SetEditImage(RetainPtr<CFX_DIBitmap> newImage) {
CXFA_ImageEditData* pData =
m_pLayoutData->AsFieldLayoutData()->AsImageEditData();
- if (pData->m_pDIBitmap != newImage)
- pData->m_pDIBitmap = std::move(newImage);
+ if (pData->GetBitmap() != newImage)
+ pData->SetBitmap(std::move(newImage));
}
RetainPtr<CFGAS_GEFont> CXFA_Node::GetFGASFont(CXFA_FFDoc* doc) {