Rename most "pDocument" instances to "document"
Mass rename a common variable name to follow Google C++ style. Exclude a
couple of files where the name has a conflict, so this CL stays
mechanical.
Bug: 42271580
Change-Id: I579e1ddd16c16a888645b523faf06ca0a36da1e7
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/132270
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp
index 94ead75..bfd14e1 100644
--- a/core/fpdfapi/font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -281,9 +281,9 @@
} // namespace
-CPDF_CIDFont::CPDF_CIDFont(CPDF_Document* pDocument,
+CPDF_CIDFont::CPDF_CIDFont(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pFontDict)
- : CPDF_Font(pDocument, std::move(pFontDict)) {
+ : CPDF_Font(document, std::move(pFontDict)) {
for (size_t i = 0; i < std::size(char_bbox_); ++i) {
char_bbox_[i] = FX_RECT(-1, -1, -1, -1);
}
diff --git a/core/fpdfapi/font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h
index 04c2c2f..6c9535f 100644
--- a/core/fpdfapi/font/cpdf_cidfont.h
+++ b/core/fpdfapi/font/cpdf_cidfont.h
@@ -79,7 +79,7 @@
kTrueType // CIDFontType2
};
- CPDF_CIDFont(CPDF_Document* pDocument, RetainPtr<CPDF_Dictionary> pFontDict);
+ CPDF_CIDFont(CPDF_Document* document, RetainPtr<CPDF_Dictionary> pFontDict);
void LoadGB2312();
int GetGlyphIndex(uint32_t unicodeb, bool* pVertGlyph);
diff --git a/core/fpdfapi/font/cpdf_font.cpp b/core/fpdfapi/font/cpdf_font.cpp
index 3a5c5fb..fbb5f58 100644
--- a/core/fpdfapi/font/cpdf_font.cpp
+++ b/core/fpdfapi/font/cpdf_font.cpp
@@ -47,9 +47,9 @@
} // namespace
-CPDF_Font::CPDF_Font(CPDF_Document* pDocument,
+CPDF_Font::CPDF_Font(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pFontDict)
- : document_(pDocument),
+ : document_(document),
font_dict_(std::move(pFontDict)),
base_font_name_(font_dict_->GetByteStringFor("BaseFont")) {}
diff --git a/core/fpdfapi/font/cpdf_font.h b/core/fpdfapi/font/cpdf_font.h
index ca1a0fe..eb87666 100644
--- a/core/fpdfapi/font/cpdf_font.h
+++ b/core/fpdfapi/font/cpdf_font.h
@@ -54,7 +54,7 @@
virtual ~FormFactoryIface() = default;
virtual std::unique_ptr<FormIface> CreateForm(
- CPDF_Document* pDocument,
+ CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pPageResources,
RetainPtr<CPDF_Stream> pFormStream) = 0;
};
@@ -137,7 +137,7 @@
void SetResourceName(const ByteString& name) { resource_name_ = name; }
protected:
- CPDF_Font(CPDF_Document* pDocument, RetainPtr<CPDF_Dictionary> pFontDict);
+ CPDF_Font(CPDF_Document* document, RetainPtr<CPDF_Dictionary> pFontDict);
~CPDF_Font() override;
// Commonly used wrappers for UseTTCharmap().
diff --git a/core/fpdfapi/font/cpdf_simplefont.cpp b/core/fpdfapi/font/cpdf_simplefont.cpp
index ac806a5..d091681 100644
--- a/core/fpdfapi/font/cpdf_simplefont.cpp
+++ b/core/fpdfapi/font/cpdf_simplefont.cpp
@@ -35,9 +35,9 @@
} // namespace
-CPDF_SimpleFont::CPDF_SimpleFont(CPDF_Document* pDocument,
+CPDF_SimpleFont::CPDF_SimpleFont(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pFontDict)
- : CPDF_Font(pDocument, std::move(pFontDict)) {
+ : CPDF_Font(document, std::move(pFontDict)) {
char_width_.fill(0xffff);
glyph_index_.fill(0xffff);
char_bbox_.fill(FX_RECT(-1, -1, -1, -1));
diff --git a/core/fpdfapi/font/cpdf_simplefont.h b/core/fpdfapi/font/cpdf_simplefont.h
index cf4719c..5d46023 100644
--- a/core/fpdfapi/font/cpdf_simplefont.h
+++ b/core/fpdfapi/font/cpdf_simplefont.h
@@ -38,7 +38,7 @@
protected:
static constexpr size_t kInternalTableSize = 256;
- CPDF_SimpleFont(CPDF_Document* pDocument,
+ CPDF_SimpleFont(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pFontDict);
virtual void LoadGlyphMap() = 0;
diff --git a/core/fpdfapi/font/cpdf_truetypefont.cpp b/core/fpdfapi/font/cpdf_truetypefont.cpp
index 7384904..b1b7f80 100644
--- a/core/fpdfapi/font/cpdf_truetypefont.cpp
+++ b/core/fpdfapi/font/cpdf_truetypefont.cpp
@@ -35,9 +35,9 @@
} // namespace
-CPDF_TrueTypeFont::CPDF_TrueTypeFont(CPDF_Document* pDocument,
+CPDF_TrueTypeFont::CPDF_TrueTypeFont(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pFontDict)
- : CPDF_SimpleFont(pDocument, std::move(pFontDict)) {}
+ : CPDF_SimpleFont(document, std::move(pFontDict)) {}
CPDF_TrueTypeFont::~CPDF_TrueTypeFont() = default;
diff --git a/core/fpdfapi/font/cpdf_truetypefont.h b/core/fpdfapi/font/cpdf_truetypefont.h
index cc87073..4ec3409 100644
--- a/core/fpdfapi/font/cpdf_truetypefont.h
+++ b/core/fpdfapi/font/cpdf_truetypefont.h
@@ -23,7 +23,7 @@
private:
enum class CharmapType { kMSUnicode, kMSSymbol, kMacRoman, kOther };
- CPDF_TrueTypeFont(CPDF_Document* pDocument,
+ CPDF_TrueTypeFont(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pFontDict);
// CPDF_Font:
diff --git a/core/fpdfapi/font/cpdf_type1font.cpp b/core/fpdfapi/font/cpdf_type1font.cpp
index 77e1a75..66d826a 100644
--- a/core/fpdfapi/font/cpdf_type1font.cpp
+++ b/core/fpdfapi/font/cpdf_type1font.cpp
@@ -71,9 +71,9 @@
} // namespace
-CPDF_Type1Font::CPDF_Type1Font(CPDF_Document* pDocument,
+CPDF_Type1Font::CPDF_Type1Font(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pFontDict)
- : CPDF_SimpleFont(pDocument, std::move(pFontDict)) {
+ : CPDF_SimpleFont(document, std::move(pFontDict)) {
#if BUILDFLAG(IS_APPLE)
ext_gid_.fill(0xffff);
#endif
diff --git a/core/fpdfapi/font/cpdf_type1font.h b/core/fpdfapi/font/cpdf_type1font.h
index c0ffc6b..182734d 100644
--- a/core/fpdfapi/font/cpdf_type1font.h
+++ b/core/fpdfapi/font/cpdf_type1font.h
@@ -32,8 +32,7 @@
bool IsBase14Font() const { return base14_font_.has_value(); }
private:
- CPDF_Type1Font(CPDF_Document* pDocument,
- RetainPtr<CPDF_Dictionary> pFontDict);
+ CPDF_Type1Font(CPDF_Document* document, RetainPtr<CPDF_Dictionary> pFontDict);
// CPDF_Font:
bool Load() override;
diff --git a/core/fpdfapi/font/cpdf_type3font.cpp b/core/fpdfapi/font/cpdf_type3font.cpp
index 0fd3963..9752fb3 100644
--- a/core/fpdfapi/font/cpdf_type3font.cpp
+++ b/core/fpdfapi/font/cpdf_type3font.cpp
@@ -25,10 +25,10 @@
} // namespace
-CPDF_Type3Font::CPDF_Type3Font(CPDF_Document* pDocument,
+CPDF_Type3Font::CPDF_Type3Font(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pFontDict,
FormFactoryIface* pFormFactory)
- : CPDF_SimpleFont(pDocument, std::move(pFontDict)),
+ : CPDF_SimpleFont(document, std::move(pFontDict)),
form_factory_(pFormFactory) {
DCHECK(GetDocument());
}
diff --git a/core/fpdfapi/font/cpdf_type3font.h b/core/fpdfapi/font/cpdf_type3font.h
index d001a46..32fc29c 100644
--- a/core/fpdfapi/font/cpdf_type3font.h
+++ b/core/fpdfapi/font/cpdf_type3font.h
@@ -44,7 +44,7 @@
CFX_Matrix& GetFontMatrix() { return font_matrix_; }
private:
- CPDF_Type3Font(CPDF_Document* pDocument,
+ CPDF_Type3Font(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pFontDict,
FormFactoryIface* pFormFactory);
diff --git a/core/fpdfapi/page/cpdf_colorspace.h b/core/fpdfapi/page/cpdf_colorspace.h
index bf10ba0..76bd36c 100644
--- a/core/fpdfapi/page/cpdf_colorspace.h
+++ b/core/fpdfapi/page/cpdf_colorspace.h
@@ -84,7 +84,7 @@
std::set<const CPDF_Object*>* pVisited);
static RetainPtr<CPDF_ColorSpace> AllocateColorSpaceForID(
- CPDF_Document* pDocument,
+ CPDF_Document* document,
uint32_t family_id);
static uint32_t ComponentsForFamily(Family family);
diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp
index e465333..04de649 100644
--- a/core/fpdfapi/page/cpdf_docpagedata.cpp
+++ b/core/fpdfapi/page/cpdf_docpagedata.cpp
@@ -524,10 +524,10 @@
}
std::unique_ptr<CPDF_Font::FormIface> CPDF_DocPageData::CreateForm(
- CPDF_Document* pDocument,
+ CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pPageResources,
RetainPtr<CPDF_Stream> pFormStream) {
- return std::make_unique<CPDF_Form>(pDocument, std::move(pPageResources),
+ return std::make_unique<CPDF_Form>(document, std::move(pPageResources),
std::move(pFormStream));
}
diff --git a/core/fpdfapi/page/cpdf_docpagedata.h b/core/fpdfapi/page/cpdf_docpagedata.h
index 3eb1c35..9430799 100644
--- a/core/fpdfapi/page/cpdf_docpagedata.h
+++ b/core/fpdfapi/page/cpdf_docpagedata.h
@@ -48,7 +48,7 @@
// CPDF_Font::FormFactoryIFace:
std::unique_ptr<CPDF_Font::FormIface> CreateForm(
- CPDF_Document* pDocument,
+ CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pPageResources,
RetainPtr<CPDF_Stream> pFormStream) override;
diff --git a/core/fpdfapi/page/cpdf_form.h b/core/fpdfapi/page/cpdf_form.h
index b5a5ad0..df158a2 100644
--- a/core/fpdfapi/page/cpdf_form.h
+++ b/core/fpdfapi/page/cpdf_form.h
@@ -36,10 +36,10 @@
CPDF_Dictionary* pParentResources,
CPDF_Dictionary* pPageResources);
- CPDF_Form(CPDF_Document* pDocument,
+ CPDF_Form(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pPageResources,
RetainPtr<CPDF_Stream> pFormStream);
- CPDF_Form(CPDF_Document* pDocument,
+ CPDF_Form(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pPageResources,
RetainPtr<CPDF_Stream> pFormStream,
CPDF_Dictionary* pParentResources);
diff --git a/core/fpdfapi/page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp
index 0d56bfc..8988623 100644
--- a/core/fpdfapi/page/cpdf_page.cpp
+++ b/core/fpdfapi/page/cpdf_page.cpp
@@ -20,11 +20,11 @@
#include "core/fxcrt/check_op.h"
#include "core/fxcrt/containers/contains.h"
-CPDF_Page::CPDF_Page(CPDF_Document* pDocument,
+CPDF_Page::CPDF_Page(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pPageDict)
- : CPDF_PageObjectHolder(pDocument, std::move(pPageDict), nullptr, nullptr),
+ : CPDF_PageObjectHolder(document, std::move(pPageDict), nullptr, nullptr),
page_size_(100, 100),
- pdf_document_(pDocument) {
+ pdf_document_(document) {
// Cannot initialize |resources_| and |page_resources_| via the
// CPDF_PageObjectHolder ctor because GetPageAttr() requires
// CPDF_PageObjectHolder to finish initializing first.
diff --git a/core/fpdfapi/page/cpdf_page.h b/core/fpdfapi/page/cpdf_page.h
index 3421ad9..56f0dde 100644
--- a/core/fpdfapi/page/cpdf_page.h
+++ b/core/fpdfapi/page/cpdf_page.h
@@ -96,7 +96,7 @@
void UpdateDimensions();
private:
- CPDF_Page(CPDF_Document* pDocument, RetainPtr<CPDF_Dictionary> pPageDict);
+ CPDF_Page(CPDF_Document* document, RetainPtr<CPDF_Dictionary> pPageDict);
~CPDF_Page() override;
RetainPtr<CPDF_Object> GetMutablePageAttr(ByteStringView name);
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index 607d120..d5d4506 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -387,7 +387,7 @@
}
CPDF_StreamContentParser::CPDF_StreamContentParser(
- CPDF_Document* pDocument,
+ CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pPageResources,
RetainPtr<CPDF_Dictionary> pParentResources,
const CFX_Matrix* pmtContentToUser,
@@ -396,7 +396,7 @@
const CFX_FloatRect& rcBBox,
const CPDF_AllStates* pStates,
CPDF_Form::RecursionState* recursion_state)
- : document_(pDocument),
+ : document_(document),
page_resources_(pPageResources),
parent_resources_(pParentResources),
resources_(CPDF_Form::ChooseResourcesDict(pResources.Get(),
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index a99c02b..4af61db 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -157,13 +157,13 @@
state.GetStrokeAlpha() != 1.0f || state.GetFillAlpha() != 1.0f) {
return StartDIBBase();
}
- CPDF_Document* pDocument = nullptr;
+ CPDF_Document* document = nullptr;
CPDF_Page* pPage = nullptr;
if (auto* pPageCache = render_status_->GetContext()->GetPageCache()) {
pPage = pPageCache->GetPage();
- pDocument = pPage->GetDocument();
+ document = pPage->GetDocument();
} else {
- pDocument = image_object_->GetImage()->GetDocument();
+ document = image_object_->GetImage()->GetDocument();
}
RetainPtr<const CPDF_Dictionary> pPageResources =
pPage ? pPage->GetPageResources() : nullptr;
@@ -171,7 +171,7 @@
image_object_->GetImage()->GetStream()->GetDict();
RetainPtr<const CPDF_Object> pCSObj =
pStreamDict->GetDirectObjectFor("ColorSpace");
- auto* pData = CPDF_DocPageData::FromDocument(pDocument);
+ auto* pData = CPDF_DocPageData::FromDocument(document);
RetainPtr<CPDF_ColorSpace> pColorSpace =
pData->GetColorSpace(pCSObj.Get(), pPageResources);
if (pColorSpace) {
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index 5a0e186..a05b487 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -126,9 +126,9 @@
} // namespace
CPDF_Annot::CPDF_Annot(RetainPtr<CPDF_Dictionary> pDict,
- CPDF_Document* pDocument)
+ CPDF_Document* document)
: annot_dict_(std::move(pDict)),
- document_(pDocument),
+ document_(document),
subtype_(StringToAnnotSubtype(
annot_dict_->GetByteStringFor(pdfium::annotation::kSubtype))),
is_text_markup_annotation_(IsTextMarkupAnnotation(subtype_)),
diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h
index ca11fab..0c086dd 100644
--- a/core/fpdfdoc/cpdf_annot.h
+++ b/core/fpdfdoc/cpdf_annot.h
@@ -74,7 +74,7 @@
size_t nIndex);
static size_t QuadPointCount(const CPDF_Array* pArray);
- CPDF_Annot(RetainPtr<CPDF_Dictionary> pDict, CPDF_Document* pDocument);
+ CPDF_Annot(RetainPtr<CPDF_Dictionary> pDict, CPDF_Document* document);
~CPDF_Annot();
Subtype GetSubtype() const;
diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp
index 0936b45..7c76383 100644
--- a/core/fpdfdoc/cpdf_annotlist.cpp
+++ b/core/fpdfdoc/cpdf_annotlist.cpp
@@ -70,7 +70,7 @@
}
}
-std::unique_ptr<CPDF_Annot> CreatePopupAnnot(CPDF_Document* pDocument,
+std::unique_ptr<CPDF_Annot> CreatePopupAnnot(CPDF_Document* document,
CPDF_Page* pPage,
CPDF_Annot* pAnnot) {
if (!PopupAppearsForAnnotType(pAnnot->GetSubtype())) {
@@ -90,7 +90,7 @@
return nullptr;
}
- auto pAnnotDict = pDocument->New<CPDF_Dictionary>();
+ auto pAnnotDict = document->New<CPDF_Dictionary>();
pAnnotDict->SetNewFor<CPDF_Name>(pdfium::annotation::kType, "Annot");
pAnnotDict->SetNewFor<CPDF_Name>(pdfium::annotation::kSubtype, "Popup");
pAnnotDict->SetNewFor<CPDF_String>(
@@ -120,7 +120,7 @@
pAnnotDict->SetNewFor<CPDF_Number>(pdfium::annotation::kF, 0);
auto pPopupAnnot =
- std::make_unique<CPDF_Annot>(std::move(pAnnotDict), pDocument);
+ std::make_unique<CPDF_Annot>(std::move(pAnnotDict), document);
pAnnot->SetPopupAnnot(pPopupAnnot.get());
return pPopupAnnot;
}
diff --git a/core/fpdfdoc/cpdf_bafontmap.cpp b/core/fpdfdoc/cpdf_bafontmap.cpp
index 217a198..af4a2be 100644
--- a/core/fpdfdoc/cpdf_bafontmap.cpp
+++ b/core/fpdfdoc/cpdf_bafontmap.cpp
@@ -66,10 +66,10 @@
CPDF_BAFontMap::Data::~Data() = default;
-CPDF_BAFontMap::CPDF_BAFontMap(CPDF_Document* pDocument,
+CPDF_BAFontMap::CPDF_BAFontMap(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pAnnotDict,
const ByteString& sAPType)
- : document_(pDocument),
+ : document_(document),
annot_dict_(std::move(pAnnotDict)),
ap_type_(sAPType) {
FX_Charset nCharset = FX_Charset::kDefault;
diff --git a/core/fpdfdoc/cpdf_bafontmap.h b/core/fpdfdoc/cpdf_bafontmap.h
index 4731bf7..16215b4 100644
--- a/core/fpdfdoc/cpdf_bafontmap.h
+++ b/core/fpdfdoc/cpdf_bafontmap.h
@@ -22,7 +22,7 @@
public:
static FX_Charset GetNativeCharset();
- CPDF_BAFontMap(CPDF_Document* pDocument,
+ CPDF_BAFontMap(CPDF_Document* document,
RetainPtr<CPDF_Dictionary> pAnnotDict,
const ByteString& sAPType);
~CPDF_BAFontMap() override;
diff --git a/core/fpdfdoc/cpdf_bookmark.cpp b/core/fpdfdoc/cpdf_bookmark.cpp
index c1b709f..e0a4905 100644
--- a/core/fpdfdoc/cpdf_bookmark.cpp
+++ b/core/fpdfdoc/cpdf_bookmark.cpp
@@ -41,11 +41,11 @@
return result;
}
-CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* pDocument) const {
+CPDF_Dest CPDF_Bookmark::GetDest(CPDF_Document* document) const {
if (!dict_) {
return CPDF_Dest(nullptr);
}
- return CPDF_Dest::Create(pDocument, dict_->GetDirectObjectFor("Dest"));
+ return CPDF_Dest::Create(document, dict_->GetDirectObjectFor("Dest"));
}
CPDF_Action CPDF_Bookmark::GetAction() const {
diff --git a/core/fpdfdoc/cpdf_bookmark.h b/core/fpdfdoc/cpdf_bookmark.h
index 3d1d142..6eca999 100644
--- a/core/fpdfdoc/cpdf_bookmark.h
+++ b/core/fpdfdoc/cpdf_bookmark.h
@@ -25,7 +25,7 @@
const CPDF_Dictionary* GetDict() const { return dict_.Get(); }
WideString GetTitle() const;
- CPDF_Dest GetDest(CPDF_Document* pDocument) const;
+ CPDF_Dest GetDest(CPDF_Document* document) const;
CPDF_Action GetAction() const;
int GetCount() const;
diff --git a/fpdfsdk/cpdfsdk_interactiveform.cpp b/fpdfsdk/cpdfsdk_interactiveform.cpp
index 15318b3..0627e21 100644
--- a/fpdfsdk/cpdfsdk_interactiveform.cpp
+++ b/fpdfsdk/cpdfsdk_interactiveform.cpp
@@ -136,19 +136,19 @@
return pWidget;
}
- CPDF_Document* pDocument = form_fill_env_->GetPDFDocument();
+ CPDF_Document* document = form_fill_env_->GetPDFDocument();
CPDFSDK_PageView* pPage = nullptr;
RetainPtr<const CPDF_Dictionary> pControlDict = pControl->GetWidgetDict();
RetainPtr<const CPDF_Dictionary> pPageDict = pControlDict->GetDictFor("P");
if (pPageDict) {
- int nPageIndex = pDocument->GetPageIndex(pPageDict->GetObjNum());
+ int nPageIndex = document->GetPageIndex(pPageDict->GetObjNum());
if (nPageIndex >= 0) {
pPage = form_fill_env_->GetPageViewAtIndex(nPageIndex);
}
}
if (!pPage) {
- int nPageIndex = GetPageIndexByAnnotDict(pDocument, pControlDict);
+ int nPageIndex = GetPageIndexByAnnotDict(document, pControlDict);
if (nPageIndex >= 0) {
pPage = form_fill_env_->GetPageViewAtIndex(nPageIndex);
}
@@ -182,13 +182,12 @@
}
int CPDFSDK_InteractiveForm::GetPageIndexByAnnotDict(
- CPDF_Document* pDocument,
+ CPDF_Document* document,
const CPDF_Dictionary* pAnnotDict) const {
DCHECK(pAnnotDict);
- for (int i = 0, sz = pDocument->GetPageCount(); i < sz; i++) {
- RetainPtr<const CPDF_Dictionary> pPageDict =
- pDocument->GetPageDictionary(i);
+ for (int i = 0, sz = document->GetPageCount(); i < sz; i++) {
+ RetainPtr<const CPDF_Dictionary> pPageDict = document->GetPageDictionary(i);
if (!pPageDict) {
continue;
}
diff --git a/fpdfsdk/cpdfsdk_interactiveform.h b/fpdfsdk/cpdfsdk_interactiveform.h
index 4ec6efd..2abd00e 100644
--- a/fpdfsdk/cpdfsdk_interactiveform.h
+++ b/fpdfsdk/cpdfsdk_interactiveform.h
@@ -100,7 +100,7 @@
void AfterCheckedStatusChange(CPDF_FormField* pField) override;
void AfterFormReset(CPDF_InteractiveForm* pForm) override;
- int GetPageIndexByAnnotDict(CPDF_Document* pDocument,
+ int GetPageIndexByAnnotDict(CPDF_Document* document,
const CPDF_Dictionary* pAnnotDict) const;
UnownedPtr<CPDFSDK_FormFillEnvironment> const form_fill_env_;
diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp
index 4518aba..7748dd4 100644
--- a/fpdfsdk/fpdf_flatten.cpp
+++ b/fpdfsdk/fpdf_flatten.cpp
@@ -203,17 +203,17 @@
}
RetainPtr<CPDF_Reference> NewIndirectContentsStreamReference(
- CPDF_Document* pDocument,
+ CPDF_Document* document,
const ByteString& contents) {
auto pNewContents =
- pDocument->NewIndirect<CPDF_Stream>(pDocument->New<CPDF_Dictionary>());
+ document->NewIndirect<CPDF_Stream>(document->New<CPDF_Dictionary>());
pNewContents->SetData(contents.unsigned_span());
- return pNewContents->MakeReference(pDocument);
+ return pNewContents->MakeReference(document);
}
void SetPageContents(const ByteString& key,
CPDF_Dictionary* pPage,
- CPDF_Document* pDocument) {
+ CPDF_Document* document) {
RetainPtr<CPDF_Array> pContentsArray =
pPage->GetMutableArrayFor(pdfium::page_object::kContents);
RetainPtr<CPDF_Stream> pContentsStream =
@@ -222,16 +222,16 @@
if (!key.IsEmpty()) {
pPage->SetFor(pdfium::page_object::kContents,
NewIndirectContentsStreamReference(
- pDocument, GenerateFlattenedContent(key)));
+ document, GenerateFlattenedContent(key)));
}
return;
}
- pPage->ConvertToIndirectObjectFor(pdfium::page_object::kContents, pDocument);
+ pPage->ConvertToIndirectObjectFor(pdfium::page_object::kContents, document);
if (pContentsArray) {
- pContentsArray->InsertAt(
- 0, NewIndirectContentsStreamReference(pDocument, "q"));
- pContentsArray->Append(NewIndirectContentsStreamReference(pDocument, "Q"));
+ pContentsArray->InsertAt(0,
+ NewIndirectContentsStreamReference(document, "q"));
+ pContentsArray->Append(NewIndirectContentsStreamReference(document, "Q"));
} else {
ByteString sStream = "q\n";
{
@@ -241,15 +241,15 @@
sStream += "\nQ";
}
pContentsStream->SetDataAndRemoveFilter(sStream.unsigned_span());
- pContentsArray = pDocument->NewIndirect<CPDF_Array>();
- pContentsArray->AppendNew<CPDF_Reference>(pDocument,
+ pContentsArray = document->NewIndirect<CPDF_Array>();
+ pContentsArray->AppendNew<CPDF_Reference>(document,
pContentsStream->GetObjNum());
- pPage->SetNewFor<CPDF_Reference>(pdfium::page_object::kContents, pDocument,
+ pPage->SetNewFor<CPDF_Reference>(pdfium::page_object::kContents, document,
pContentsArray->GetObjNum());
}
if (!key.IsEmpty()) {
pContentsArray->Append(NewIndirectContentsStreamReference(
- pDocument, GenerateFlattenedContent(key)));
+ document, GenerateFlattenedContent(key)));
}
}
@@ -323,16 +323,15 @@
return FLATTEN_FAIL;
}
- CPDF_Document* pDocument = pPage->GetDocument();
+ CPDF_Document* document = pPage->GetDocument();
RetainPtr<CPDF_Dictionary> pPageDict = pPage->GetMutableDict();
- if (!pDocument) {
+ if (!document) {
return FLATTEN_FAIL;
}
std::vector<CPDF_Dictionary*> ObjectArray;
std::vector<CFX_FloatRect> RectArray;
- int iRet =
- ParserAnnots(pDocument, pPageDict, &RectArray, &ObjectArray, nFlag);
+ int iRet = ParserAnnots(document, pPageDict, &RectArray, &ObjectArray, nFlag);
if (iRet == FLATTEN_NOTHINGTODO || iRet == FLATTEN_FAIL) {
return iRet;
}
@@ -369,7 +368,7 @@
RetainPtr<CPDF_Dictionary> pRes =
pPageDict->GetOrCreateDictFor(pdfium::page_object::kResources);
auto pNewXObject =
- pDocument->NewIndirect<CPDF_Stream>(pDocument->New<CPDF_Dictionary>());
+ document->NewIndirect<CPDF_Stream>(document->New<CPDF_Dictionary>());
RetainPtr<CPDF_Dictionary> pPageXObject = pRes->GetOrCreateDictFor("XObject");
ByteString key;
@@ -385,11 +384,11 @@
}
}
- SetPageContents(key, pPageDict.Get(), pDocument);
+ SetPageContents(key, pPageDict.Get(), document);
RetainPtr<CPDF_Dictionary> pNewXORes;
if (!key.IsEmpty()) {
- pPageXObject->SetNewFor<CPDF_Reference>(key, pDocument,
+ pPageXObject->SetNewFor<CPDF_Reference>(key, document,
pNewXObject->GetObjNum());
RetainPtr<CPDF_Dictionary> pNewOXbjectDic = pNewXObject->GetMutableDict();
@@ -465,7 +464,7 @@
RetainPtr<CPDF_Stream> ap_stream;
if (original_ap_stream->IsInline()) {
ap_stream = ToStream(original_ap_stream->Clone());
- pDocument->AddIndirectObject(ap_stream);
+ document->AddIndirectObject(ap_stream);
} else {
ap_stream = original_ap_stream;
}
@@ -478,7 +477,7 @@
RetainPtr<CPDF_Dictionary> pXObject =
pNewXORes->GetOrCreateDictFor("XObject");
ByteString sFormName = ByteString::Format("F%d", i);
- pXObject->SetNewFor<CPDF_Reference>(sFormName, pDocument,
+ pXObject->SetNewFor<CPDF_Reference>(sFormName, document,
ap_stream->GetObjNum());
ByteString sStream;
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index efd9467..511a88a 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -213,19 +213,19 @@
return nullptr;
}
- auto pDocument =
+ auto document =
std::make_unique<CPDF_Document>(std::make_unique<CPDF_DocRenderData>(),
std::make_unique<CPDF_DocPageData>());
CPDF_Parser::Error error =
- pDocument->LoadDoc(std::move(pFileAccess), password);
+ document->LoadDoc(std::move(pFileAccess), password);
if (error != CPDF_Parser::SUCCESS) {
ProcessParseError(error);
return nullptr;
}
- ReportUnsupportedFeatures(pDocument.get());
- return FPDFDocumentFromCPDFDocument(pDocument.release());
+ ReportUnsupportedFeatures(document.get());
+ return FPDFDocumentFromCPDFDocument(document.release());
}
} // namespace
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
index 1b087c1..8a693fe 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp
@@ -75,8 +75,8 @@
} // namespace
-CPDFXFA_Page::CPDFXFA_Page(CPDF_Document* pDocument, int page_index)
- : document_(pDocument), page_index_(page_index) {
+CPDFXFA_Page::CPDFXFA_Page(CPDF_Document* document, int page_index)
+ : document_(document), page_index_(page_index) {
DCHECK(document_->GetExtension());
DCHECK(page_index_ >= 0);
}
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.h b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
index 9f091ac..888bc30 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
@@ -60,7 +60,7 @@
private:
// Refcounted class.
- CPDFXFA_Page(CPDF_Document* pDocument, int page_index);
+ CPDFXFA_Page(CPDF_Document* document, int page_index);
~CPDFXFA_Page() override;
bool LoadPDFPage();
diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp
index 3fbad4b..2ddb654 100644
--- a/fxjs/cjs_document.cpp
+++ b/fxjs/cjs_document.cpp
@@ -1314,18 +1314,18 @@
int nWordNo = params.size() > 1 ? pRuntime->ToInt32(params[1]) : 0;
bool bStrip = params.size() > 2 ? pRuntime->ToBoolean(params[2]) : true;
- CPDF_Document* pDocument = form_fill_env_->GetPDFDocument();
- if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount()) {
+ CPDF_Document* document = form_fill_env_->GetPDFDocument();
+ if (nPageNo < 0 || nPageNo >= document->GetPageCount()) {
return CJS_Result::Failure(JSMessage::kValueError);
}
RetainPtr<CPDF_Dictionary> pPageDict =
- pDocument->GetMutablePageDictionary(nPageNo);
+ document->GetMutablePageDictionary(nPageNo);
if (!pPageDict) {
return CJS_Result::Failure(JSMessage::kBadObjectError);
}
- auto page = pdfium::MakeRetain<CPDF_Page>(pDocument, std::move(pPageDict));
+ auto page = pdfium::MakeRetain<CPDF_Page>(document, std::move(pPageDict));
page->AddPageImageCache();
page->ParseContent();
@@ -1377,18 +1377,18 @@
}
int nPageNo = params.size() > 0 ? pRuntime->ToInt32(params[0]) : 0;
- CPDF_Document* pDocument = form_fill_env_->GetPDFDocument();
- if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount()) {
+ CPDF_Document* document = form_fill_env_->GetPDFDocument();
+ if (nPageNo < 0 || nPageNo >= document->GetPageCount()) {
return CJS_Result::Failure(JSMessage::kValueError);
}
RetainPtr<CPDF_Dictionary> pPageDict =
- pDocument->GetMutablePageDictionary(nPageNo);
+ document->GetMutablePageDictionary(nPageNo);
if (!pPageDict) {
return CJS_Result::Failure(JSMessage::kBadObjectError);
}
- auto page = pdfium::MakeRetain<CPDF_Page>(pDocument, std::move(pPageDict));
+ auto page = pdfium::MakeRetain<CPDF_Page>(document, std::move(pPageDict));
page->AddPageImageCache();
page->ParseContent();
@@ -1470,9 +1470,9 @@
return CJS_Result::Failure(JSMessage::kBadObjectError);
}
- CPDF_Document* pDocument = form_fill_env_->GetPDFDocument();
+ CPDF_Document* document = form_fill_env_->GetPDFDocument();
RetainPtr<const CPDF_Array> dest_array = CPDF_NameTree::LookupNamedDest(
- pDocument, pRuntime->ToByteString(params[0]));
+ document, pRuntime->ToByteString(params[0]));
if (!dest_array) {
return CJS_Result::Failure(JSMessage::kBadObjectError);
}
@@ -1480,7 +1480,7 @@
CPDF_Dest dest(std::move(dest_array));
std::vector<float> positions = dest.GetScrollPositionArray();
pRuntime->BeginBlock();
- form_fill_env_->DoGoToAction(dest.GetDestPageIndex(pDocument),
+ form_fill_env_->DoGoToAction(dest.GetDestPageIndex(document),
dest.GetZoomMode(), positions);
pRuntime->EndBlock();
return CJS_Result::Success();
diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp
index 9c0e840..22d0926 100644
--- a/fxjs/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -658,10 +658,10 @@
CJS_Field::~CJS_Field() = default;
-bool CJS_Field::AttachField(CJS_Document* pDocument,
+bool CJS_Field::AttachField(CJS_Document* document,
const WideString& csFieldName) {
- js_doc_.Reset(pDocument);
- form_fill_env_.Reset(pDocument->GetFormFillEnv());
+ js_doc_.Reset(document);
+ form_fill_env_.Reset(document->GetFormFillEnv());
can_set_ = form_fill_env_->HasPermissions(
pdfium::access_permissions::kFillForm |
pdfium::access_permissions::kModifyAnnotation |
diff --git a/fxjs/cjs_field.h b/fxjs/cjs_field.h
index aad1bec..07c67ad 100644
--- a/fxjs/cjs_field.h
+++ b/fxjs/cjs_field.h
@@ -38,7 +38,7 @@
CJS_Field(v8::Local<v8::Object> pObject, CJS_Runtime* pRuntime);
~CJS_Field() override;
- bool AttachField(CJS_Document* pDocument, const WideString& csFieldName);
+ bool AttachField(CJS_Document* document, const WideString& csFieldName);
JS_STATIC_PROP(alignment, alignment, CJS_Field)
JS_STATIC_PROP(borderStyle, border_style, CJS_Field)
diff --git a/fxjs/xfa/cfxjse_engine.cpp b/fxjs/xfa/cfxjse_engine.cpp
index b1f9aac..9c04fb9 100644
--- a/fxjs/xfa/cfxjse_engine.cpp
+++ b/fxjs/xfa/cfxjse_engine.cpp
@@ -119,14 +119,13 @@
return pJSObject ? pJSObject->GetXFAObject() : nullptr;
}
-CFXJSE_Engine::CFXJSE_Engine(CXFA_Document* pDocument,
- CJS_Runtime* fxjs_runtime)
+CFXJSE_Engine::CFXJSE_Engine(CXFA_Document* document, CJS_Runtime* fxjs_runtime)
: CFX_V8(fxjs_runtime->GetIsolate()),
subordinate_runtime_(fxjs_runtime),
- document_(pDocument),
+ document_(document),
js_context_(CFXJSE_Context::Create(fxjs_runtime->GetIsolate(),
&kGlobalClassDescriptor,
- pDocument->GetRoot()->JSObject(),
+ document->GetRoot()->JSObject(),
nullptr)),
node_helper_(std::make_unique<CFXJSE_NodeHelper>()),
resolve_processor_(
diff --git a/fxjs/xfa/cfxjse_engine.h b/fxjs/xfa/cfxjse_engine.h
index f58f81f..8162c1b 100644
--- a/fxjs/xfa/cfxjse_engine.h
+++ b/fxjs/xfa/cfxjse_engine.h
@@ -112,7 +112,7 @@
ByteStringView szPropName,
bool bQueryIn);
- CFXJSE_Engine(CXFA_Document* pDocument, CJS_Runtime* fxjs_runtime);
+ CFXJSE_Engine(CXFA_Document* document, CJS_Runtime* fxjs_runtime);
~CFXJSE_Engine() override;
class EventParamScope {
diff --git a/fxjs/xfa/cfxjse_resolveprocessor.cpp b/fxjs/xfa/cfxjse_resolveprocessor.cpp
index 544fb7d..48d18d3 100644
--- a/fxjs/xfa/cfxjse_resolveprocessor.cpp
+++ b/fxjs/xfa/cfxjse_resolveprocessor.cpp
@@ -143,13 +143,13 @@
return false;
}
- CXFA_Document* pDocument = engine_->GetDocument();
+ CXFA_Document* document = engine_->GetDocument();
XFA_HashCode dwNameHash = static_cast<XFA_HashCode>(
FX_HashCode_GetW(wsName.AsStringView().Last(nNameLen - 1)));
if (dwNameHash == XFA_HASHCODE_Xfa) {
- rnd.result_.objects.emplace_back(pDocument->GetRoot());
+ rnd.result_.objects.emplace_back(document->GetRoot());
} else {
- CXFA_Object* pObjNode = pDocument->GetXFAObject(dwNameHash);
+ CXFA_Object* pObjNode = document->GetXFAObject(dwNameHash);
if (pObjNode) {
rnd.result_.objects.emplace_back(pObjNode);
}
diff --git a/xfa/fxfa/cxfa_textprovider.cpp b/xfa/fxfa/cxfa_textprovider.cpp
index 5c64465..29a750d 100644
--- a/xfa/fxfa/cxfa_textprovider.cpp
+++ b/xfa/fxfa/cxfa_textprovider.cpp
@@ -147,16 +147,16 @@
}
CXFA_Node* pParent = node_->GetParent();
- CXFA_Document* pDocument = node_->GetDocument();
+ CXFA_Document* document = node_->GetDocument();
CXFA_Node* pIDNode = nullptr;
if (pParent) {
- pIDNode = pDocument->GetNodeByID(pParent, wsAttr.AsStringView());
+ pIDNode = document->GetNodeByID(pParent, wsAttr.AsStringView());
}
if (!pIDNode) {
- pIDNode = pDocument->GetNodeByID(
- ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Form)),
- wsAttr.AsStringView());
+ pIDNode =
+ document->GetNodeByID(ToNode(document->GetXFAObject(XFA_HASHCODE_Form)),
+ wsAttr.AsStringView());
}
if (!pIDNode || !pIDNode->IsWidgetReady()) {
return std::nullopt;
diff --git a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
index 2817fa0..a864a9d 100644
--- a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
@@ -515,8 +515,8 @@
switch (pFormNode->GetIntact()) {
case XFA_AttributeValue::None: {
bool bAnyChanged = false;
- CXFA_Document* pDocument = pFormNode->GetDocument();
- CXFA_FFNotify* pNotify = pDocument->GetNotify();
+ CXFA_Document* document = pFormNode->GetDocument();
+ CXFA_FFNotify* pNotify = document->GetNotify();
float fCurTopMargin = 0;
float fCurBottomMargin = 0;
CXFA_Margin* pMarginNode =
@@ -2196,8 +2196,8 @@
return;
}
- CXFA_Document* pDocument = GetFormNode()->GetDocument();
- CXFA_FFNotify* pNotify = pDocument->GetNotify();
+ CXFA_Document* document = GetFormNode()->GetDocument();
+ CXFA_FFNotify* pNotify = document->GetNotify();
CFX_SizeF size(-1, -1);
pNotify->StartFieldDrawLayout(GetFormNode(), &size.width, &size.height);
diff --git a/xfa/fxfa/layout/cxfa_layoutitem.cpp b/xfa/fxfa/layout/cxfa_layoutitem.cpp
index a9bea60..85c28c9 100644
--- a/xfa/fxfa/layout/cxfa_layoutitem.cpp
+++ b/xfa/fxfa/layout/cxfa_layoutitem.cpp
@@ -22,9 +22,9 @@
XFA_ReleaseLayoutItem(pNode);
pNode = pNext;
}
- CXFA_Document* pDocument = pLayoutItem->GetFormNode()->GetDocument();
- CXFA_FFNotify* pNotify = pDocument->GetNotify();
- auto* pDocLayout = CXFA_LayoutProcessor::FromDocument(pDocument);
+ CXFA_Document* document = pLayoutItem->GetFormNode()->GetDocument();
+ CXFA_FFNotify* pNotify = document->GetNotify();
+ auto* pDocLayout = CXFA_LayoutProcessor::FromDocument(document);
pNotify->OnLayoutItemRemoving(pDocLayout, pLayoutItem);
if (pLayoutItem->GetFormNode()->GetElementType() == XFA_Element::PageArea) {
pNotify->OnPageViewEvent(ToViewLayoutItem(pLayoutItem),
diff --git a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
index ce1fa87..4947329 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
@@ -172,7 +172,7 @@
return nullptr;
}
- CXFA_Document* pDocument = pPageSetRoot->GetDocument();
+ CXFA_Document* document = pPageSetRoot->GetDocument();
if (pTargetAll->IsEmpty()) {
return nullptr;
}
@@ -199,8 +199,8 @@
bTargetAllFind = false;
if (wsExpr[0] == '#') {
- CXFA_Node* pNode = pDocument->GetNodeByID(
- ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Template)),
+ CXFA_Node* pNode = document->GetNodeByID(
+ ToNode(document->GetXFAObject(XFA_HASHCODE_Template)),
wsExpr.Last(wsExpr.GetLength() - 1).AsStringView());
if (pNode) {
return pNode;
@@ -212,7 +212,7 @@
}
std::optional<CFXJSE_Engine::ResolveResult> maybeResult =
- pDocument->GetScriptContext()->ResolveObjects(
+ document->GetScriptContext()->ResolveObjects(
pPageSetRoot, wsProcessedTarget.AsStringView(),
Mask<XFA_ResolveFlag>{
XFA_ResolveFlag::kChildren, XFA_ResolveFlag::kProperties,
@@ -433,12 +433,12 @@
return false;
}
- CXFA_Document* pDocument = pTemplateNode->GetDocument();
+ CXFA_Document* document = pTemplateNode->GetDocument();
pPageArea =
page_set_node_->GetChild<CXFA_Node>(0, XFA_Element::PageArea, false);
if (!pPageArea) {
- pPageArea = pDocument->CreateNode(page_set_node_->GetPacketType(),
- XFA_Element::PageArea);
+ pPageArea = document->CreateNode(page_set_node_->GetPacketType(),
+ XFA_Element::PageArea);
if (!pPageArea) {
return false;
}
@@ -449,7 +449,7 @@
CXFA_ContentArea* pContentArea =
pPageArea->GetChild<CXFA_ContentArea>(0, XFA_Element::ContentArea, false);
if (!pContentArea) {
- pContentArea = static_cast<CXFA_ContentArea*>(pDocument->CreateNode(
+ pContentArea = static_cast<CXFA_ContentArea*>(document->CreateNode(
pPageArea->GetPacketType(), XFA_Element::ContentArea));
if (!pContentArea) {
return false;
@@ -470,7 +470,7 @@
pPageArea->GetChild<CXFA_Medium>(0, XFA_Element::Medium, false);
if (!pMedium) {
pMedium = static_cast<CXFA_Medium*>(
- pDocument->CreateNode(pPageArea->GetPacketType(), XFA_Element::Medium));
+ document->CreateNode(pPageArea->GetPacketType(), XFA_Element::Medium));
if (!pContentArea) {
return false;
}
@@ -919,7 +919,7 @@
}
BreakData break_data = ExecuteBreakBeforeOrAfter(pBreakNode, bBefore);
- CXFA_Document* pDocument = pBreakNode->GetDocument();
+ CXFA_Document* document = pBreakNode->GetDocument();
CXFA_Node* pDataScope = nullptr;
pFormNode = pFormNode->GetContainerParent();
if (break_data.pLeader) {
@@ -928,13 +928,13 @@
}
pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
- break_data.pLeader = pDocument->DataMerge_CopyContainer(
+ break_data.pLeader = document->DataMerge_CopyContainer(
break_data.pLeader, pFormNode, pDataScope, true, true, true);
if (!break_data.pLeader) {
return std::nullopt;
}
- pDocument->DataMerge_UpdateBindingRelations(break_data.pLeader);
+ document->DataMerge_UpdateBindingRelations(break_data.pLeader);
SetLayoutGeneratedNodeFlag(break_data.pLeader);
}
if (break_data.pTrailer) {
@@ -946,13 +946,13 @@
pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
}
- break_data.pTrailer = pDocument->DataMerge_CopyContainer(
+ break_data.pTrailer = document->DataMerge_CopyContainer(
break_data.pTrailer, pFormNode, pDataScope, true, true, true);
if (!break_data.pTrailer) {
return std::nullopt;
}
- pDocument->DataMerge_UpdateBindingRelations(break_data.pTrailer);
+ document->DataMerge_UpdateBindingRelations(break_data.pTrailer);
SetLayoutGeneratedNodeFlag(break_data.pTrailer);
}
return break_data;
@@ -978,15 +978,15 @@
return nullptr;
}
- CXFA_Document* pDocument = pBookendNode->GetDocument();
+ CXFA_Document* document = pBookendNode->GetDocument();
CXFA_Node* pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
- CXFA_Node* pBookendAppendNode = pDocument->DataMerge_CopyContainer(
+ CXFA_Node* pBookendAppendNode = document->DataMerge_CopyContainer(
pLeaderTemplate, pFormNode, pDataScope, true, true, true);
if (!pBookendAppendNode) {
return nullptr;
}
- pDocument->DataMerge_UpdateBindingRelations(pBookendAppendNode);
+ document->DataMerge_UpdateBindingRelations(pBookendAppendNode);
SetLayoutGeneratedNodeFlag(pBookendAppendNode);
return pBookendAppendNode;
}
@@ -1094,18 +1094,18 @@
pFormNode = pCurNode->GetParent();
}
- CXFA_Document* pDocument = pCurNode->GetDocument();
+ CXFA_Document* document = pCurNode->GetDocument();
CXFA_Node* pDataScope = nullptr;
if (pLeaderTemplate) {
pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
- overflow_data.pLeader = pDocument->DataMerge_CopyContainer(
+ overflow_data.pLeader = document->DataMerge_CopyContainer(
pLeaderTemplate, pFormNode, pDataScope, true, true, true);
if (!overflow_data.pLeader) {
return std::nullopt;
}
- pDocument->DataMerge_UpdateBindingRelations(overflow_data.pLeader);
+ document->DataMerge_UpdateBindingRelations(overflow_data.pLeader);
SetLayoutGeneratedNodeFlag(overflow_data.pLeader);
}
if (pTrailerTemplate) {
@@ -1113,13 +1113,13 @@
pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
}
- overflow_data.pTrailer = pDocument->DataMerge_CopyContainer(
+ overflow_data.pTrailer = document->DataMerge_CopyContainer(
pTrailerTemplate, pFormNode, pDataScope, true, true, true);
if (!overflow_data.pTrailer) {
return std::nullopt;
}
- pDocument->DataMerge_UpdateBindingRelations(overflow_data.pTrailer);
+ document->DataMerge_UpdateBindingRelations(overflow_data.pTrailer);
SetLayoutGeneratedNodeFlag(overflow_data.pTrailer);
}
return overflow_data;
@@ -1716,9 +1716,9 @@
void CXFA_ViewLayoutProcessor::SaveLayoutItemChildren(
CXFA_LayoutItem* pParentLayoutItem) {
- CXFA_Document* pDocument = page_set_node_->GetDocument();
- CXFA_FFNotify* pNotify = pDocument->GetNotify();
- auto* pDocLayout = CXFA_LayoutProcessor::FromDocument(pDocument);
+ CXFA_Document* document = page_set_node_->GetDocument();
+ CXFA_FFNotify* pNotify = document->GetNotify();
+ auto* pDocLayout = CXFA_LayoutProcessor::FromDocument(document);
CXFA_LayoutItem* pCurLayoutItem = pParentLayoutItem->GetFirstChild();
while (pCurLayoutItem) {
CXFA_LayoutItem* pNextLayoutItem = pCurLayoutItem->GetNextSibling();
@@ -1762,11 +1762,11 @@
}
void CXFA_ViewLayoutProcessor::MergePageSetContents() {
- CXFA_Document* pDocument = page_set_node_->GetDocument();
- pDocument->SetPendingNodesUnusedAndUnbound();
+ CXFA_Document* document = page_set_node_->GetDocument();
+ document->SetPendingNodesUnusedAndUnbound();
- CXFA_FFNotify* pNotify = pDocument->GetNotify();
- auto* pDocLayout = CXFA_LayoutProcessor::FromDocument(pDocument);
+ CXFA_FFNotify* pNotify = document->GetNotify();
+ auto* pDocLayout = CXFA_LayoutProcessor::FromDocument(document);
CXFA_ViewLayoutItem* pRootLayout = GetRootLayoutItem();
size_t pending_index = 0;
@@ -1777,8 +1777,8 @@
CXFA_ViewLayoutItem* pRootPageSetViewItem = iterator.GetCurrent();
DCHECK(pRootPageSetViewItem->GetFormNode()->GetElementType() ==
XFA_Element::PageSet);
- if (pending_index < pDocument->GetPendingNodesCount()) {
- pPendingPageSet = pDocument->GetPendingNodeAtIndex(pending_index);
+ if (pending_index < document->GetPendingNodesCount()) {
+ pPendingPageSet = document->GetPendingNodeAtIndex(pending_index);
++pending_index;
}
if (!pPendingPageSet) {
@@ -1808,7 +1808,7 @@
CXFA_Node* pParentNode = pViewItem->GetParent()->GetFormNode();
CXFA_Node* pOldNode = pViewItem->GetFormNode();
CXFA_Node* pNewNode = XFA_NodeMerge_CloneOrMergeContainer(
- pDocument, pParentNode, pOldNode, true, nullptr);
+ document, pParentNode, pOldNode, true, nullptr);
if (pOldNode != pNewNode) {
pOldNode->JSObject()->SetLayoutItem(nullptr);
pViewItem->SetFormNode(pNewNode);
@@ -1837,7 +1837,7 @@
if (pViewItem->GetOldSubform() &&
pViewItem->GetOldSubform() != pNewSubform) {
CXFA_Node* pExistingNode = XFA_DataMerge_FindFormDOMInstance(
- pDocument, pViewItem->GetFormNode()->GetElementType(),
+ document, pViewItem->GetFormNode()->GetElementType(),
pViewItem->GetFormNode()->GetNameHash(), pParentNode);
CXFA_ContainerIterator sIterator(pExistingNode);
for (CXFA_Node* pIter = sIterator.GetCurrent(); pIter;
@@ -1858,9 +1858,9 @@
pViewItem->SetOldSubform(pNewSubform);
}
CXFA_Node* pOldNode = pViewItem->GetFormNode();
- CXFA_Node* pNewNode = pDocument->DataMerge_CopyContainer(
+ CXFA_Node* pNewNode = document->DataMerge_CopyContainer(
pOldNode, pParentNode,
- ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Record)), true, true,
+ ToNode(document->GetXFAObject(XFA_HASHCODE_Record)), true, true,
true);
if (pOldNode != pNewNode) {
pOldNode->JSObject()->SetLayoutItem(nullptr);
@@ -1886,7 +1886,7 @@
}
}
if (!pPendingPageSet->GetParent()) {
- CXFA_Node* pNode = ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Form));
+ CXFA_Node* pNode = ToNode(document->GetXFAObject(XFA_HASHCODE_Form));
if (pNode) {
CXFA_Node* pFormToplevelSubform =
pNode->GetFirstChildByClass<CXFA_Subform>(XFA_Element::Subform);
@@ -1895,7 +1895,7 @@
}
}
}
- pDocument->DataMerge_UpdateBindingRelations(pPendingPageSet);
+ document->DataMerge_UpdateBindingRelations(pPendingPageSet);
pPendingPageSet->SetInitializedFlagAndNotify();
}
diff --git a/xfa/fxfa/parser/cscript_datawindow.h b/xfa/fxfa/parser/cscript_datawindow.h
index 16ebe1b..9586752 100644
--- a/xfa/fxfa/parser/cscript_datawindow.h
+++ b/xfa/fxfa/parser/cscript_datawindow.h
@@ -13,7 +13,7 @@
class CScript_DataWindow final : public CXFA_Object {
public:
- explicit CScript_DataWindow(CXFA_Document* pDocument);
+ explicit CScript_DataWindow(CXFA_Document* document);
~CScript_DataWindow() override;
};
diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.h b/xfa/fxfa/parser/cscript_eventpseudomodel.h
index 131d267..6feee87 100644
--- a/xfa/fxfa/parser/cscript_eventpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_eventpseudomodel.h
@@ -13,7 +13,7 @@
class CScript_EventPseudoModel final : public CXFA_Object {
public:
- explicit CScript_EventPseudoModel(CXFA_Document* pDocument);
+ explicit CScript_EventPseudoModel(CXFA_Document* document);
~CScript_EventPseudoModel() override;
};
diff --git a/xfa/fxfa/parser/cscript_hostpseudomodel.h b/xfa/fxfa/parser/cscript_hostpseudomodel.h
index 65408f3..dd10564 100644
--- a/xfa/fxfa/parser/cscript_hostpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_hostpseudomodel.h
@@ -13,7 +13,7 @@
class CScript_HostPseudoModel final : public CXFA_Object {
public:
- explicit CScript_HostPseudoModel(CXFA_Document* pDocument);
+ explicit CScript_HostPseudoModel(CXFA_Document* document);
~CScript_HostPseudoModel() override;
};
diff --git a/xfa/fxfa/parser/cscript_layoutpseudomodel.h b/xfa/fxfa/parser/cscript_layoutpseudomodel.h
index a4da27d..0f597b1 100644
--- a/xfa/fxfa/parser/cscript_layoutpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_layoutpseudomodel.h
@@ -13,7 +13,7 @@
class CScript_LayoutPseudoModel final : public CXFA_Object {
public:
- explicit CScript_LayoutPseudoModel(CXFA_Document* pDocument);
+ explicit CScript_LayoutPseudoModel(CXFA_Document* document);
~CScript_LayoutPseudoModel() override;
};
diff --git a/xfa/fxfa/parser/cscript_logpseudomodel.h b/xfa/fxfa/parser/cscript_logpseudomodel.h
index e3d6258..a975c25 100644
--- a/xfa/fxfa/parser/cscript_logpseudomodel.h
+++ b/xfa/fxfa/parser/cscript_logpseudomodel.h
@@ -13,7 +13,7 @@
class CScript_LogPseudoModel final : public CXFA_Object {
public:
- explicit CScript_LogPseudoModel(CXFA_Document* pDocument);
+ explicit CScript_LogPseudoModel(CXFA_Document* document);
~CScript_LogPseudoModel() override;
};
diff --git a/xfa/fxfa/parser/cscript_signaturepseudomodel.h b/xfa/fxfa/parser/cscript_signaturepseudomodel.h
index 1a09791..e2d5fbd 100644
--- a/xfa/fxfa/parser/cscript_signaturepseudomodel.h
+++ b/xfa/fxfa/parser/cscript_signaturepseudomodel.h
@@ -13,7 +13,7 @@
class CScript_SignaturePseudoModel final : public CXFA_Object {
public:
- explicit CScript_SignaturePseudoModel(CXFA_Document* pDocument);
+ explicit CScript_SignaturePseudoModel(CXFA_Document* document);
~CScript_SignaturePseudoModel() override;
};
diff --git a/xfa/fxfa/parser/cxfa_arraynodelist.cpp b/xfa/fxfa/parser/cxfa_arraynodelist.cpp
index 5f148d2..4b21deb 100644
--- a/xfa/fxfa/parser/cxfa_arraynodelist.cpp
+++ b/xfa/fxfa/parser/cxfa_arraynodelist.cpp
@@ -12,8 +12,8 @@
#include "fxjs/gc/container_trace.h"
#include "xfa/fxfa/parser/cxfa_node.h"
-CXFA_ArrayNodeList::CXFA_ArrayNodeList(CXFA_Document* pDocument)
- : CXFA_TreeList(pDocument) {}
+CXFA_ArrayNodeList::CXFA_ArrayNodeList(CXFA_Document* document)
+ : CXFA_TreeList(document) {}
CXFA_ArrayNodeList::~CXFA_ArrayNodeList() = default;
diff --git a/xfa/fxfa/parser/cxfa_arraynodelist.h b/xfa/fxfa/parser/cxfa_arraynodelist.h
index ca40ea0..a9f2fb6 100644
--- a/xfa/fxfa/parser/cxfa_arraynodelist.h
+++ b/xfa/fxfa/parser/cxfa_arraynodelist.h
@@ -33,7 +33,7 @@
void SetArrayNodeList(const std::vector<CXFA_Node*>& srcArray);
private:
- explicit CXFA_ArrayNodeList(CXFA_Document* pDocument);
+ explicit CXFA_ArrayNodeList(CXFA_Document* document);
std::vector<cppgc::Member<CXFA_Node>> array_;
};
diff --git a/xfa/fxfa/parser/cxfa_attachnodelist.cpp b/xfa/fxfa/parser/cxfa_attachnodelist.cpp
index 63d8a81..9931955 100644
--- a/xfa/fxfa/parser/cxfa_attachnodelist.cpp
+++ b/xfa/fxfa/parser/cxfa_attachnodelist.cpp
@@ -8,9 +8,9 @@
#include "xfa/fxfa/parser/cxfa_node.h"
-CXFA_AttachNodeList::CXFA_AttachNodeList(CXFA_Document* pDocument,
+CXFA_AttachNodeList::CXFA_AttachNodeList(CXFA_Document* document,
CXFA_Node* pAttachNode)
- : CXFA_TreeList(pDocument), attach_node_(pAttachNode) {}
+ : CXFA_TreeList(document), attach_node_(pAttachNode) {}
CXFA_AttachNodeList::~CXFA_AttachNodeList() = default;
diff --git a/xfa/fxfa/parser/cxfa_attachnodelist.h b/xfa/fxfa/parser/cxfa_attachnodelist.h
index 5f956bc..28abe26 100644
--- a/xfa/fxfa/parser/cxfa_attachnodelist.h
+++ b/xfa/fxfa/parser/cxfa_attachnodelist.h
@@ -29,7 +29,7 @@
CXFA_Node* Item(size_t iIndex) override;
private:
- CXFA_AttachNodeList(CXFA_Document* pDocument, CXFA_Node* pAttachNode);
+ CXFA_AttachNodeList(CXFA_Document* document, CXFA_Node* pAttachNode);
cppgc::Member<CXFA_Node> const attach_node_;
};
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index 3e97e45..57fd776 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -186,7 +186,7 @@
}
}
-CXFA_Node* CloneOrMergeInstanceManager(CXFA_Document* pDocument,
+CXFA_Node* CloneOrMergeInstanceManager(CXFA_Document* document,
CXFA_Node* pFormParent,
CXFA_Node* pTemplateNode,
std::vector<CXFA_Node*>* subforms) {
@@ -195,7 +195,7 @@
WideString wsInstMgrNodeName = L"_" + wsSubformName;
uint32_t dwInstNameHash = FX_HashCode_GetW(wsInstMgrNodeName.AsStringView());
CXFA_Node* pExistingNode = XFA_DataMerge_FindFormDOMInstance(
- pDocument, XFA_Element::InstanceManager, dwInstNameHash, pFormParent);
+ document, XFA_Element::InstanceManager, dwInstNameHash, pFormParent);
if (pExistingNode) {
uint32_t dwNameHash = pTemplateNode->GetNameHash();
for (CXFA_Node* pNode = pExistingNode->GetNextSibling(); pNode;) {
@@ -226,7 +226,7 @@
}
CXFA_Node* pNewNode =
- pDocument->CreateNode(XFA_PacketType::Form, XFA_Element::InstanceManager);
+ document->CreateNode(XFA_PacketType::Form, XFA_Element::InstanceManager);
wsInstMgrNodeName =
L"_" + pTemplateNode->JSObject()->GetCData(XFA_Attribute::Name);
pNewNode->JSObject()->SetCData(XFA_Attribute::Name, wsInstMgrNodeName);
@@ -304,7 +304,7 @@
return nullptr;
}
-CXFA_Node* FindGlobalDataNode(CXFA_Document* pDocument,
+CXFA_Node* FindGlobalDataNode(CXFA_Document* document,
const WideString& wsName,
CXFA_Node* pDataScope,
XFA_Element eMatchNodeType) {
@@ -313,12 +313,12 @@
}
uint32_t dwNameHash = FX_HashCode_GetW(wsName.AsStringView());
- CXFA_Node* pBounded = pDocument->GetGlobalBinding(dwNameHash);
+ CXFA_Node* pBounded = document->GetGlobalBinding(dwNameHash);
if (!pBounded) {
pBounded =
ScopeMatchGlobalBinding(pDataScope, dwNameHash, eMatchNodeType, true);
if (pBounded) {
- pDocument->RegisterGlobalBinding(dwNameHash, pBounded);
+ document->RegisterGlobalBinding(dwNameHash, pBounded);
}
}
return pBounded;
@@ -352,7 +352,7 @@
return nullptr;
}
-CXFA_Node* FindDataRefDataNode(CXFA_Document* pDocument,
+CXFA_Node* FindDataRefDataNode(CXFA_Document* document,
const WideString& wsRef,
CXFA_Node* pDataScope,
XFA_Element eMatchNodeType,
@@ -366,7 +366,7 @@
dwFlags |= XFA_ResolveFlag::kSiblings;
}
std::optional<CFXJSE_Engine::ResolveResult> maybeResult =
- pDocument->GetScriptContext()->ResolveObjectsWithBindNode(
+ document->GetScriptContext()->ResolveObjectsWithBindNode(
pDataScope, wsRef.AsStringView(), dwFlags, pTemplateNode);
if (!maybeResult.has_value()) {
return nullptr;
@@ -377,7 +377,7 @@
maybeResult.value().type ==
CFXJSE_Engine::ResolveResult::Type::kCreateNodeMidAll ||
maybeResult.value().objects.size() > 1) {
- return pDocument->GetNotBindNode(maybeResult.value().objects);
+ return document->GetNotBindNode(maybeResult.value().objects);
}
if (maybeResult.value().type ==
@@ -392,7 +392,7 @@
}
CXFA_Node* FindMatchingDataNode(
- CXFA_Document* pDocument,
+ CXFA_Document* document,
CXFA_Node* pTemplateNode,
CXFA_Node* pDataScope,
bool& bAccessedDataDOM,
@@ -455,7 +455,7 @@
(eMatchNodeType == XFA_Element::DataGroup &&
XFA_FieldIsMultiListBox(pTemplateNodeBind))) {
CXFA_Node* pGlobalBindNode = FindGlobalDataNode(
- pDocument,
+ document,
pCurTemplateNode->JSObject()->GetCData(XFA_Attribute::Name),
pDataScope, eMatchNodeType);
if (!pGlobalBindNode) {
@@ -481,7 +481,7 @@
case XFA_AttributeValue::DataRef: {
bAccessedDataDOM = true;
CXFA_Node* pDataRefBindNode = FindDataRefDataNode(
- pDocument,
+ document,
pTemplateNodeBind->JSObject()->GetCData(XFA_Attribute::Ref),
pDataScope, eMatchNodeType, pTemplateNode, bForceBind, bUpLevel);
if (pDataRefBindNode &&
@@ -757,7 +757,7 @@
}
}
-CXFA_Node* MaybeCreateDataNode(CXFA_Document* pDocument,
+CXFA_Node* MaybeCreateDataNode(CXFA_Document* document,
CXFA_Node* pDataParent,
XFA_Element eNodeType,
const WideString& wsName) {
@@ -768,7 +768,7 @@
CXFA_Node* pParentDDNode = pDataParent->GetDataDescriptionNode();
if (!pParentDDNode) {
CXFA_Node* pDataNode =
- pDocument->CreateNode(XFA_PacketType::Datasets, eNodeType);
+ document->CreateNode(XFA_PacketType::Datasets, eNodeType);
pDataNode->JSObject()->SetCData(XFA_Attribute::Name, wsName);
pDataNode->CreateXMLMappingNode();
pDataParent->InsertChildAndNotify(pDataNode, nullptr);
@@ -802,7 +802,7 @@
}
CXFA_Node* pDataNode =
- pDocument->CreateNode(XFA_PacketType::Datasets, eNodeType);
+ document->CreateNode(XFA_PacketType::Datasets, eNodeType);
pDataNode->JSObject()->SetCData(XFA_Attribute::Name, wsName);
pDataNode->CreateXMLMappingNode();
if (eNodeType == XFA_Element::DataValue &&
@@ -819,25 +819,25 @@
return nullptr;
}
-CXFA_Node* CopyContainer_Field(CXFA_Document* pDocument,
+CXFA_Node* CopyContainer_Field(CXFA_Document* document,
CXFA_Node* pTemplateNode,
CXFA_Node* pFormNode,
CXFA_Node* pDataScope,
bool bDataMerge,
bool bUpLevel) {
CXFA_Node* pFieldNode = XFA_NodeMerge_CloneOrMergeContainer(
- pDocument, pFormNode, pTemplateNode, false, nullptr);
+ document, pFormNode, pTemplateNode, false, nullptr);
DCHECK(pFieldNode);
for (CXFA_Node* pTemplateChildNode = pTemplateNode->GetFirstChild();
pTemplateChildNode;
pTemplateChildNode = pTemplateChildNode->GetNextSibling()) {
if (XFA_DataMerge_NeedGenerateForm(pTemplateChildNode, true)) {
- XFA_NodeMerge_CloneOrMergeContainer(pDocument, pFieldNode,
+ XFA_NodeMerge_CloneOrMergeContainer(document, pFieldNode,
pTemplateChildNode, true, nullptr);
} else if (pTemplateNode->GetElementType() == XFA_Element::ExclGroup &&
pTemplateChildNode->IsContainerNode()) {
if (pTemplateChildNode->GetElementType() == XFA_Element::Field) {
- CopyContainer_Field(pDocument, pTemplateChildNode, pFieldNode, nullptr,
+ CopyContainer_Field(document, pTemplateChildNode, pFieldNode, nullptr,
false, true);
}
}
@@ -849,8 +849,8 @@
CXFA_NodeIteratorTemplate<CXFA_Node, CXFA_TraverseStrategy_XFAContainerNode>
sNodeIter(pTemplateNode);
CXFA_Node* pDataNode = FindMatchingDataNode(
- pDocument, pTemplateNode, pDataScope, bAccessedDataDOM, true,
- &sNodeIter, bSelfMatch, eBindMatch, bUpLevel);
+ document, pTemplateNode, pDataScope, bAccessedDataDOM, true, &sNodeIter,
+ bSelfMatch, eBindMatch, bUpLevel);
if (pDataNode) {
CreateDataBinding(pFieldNode, pDataNode, true);
}
@@ -860,7 +860,7 @@
return pFieldNode;
}
-CXFA_Node* CopyContainer_SubformSet(CXFA_Document* pDocument,
+CXFA_Node* CopyContainer_SubformSet(CXFA_Document* document,
CXFA_Node* pTemplateNode,
CXFA_Node* pFormParentNode,
CXFA_Node* pDataScope,
@@ -877,14 +877,14 @@
if (!bOneInstance &&
(eType == XFA_Element::SubformSet || eType == XFA_Element::Subform)) {
pInstMgrNode = bUseInstanceManager ? CloneOrMergeInstanceManager(
- pDocument, pFormParentNode,
+ document, pFormParentNode,
pTemplateNode, &subformArray)
: nullptr;
if (CXFA_Occur* pOccurTemplateNode =
pTemplateNode->GetFirstChildByClass<CXFA_Occur>(
XFA_Element::Occur)) {
pOccurNode = pInstMgrNode ? XFA_NodeMerge_CloneOrMergeContainer(
- pDocument, pInstMgrNode,
+ document, pInstMgrNode,
pOccurTemplateNode, false, nullptr)
: pOccurTemplateNode;
} else if (pInstMgrNode) {
@@ -935,7 +935,7 @@
bool bSelfMatch = false;
XFA_AttributeValue eBindMatch = XFA_AttributeValue::None;
CXFA_Node* pDataNode = FindMatchingDataNode(
- pDocument, pTemplateNode, pDataScope, bAccessedDataDOM, false,
+ document, pTemplateNode, pDataScope, bAccessedDataDOM, false,
&sNodeIterator, bSelfMatch, eBindMatch, true);
if (!pDataNode || sNodeIterator.GetCurrent() != pTemplateNode) {
break;
@@ -943,7 +943,7 @@
eParentBindMatch = eBindMatch;
CXFA_Node* pSubformNode = XFA_NodeMerge_CloneOrMergeContainer(
- pDocument, pFormParentNode, pTemplateNode, false, pSearchArray);
+ document, pFormParentNode, pTemplateNode, false, pSearchArray);
if (!pFirstInstance) {
pFirstInstance = pSubformNode;
}
@@ -965,11 +965,11 @@
pTemplateChild = pTemplateChild->GetNextSibling()) {
if (XFA_DataMerge_NeedGenerateForm(pTemplateChild,
bUseInstanceManager)) {
- XFA_NodeMerge_CloneOrMergeContainer(pDocument, pSubform,
+ XFA_NodeMerge_CloneOrMergeContainer(document, pSubform,
pTemplateChild, true, nullptr);
} else if (pTemplateChild->IsContainerNode()) {
- pDocument->DataMerge_CopyContainer(pTemplateChild, pSubform,
- pDataNode, false, true, false);
+ document->DataMerge_CopyContainer(pTemplateChild, pSubform,
+ pDataNode, false, true, false);
}
}
}
@@ -979,7 +979,7 @@
for (; iMax < 0 || iCurRepeatIndex < iMax; iCurRepeatIndex++) {
bool bSelfMatch = false;
XFA_AttributeValue eBindMatch = XFA_AttributeValue::None;
- if (!FindMatchingDataNode(pDocument, pTemplateNode, pDataScope,
+ if (!FindMatchingDataNode(document, pTemplateNode, pDataScope,
bAccessedDataDOM, false, &sNodeIterator,
bSelfMatch, eBindMatch, true)) {
break;
@@ -992,7 +992,7 @@
if (eRelation == XFA_AttributeValue::Choice ||
eRelation == XFA_AttributeValue::Unordered) {
CXFA_Node* pSubformSetNode = XFA_NodeMerge_CloneOrMergeContainer(
- pDocument, pFormParentNode, pTemplateNode, false, pSearchArray);
+ document, pFormParentNode, pTemplateNode, false, pSearchArray);
DCHECK(pSubformSetNode);
if (!pFirstInstance) {
pFirstInstance = pSubformSetNode;
@@ -1005,7 +1005,7 @@
pTemplateChild = pTemplateChild->GetNextSibling()) {
if (XFA_DataMerge_NeedGenerateForm(pTemplateChild,
bUseInstanceManager)) {
- XFA_NodeMerge_CloneOrMergeContainer(pDocument, pSubformSetNode,
+ XFA_NodeMerge_CloneOrMergeContainer(document, pSubformSetNode,
pTemplateChild, true, nullptr);
} else if (pTemplateChild->IsContainerNode()) {
bSelfMatch = false;
@@ -1015,8 +1015,8 @@
CXFA_TraverseStrategy_XFAContainerNode>
sChildIter(pTemplateChild);
CXFA_Node* pDataMatch = FindMatchingDataNode(
- pDocument, pTemplateChild, pDataScope, bAccessedDataDOM,
- false, &sChildIter, bSelfMatch, eBindMatch, true);
+ document, pTemplateChild, pDataScope, bAccessedDataDOM, false,
+ &sChildIter, bSelfMatch, eBindMatch, true);
if (pDataMatch) {
RecurseRecord sNewRecord = {pTemplateChild, pDataMatch};
if (bSelfMatch) {
@@ -1037,7 +1037,7 @@
case XFA_AttributeValue::Choice: {
DCHECK(!rgItemMatchList.empty());
SortRecurseRecord(&rgItemMatchList, pDataScope, true);
- pDocument->DataMerge_CopyContainer(
+ document->DataMerge_CopyContainer(
rgItemMatchList.front().pTemplateChild, pSubformSetNode,
pDataScope, false, true, true);
break;
@@ -1046,14 +1046,14 @@
if (!rgItemMatchList.empty()) {
SortRecurseRecord(&rgItemMatchList, pDataScope, false);
for (const auto& matched : rgItemMatchList) {
- pDocument->DataMerge_CopyContainer(matched.pTemplateChild,
- pSubformSetNode, pDataScope,
- false, true, true);
+ document->DataMerge_CopyContainer(matched.pTemplateChild,
+ pSubformSetNode, pDataScope,
+ false, true, true);
}
}
for (auto* unmatched : rgItemUnmatchList) {
- pDocument->DataMerge_CopyContainer(unmatched, pSubformSetNode,
- pDataScope, false, true, true);
+ document->DataMerge_CopyContainer(unmatched, pSubformSetNode,
+ pDataScope, false, true, true);
}
break;
}
@@ -1062,7 +1062,7 @@
}
} else {
CXFA_Node* pSubformSetNode = XFA_NodeMerge_CloneOrMergeContainer(
- pDocument, pFormParentNode, pTemplateNode, false, pSearchArray);
+ document, pFormParentNode, pTemplateNode, false, pSearchArray);
DCHECK(pSubformSetNode);
if (!pFirstInstance) {
pFirstInstance = pSubformSetNode;
@@ -1073,11 +1073,11 @@
pTemplateChild = pTemplateChild->GetNextSibling()) {
if (XFA_DataMerge_NeedGenerateForm(pTemplateChild,
bUseInstanceManager)) {
- XFA_NodeMerge_CloneOrMergeContainer(pDocument, pSubformSetNode,
+ XFA_NodeMerge_CloneOrMergeContainer(document, pSubformSetNode,
pTemplateChild, true, nullptr);
} else if (pTemplateChild->IsContainerNode()) {
- pDocument->DataMerge_CopyContainer(pTemplateChild, pSubformSetNode,
- pDataScope, false, true, true);
+ document->DataMerge_CopyContainer(pTemplateChild, pSubformSetNode,
+ pDataScope, false, true, true);
}
}
}
@@ -1101,12 +1101,12 @@
pSearchArray = nullptr;
}
} else if (!XFA_DataMerge_FindFormDOMInstance(
- pDocument, pTemplateNode->GetElementType(),
+ document, pTemplateNode->GetElementType(),
pTemplateNode->GetNameHash(), pFormParentNode)) {
break;
}
CXFA_Node* pSubformNode = XFA_NodeMerge_CloneOrMergeContainer(
- pDocument, pFormParentNode, pTemplateNode, false, pSearchArray);
+ document, pFormParentNode, pTemplateNode, false, pSearchArray);
DCHECK(pSubformNode);
if (!pFirstInstance) {
pFirstInstance = pSubformNode;
@@ -1117,11 +1117,11 @@
pTemplateChild = pTemplateChild->GetNextSibling()) {
if (XFA_DataMerge_NeedGenerateForm(pTemplateChild,
bUseInstanceManager)) {
- XFA_NodeMerge_CloneOrMergeContainer(pDocument, pSubformNode,
+ XFA_NodeMerge_CloneOrMergeContainer(document, pSubformNode,
pTemplateChild, true, nullptr);
} else if (pTemplateChild->IsContainerNode()) {
- pDocument->DataMerge_CopyContainer(pTemplateChild, pSubformNode,
- pDataScope, false, true, true);
+ document->DataMerge_CopyContainer(pTemplateChild, pSubformNode,
+ pDataScope, false, true, true);
}
}
}
@@ -1131,7 +1131,7 @@
int32_t iMinimalLimit = iCurRepeatIndex == 0 ? iInit : iMin;
for (; iCurRepeatIndex < iMinimalLimit; iCurRepeatIndex++) {
CXFA_Node* pSubformSetNode = XFA_NodeMerge_CloneOrMergeContainer(
- pDocument, pFormParentNode, pTemplateNode, false, pSearchArray);
+ document, pFormParentNode, pTemplateNode, false, pSearchArray);
DCHECK(pSubformSetNode);
if (!pFirstInstance) {
pFirstInstance = pSubformSetNode;
@@ -1144,15 +1144,15 @@
continue;
}
if (XFA_DataMerge_NeedGenerateForm(pTemplateChild, bUseInstanceManager)) {
- XFA_NodeMerge_CloneOrMergeContainer(pDocument, pSubformSetNode,
+ XFA_NodeMerge_CloneOrMergeContainer(document, pSubformSetNode,
pTemplateChild, true, nullptr);
} else if (pTemplateChild->IsContainerNode()) {
if (bFound && eRelation == XFA_AttributeValue::Choice) {
continue;
}
- pDocument->DataMerge_CopyContainer(pTemplateChild, pSubformSetNode,
- pDataScope, false, bDataMerge, true);
+ document->DataMerge_CopyContainer(pTemplateChild, pSubformSetNode,
+ pDataScope, false, bDataMerge, true);
bFound = true;
}
}
@@ -1160,7 +1160,7 @@
return pFirstInstance;
}
-void UpdateBindingRelations(CXFA_Document* pDocument,
+void UpdateBindingRelations(CXFA_Document* document,
CXFA_Node* pFormNode,
CXFA_Node* pDataScope,
bool bDataRef,
@@ -1196,7 +1196,7 @@
? XFA_Element::DataGroup
: XFA_Element::DataValue;
pDataNode = MaybeCreateDataNode(
- pDocument, pDataScope, eDataNodeType,
+ document, pDataScope, eDataNodeType,
WideString(
pFormNode->JSObject()->GetCData(XFA_Attribute::Name)));
if (pDataNode) {
@@ -1221,22 +1221,22 @@
if (!bDataRef || bParentDataRef) {
uint32_t dwNameHash = pFormNode->GetNameHash();
if (dwNameHash != 0 && !pDataNode) {
- pDataNode = pDocument->GetGlobalBinding(dwNameHash);
+ pDataNode = document->GetGlobalBinding(dwNameHash);
if (!pDataNode) {
XFA_Element eDataNodeType = (eType == XFA_Element::Subform ||
XFA_FieldIsMultiListBox(pFormNode))
? XFA_Element::DataGroup
: XFA_Element::DataValue;
CXFA_Node* pRecordNode =
- ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Record));
+ ToNode(document->GetXFAObject(XFA_HASHCODE_Record));
pDataNode = MaybeCreateDataNode(
- pDocument, pRecordNode, eDataNodeType,
+ document, pRecordNode, eDataNodeType,
WideString(
pFormNode->JSObject()->GetCData(XFA_Attribute::Name)));
if (pDataNode) {
CreateDataBinding(pFormNode, pDataNode, false);
- pDocument->RegisterGlobalBinding(pFormNode->GetNameHash(),
- pDataNode);
+ document->RegisterGlobalBinding(pFormNode->GetNameHash(),
+ pDataNode);
}
} else {
CreateDataBinding(pFormNode, pDataNode, true);
@@ -1258,7 +1258,7 @@
const Mask<XFA_ResolveFlag> kFlags = {XFA_ResolveFlag::kChildren,
XFA_ResolveFlag::kCreateNode};
std::optional<CFXJSE_Engine::ResolveResult> maybeResult =
- pDocument->GetScriptContext()->ResolveObjectsWithBindNode(
+ document->GetScriptContext()->ResolveObjectsWithBindNode(
pDataScope, wsRef.AsStringView(), kFlags, pTemplateNode);
CXFA_Object* pObject =
maybeResult.has_value() && !maybeResult.value().objects.empty()
@@ -1294,7 +1294,7 @@
continue;
}
- UpdateBindingRelations(pDocument, pFormChild,
+ UpdateBindingRelations(document, pFormChild,
pDataNode ? pDataNode : pDataScope, bDataRef,
bParentDataRef);
}
diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h
index f4db7fc..78e8b65 100644
--- a/xfa/fxfa/parser/cxfa_document.h
+++ b/xfa/fxfa/parser/cxfa_document.h
@@ -74,7 +74,7 @@
virtual void SetForceRelayout() = 0;
virtual void SetHasChangedContainer() = 0;
- void SetDocument(CXFA_Document* pDocument) { document_ = pDocument; }
+ void SetDocument(CXFA_Document* document) { document_ = document; }
CXFA_Document* GetDocument() const { return document_; }
private:
diff --git a/xfa/fxfa/parser/cxfa_list.cpp b/xfa/fxfa/parser/cxfa_list.cpp
index 3bb7488..52cec39 100644
--- a/xfa/fxfa/parser/cxfa_list.cpp
+++ b/xfa/fxfa/parser/cxfa_list.cpp
@@ -12,13 +12,13 @@
#include "xfa/fxfa/parser/cxfa_document.h"
#include "xfa/fxfa/parser/cxfa_node.h"
-CXFA_List::CXFA_List(CXFA_Document* pDocument, CJX_Object* obj)
- : CXFA_List(pDocument, XFA_ObjectType::List, XFA_Element::List, obj) {}
+CXFA_List::CXFA_List(CXFA_Document* document, CJX_Object* obj)
+ : CXFA_List(document, XFA_ObjectType::List, XFA_Element::List, obj) {}
-CXFA_List::CXFA_List(CXFA_Document* pDocument,
+CXFA_List::CXFA_List(CXFA_Document* document,
XFA_ObjectType objectType,
XFA_Element eType,
CJX_Object* obj)
- : CXFA_Object(pDocument, objectType, eType, obj) {}
+ : CXFA_Object(document, objectType, eType, obj) {}
CXFA_List::~CXFA_List() = default;
diff --git a/xfa/fxfa/parser/cxfa_list.h b/xfa/fxfa/parser/cxfa_list.h
index 8a4a5b5..24629b5 100644
--- a/xfa/fxfa/parser/cxfa_list.h
+++ b/xfa/fxfa/parser/cxfa_list.h
@@ -27,7 +27,7 @@
protected:
CXFA_List(CXFA_Document* doc, CJX_Object* js_obj);
- CXFA_List(CXFA_Document* pDocument,
+ CXFA_List(CXFA_Document* document,
XFA_ObjectType objectType,
XFA_Element eType,
CJX_Object* obj);
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index fccfd21..63c7edf 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -2143,7 +2143,7 @@
}
CXFA_Node* CXFA_Node::CreateInstanceIfPossible(bool bDataMerge) {
- CXFA_Document* pDocument = GetDocument();
+ CXFA_Document* document = GetDocument();
CXFA_Node* pTemplateNode = GetTemplateNodeIfExists();
if (!pTemplateNode) {
return nullptr;
@@ -2160,14 +2160,14 @@
}
}
if (!pDataScope) {
- pDataScope = ToNode(pDocument->GetXFAObject(XFA_HASHCODE_Record));
+ pDataScope = ToNode(document->GetXFAObject(XFA_HASHCODE_Record));
DCHECK(pDataScope);
}
- CXFA_Node* pInstance = pDocument->DataMerge_CopyContainer(
+ CXFA_Node* pInstance = document->DataMerge_CopyContainer(
pTemplateNode, pFormParent, pDataScope, true, bDataMerge, true);
if (pInstance) {
- pDocument->DataMerge_UpdateBindingRelations(pInstance);
+ document->DataMerge_UpdateBindingRelations(pInstance);
pFormParent->RemoveChildAndNotify(pInstance, true);
}
return pInstance;
diff --git a/xfa/fxfa/parser/cxfa_object.cpp b/xfa/fxfa/parser/cxfa_object.cpp
index f7fd247..2ca1700 100644
--- a/xfa/fxfa/parser/cxfa_object.cpp
+++ b/xfa/fxfa/parser/cxfa_object.cpp
@@ -17,7 +17,7 @@
#include "xfa/fxfa/parser/cxfa_treelist.h"
#include "xfa/fxfa/parser/xfa_basic_data.h"
-CXFA_Object::CXFA_Object(CXFA_Document* pDocument,
+CXFA_Object::CXFA_Object(CXFA_Document* document,
XFA_ObjectType objectType,
XFA_Element elementType,
CJX_Object* jsObject)
@@ -25,7 +25,7 @@
element_type_(elementType),
element_name_(XFA_ElementToName(elementType)),
element_name_hash_(FX_HashCode_GetAsIfW(element_name_)),
- document_(pDocument),
+ document_(document),
jsobject_(jsObject) {}
CXFA_Object::~CXFA_Object() = default;
diff --git a/xfa/fxfa/parser/cxfa_object.h b/xfa/fxfa/parser/cxfa_object.h
index 80a15ff..203e09b 100644
--- a/xfa/fxfa/parser/cxfa_object.h
+++ b/xfa/fxfa/parser/cxfa_object.h
@@ -95,7 +95,7 @@
WideString GetSOMExpression();
protected:
- CXFA_Object(CXFA_Document* pDocument,
+ CXFA_Object(CXFA_Document* document,
XFA_ObjectType objectType,
XFA_Element eType,
CJX_Object* jsObject);
diff --git a/xfa/fxfa/parser/cxfa_treelist.h b/xfa/fxfa/parser/cxfa_treelist.h
index 297a929..203df2d 100644
--- a/xfa/fxfa/parser/cxfa_treelist.h
+++ b/xfa/fxfa/parser/cxfa_treelist.h
@@ -20,7 +20,7 @@
CXFA_Node* NamedItem(WideStringView wsName);
protected:
- explicit CXFA_TreeList(CXFA_Document* pDocument);
+ explicit CXFA_TreeList(CXFA_Document* document);
};
#endif // XFA_FXFA_PARSER_CXFA_TREELIST_H_
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index fd08bbe..58b7fd5 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -25,7 +25,7 @@
return true;
}
-CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* pDocument,
+CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* document,
XFA_Element eType,
uint32_t dwNameHash,
CXFA_Node* pFormParent) {
@@ -40,7 +40,7 @@
}
CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer(
- CXFA_Document* pDocument,
+ CXFA_Document* document,
CXFA_Node* pFormParent,
CXFA_Node* pTemplateNode,
bool bRecursive,
@@ -51,8 +51,8 @@
CXFA_Node* pExistingNode = nullptr;
if (!pSubformArray) {
pExistingNode = XFA_DataMerge_FindFormDOMInstance(
- pDocument, pTemplateNode->GetElementType(),
- pTemplateNode->GetNameHash(), pFormParent);
+ document, pTemplateNode->GetElementType(), pTemplateNode->GetNameHash(),
+ pFormParent);
} else if (!pSubformArray->empty()) {
pExistingNode = pSubformArray->front();
pSubformArray->erase(pSubformArray->begin());
@@ -71,7 +71,7 @@
pTemplateChild; pTemplateChild = pTemplateChild->GetNextSibling()) {
if (XFA_DataMerge_NeedGenerateForm(pTemplateChild, true)) {
XFA_NodeMerge_CloneOrMergeContainer(
- pDocument, pExistingNode, pTemplateChild, bRecursive, nullptr);
+ document, pExistingNode, pTemplateChild, bRecursive, nullptr);
}
}
}
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.h b/xfa/fxfa/parser/xfa_document_datamerger_imp.h
index aa56402..643ee6b 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.h
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.h
@@ -17,13 +17,13 @@
bool XFA_DataMerge_NeedGenerateForm(CXFA_Node* pTemplateChild,
bool bUseInstanceManager);
CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer(
- CXFA_Document* pDocument,
+ CXFA_Document* document,
CXFA_Node* pFormParent,
CXFA_Node* pTemplateNode,
bool bRecursive,
std::vector<CXFA_Node*>* pSubformArray);
CXFA_Node* XFA_DataMerge_FindDataScope(CXFA_Node* pParentFormNode);
-CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* pDocument,
+CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* document,
XFA_Element eType,
uint32_t dwNameHash,
CXFA_Node* pFormParent);
