Pass retained arguments to CFXA_Node::SetImageImage()
- Rename *ImageImage() methods to *LayoutImage().
- Rename *ImageEditImage() methods to *EditImage().
Bug: pdfium:1843
Change-Id: I7e40b3cf0af7c8603435b6b98e04aab1d4830544
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/95490
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp
index 0bbb8f4..f063790 100644
--- a/xfa/fxfa/cxfa_ffimage.cpp
+++ b/xfa/fxfa/cxfa_ffimage.cpp
@@ -20,18 +20,18 @@
CXFA_FFImage::~CXFA_FFImage() = default;
void CXFA_FFImage::PreFinalize() {
- GetNode()->SetImageImage(nullptr);
+ GetNode()->SetLayoutImage(nullptr);
}
bool CXFA_FFImage::IsLoaded() {
- return !!GetNode()->GetImageImage();
+ return !!GetNode()->GetLayoutImage();
}
bool CXFA_FFImage::LoadWidget() {
- if (GetNode()->GetImageImage())
+ if (GetNode()->GetLayoutImage())
return true;
- return GetNode()->LoadImageImage(GetDoc()) && CXFA_FFWidget::LoadWidget();
+ return GetNode()->LoadLayoutImage(GetDoc()) && CXFA_FFWidget::LoadWidget();
}
void CXFA_FFImage::RenderWidget(CFGAS_GEGraphics* pGS,
@@ -45,7 +45,7 @@
CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
- RetainPtr<CFX_DIBitmap> pDIBitmap = GetNode()->GetImageImage();
+ RetainPtr<CFX_DIBitmap> pDIBitmap = GetNode()->GetLayoutImage();
if (!pDIBitmap)
return;
@@ -65,6 +65,6 @@
CXFA_Image* image = value ? value->GetImageIfExists() : nullptr;
if (image) {
XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, image->GetAspect(),
- m_pNode->GetImageDpi(), iHorzAlign, iVertAlign);
+ m_pNode->GetLayoutImageDpi(), iHorzAlign, iVertAlign);
}
}
diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp
index 61df5ce..8071d09 100644
--- a/xfa/fxfa/cxfa_ffimageedit.cpp
+++ b/xfa/fxfa/cxfa_ffimageedit.cpp
@@ -28,7 +28,7 @@
CXFA_FFImageEdit::~CXFA_FFImageEdit() = default;
void CXFA_FFImageEdit::PreFinalize() {
- m_pNode->SetImageEditImage(nullptr);
+ m_pNode->SetEditImage(nullptr);
}
void CXFA_FFImageEdit::Trace(cppgc::Visitor* visitor) const {
@@ -50,7 +50,7 @@
pPictureBox->SetDelegate(this);
CXFA_FFField::LoadWidget();
- if (!m_pNode->GetImageEditImage())
+ if (!m_pNode->GetEditImage())
UpdateFWLData();
return true;
@@ -68,7 +68,7 @@
CXFA_FFWidget::RenderWidget(pGS, mtRotate, highlight);
DrawBorder(pGS, m_pNode->GetUIBorder(), m_UIRect, mtRotate);
RenderCaption(pGS, mtRotate);
- RetainPtr<CFX_DIBitmap> pDIBitmap = m_pNode->GetImageEditImage();
+ RetainPtr<CFX_DIBitmap> pDIBitmap = m_pNode->GetEditImage();
if (!pDIBitmap)
return;
@@ -90,7 +90,7 @@
}
XFA_DrawImage(pGS, rtImage, mtRotate, pDIBitmap, iAspect,
- m_pNode->GetImageEditDpi(), iHorzAlign, iVertAlign);
+ m_pNode->GetEditImageDpi(), iHorzAlign, iVertAlign);
}
bool CXFA_FFImageEdit::AcceptsFocusOnButtonDown(
@@ -134,8 +134,8 @@
}
bool CXFA_FFImageEdit::UpdateFWLData() {
- m_pNode->SetImageEditImage(nullptr);
- m_pNode->LoadImageEditImage(GetDoc());
+ m_pNode->SetEditImage(nullptr);
+ m_pNode->LoadEditImage(GetDoc());
return true;
}
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 8986666..0ec3931 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -876,8 +876,8 @@
if (!image)
return false;
- pNode->SetImageImage(XFA_LoadImageData(doc, image, m_bNamedImage,
- m_iImageXDpi, m_iImageYDpi));
+ pNode->SetLayoutImage(XFA_LoadImageData(doc, image, m_bNamedImage,
+ m_iImageXDpi, m_iImageYDpi));
return !!m_pDIBitmap;
}
@@ -959,8 +959,8 @@
if (!image)
return false;
- pNode->SetImageEditImage(XFA_LoadImageData(doc, image, m_bNamedImage,
- m_iImageXDpi, m_iImageYDpi));
+ pNode->SetEditImage(XFA_LoadImageData(doc, image, m_bNamedImage,
+ m_iImageXDpi, m_iImageYDpi));
return !!m_pDIBitmap;
}
@@ -3395,50 +3395,50 @@
}
bool CXFA_Node::CalculateImageAutoSize(CXFA_FFDoc* doc, CFX_SizeF* pSize) {
- if (!GetImageImage())
- LoadImageImage(doc);
+ if (!GetLayoutImage())
+ LoadLayoutImage(doc);
pSize->clear();
- RetainPtr<CFX_DIBitmap> pBitmap = GetImageImage();
+ RetainPtr<CFX_DIBitmap> pBitmap = GetLayoutImage();
if (!pBitmap)
return CalculateWidgetAutoSize(pSize);
*pSize = CalculateImageSize(pBitmap->GetWidth(), pBitmap->GetHeight(),
- GetImageDpi());
+ GetLayoutImageDpi());
return CalculateWidgetAutoSize(pSize);
}
bool CXFA_Node::CalculateImageEditAutoSize(CXFA_FFDoc* doc, CFX_SizeF* pSize) {
- if (!GetImageEditImage())
- LoadImageEditImage(doc);
+ if (!GetEditImage())
+ LoadEditImage(doc);
pSize->clear();
- RetainPtr<CFX_DIBitmap> pBitmap = GetImageEditImage();
+ RetainPtr<CFX_DIBitmap> pBitmap = GetEditImage();
if (!pBitmap)
return CalculateFieldAutoSize(doc, pSize);
*pSize = CalculateImageSize(pBitmap->GetWidth(), pBitmap->GetHeight(),
- GetImageEditDpi());
+ GetEditImageDpi());
return CalculateFieldAutoSize(doc, pSize);
}
-bool CXFA_Node::LoadImageImage(CXFA_FFDoc* doc) {
+bool CXFA_Node::LoadLayoutImage(CXFA_FFDoc* doc) {
InitLayoutData(doc);
return m_pLayoutData->AsImageLayoutData()->LoadImageData(doc, this);
}
-bool CXFA_Node::LoadImageEditImage(CXFA_FFDoc* doc) {
+bool CXFA_Node::LoadEditImage(CXFA_FFDoc* doc) {
InitLayoutData(doc);
return m_pLayoutData->AsFieldLayoutData()->AsImageEditData()->LoadImageData(
doc, this);
}
-CFX_Size CXFA_Node::GetImageDpi() const {
+CFX_Size CXFA_Node::GetLayoutImageDpi() const {
CXFA_ImageLayoutData* pData = m_pLayoutData->AsImageLayoutData();
return CFX_Size(pData->m_iImageXDpi, pData->m_iImageYDpi);
}
-CFX_Size CXFA_Node::GetImageEditDpi() const {
+CFX_Size CXFA_Node::GetEditImageDpi() const {
CXFA_ImageEditData* pData =
m_pLayoutData->AsFieldLayoutData()->AsImageEditData();
return CFX_Size(pData->m_iImageXDpi, pData->m_iImageYDpi);
@@ -3897,29 +3897,29 @@
: nullptr;
}
-RetainPtr<CFX_DIBitmap> CXFA_Node::GetImageImage() {
+RetainPtr<CFX_DIBitmap> CXFA_Node::GetLayoutImage() {
return m_pLayoutData ? m_pLayoutData->AsImageLayoutData()->m_pDIBitmap
: nullptr;
}
-RetainPtr<CFX_DIBitmap> CXFA_Node::GetImageEditImage() {
+RetainPtr<CFX_DIBitmap> CXFA_Node::GetEditImage() {
return m_pLayoutData ? m_pLayoutData->AsFieldLayoutData()
->AsImageEditData()
->m_pDIBitmap
: nullptr;
}
-void CXFA_Node::SetImageImage(const RetainPtr<CFX_DIBitmap>& newImage) {
+void CXFA_Node::SetLayoutImage(RetainPtr<CFX_DIBitmap> newImage) {
CXFA_ImageLayoutData* pData = m_pLayoutData->AsImageLayoutData();
if (pData->m_pDIBitmap != newImage)
- pData->m_pDIBitmap = newImage;
+ pData->m_pDIBitmap = std::move(newImage);
}
-void CXFA_Node::SetImageEditImage(const RetainPtr<CFX_DIBitmap>& newImage) {
+void CXFA_Node::SetEditImage(RetainPtr<CFX_DIBitmap> newImage) {
CXFA_ImageEditData* pData =
m_pLayoutData->AsFieldLayoutData()->AsImageEditData();
if (pData->m_pDIBitmap != newImage)
- pData->m_pDIBitmap = newImage;
+ pData->m_pDIBitmap = std::move(newImage);
}
RetainPtr<CFGAS_GEFont> CXFA_Node::GetFGASFont(CXFA_FFDoc* doc) {
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h
index ae0fb71..d36f55f 100644
--- a/xfa/fxfa/parser/cxfa_node.h
+++ b/xfa/fxfa/parser/cxfa_node.h
@@ -335,15 +335,14 @@
CXFA_TextLayout* GetCaptionTextLayout();
CXFA_TextLayout* GetTextLayout();
- bool LoadImageImage(CXFA_FFDoc* doc);
- bool LoadImageEditImage(CXFA_FFDoc* doc);
- CFX_Size GetImageDpi() const;
- CFX_Size GetImageEditDpi() const;
-
- RetainPtr<CFX_DIBitmap> GetImageImage();
- RetainPtr<CFX_DIBitmap> GetImageEditImage();
- void SetImageImage(const RetainPtr<CFX_DIBitmap>& newImage);
- void SetImageEditImage(const RetainPtr<CFX_DIBitmap>& newImage);
+ bool LoadLayoutImage(CXFA_FFDoc* doc);
+ bool LoadEditImage(CXFA_FFDoc* doc);
+ CFX_Size GetLayoutImageDpi() const;
+ CFX_Size GetEditImageDpi() const;
+ RetainPtr<CFX_DIBitmap> GetLayoutImage();
+ RetainPtr<CFX_DIBitmap> GetEditImage();
+ void SetLayoutImage(RetainPtr<CFX_DIBitmap> newImage);
+ void SetEditImage(RetainPtr<CFX_DIBitmap> newImage);
RetainPtr<CFGAS_GEFont> GetFGASFont(CXFA_FFDoc* doc);
