Rename CPDFSDK_FormFillEnvironment::GetPermissions().
GetPermissions() returns a bool rather than the actual permission value,
so rename it to HasPermissions().
Change-Id: Ifae4fb98b3ac0bf4d91755ab6d45181d6bad0398
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65619
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index c6c2e4f..feeb2b4 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -744,6 +744,6 @@
return pExtension ? pExtension->GetPageCount() : m_pCPDFDoc->GetPageCount();
}
-bool CPDFSDK_FormFillEnvironment::GetPermissions(uint32_t flags) const {
+bool CPDFSDK_FormFillEnvironment::HasPermissions(uint32_t flags) const {
return !!(m_pCPDFDoc->GetUserPermissions() & flags);
}
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h
index 12119c7..71a4fa8 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.h
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -79,7 +79,7 @@
// See PDF Reference 1.7, table 3.20 for the permission bits. Returns true if
// any bit in |flags| is set.
- bool GetPermissions(uint32_t flags) const;
+ bool HasPermissions(uint32_t flags) const;
bool GetChangeMark() const { return m_bChangeMask; }
void SetChangeMark() { m_bChangeMask = true; }
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index 6766e1c..bf49dc8 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -472,9 +472,9 @@
if (pWidget->GetFieldType() == FormFieldType::kPushButton)
return false;
- return m_pFormFillEnv->GetPermissions(FPDFPERM_FILL_FORM) ||
- m_pFormFillEnv->GetPermissions(FPDFPERM_ANNOT_FORM) ||
- m_pFormFillEnv->GetPermissions(FPDFPERM_MODIFY);
+ return m_pFormFillEnv->HasPermissions(FPDFPERM_FILL_FORM) ||
+ m_pFormFillEnv->HasPermissions(FPDFPERM_ANNOT_FORM) ||
+ m_pFormFillEnv->HasPermissions(FPDFPERM_MODIFY);
}
CFFL_FormFiller* CFFL_InteractiveFormFiller::GetFormFiller(
diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp
index 9294f17..ea362ab 100644
--- a/fxjs/cjs_document.cpp
+++ b/fxjs/cjs_document.cpp
@@ -354,7 +354,7 @@
const std::vector<v8::Local<v8::Value>>& params) {
if (!m_pFormFillEnv)
return CJS_Result::Failure(JSMessage::kBadObjectError);
- if (!m_pFormFillEnv->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
+ if (!m_pFormFillEnv->HasPermissions(FPDFPERM_EXTRACT_ACCESS))
return CJS_Result::Failure(JSMessage::kPermissionError);
CPDFSDK_InteractiveForm* pInteractiveForm = GetSDKInteractiveForm();
@@ -460,8 +460,8 @@
if (!m_pFormFillEnv)
return CJS_Result::Failure(JSMessage::kBadObjectError);
- if (!(m_pFormFillEnv->GetPermissions(FPDFPERM_MODIFY) ||
- m_pFormFillEnv->GetPermissions(FPDFPERM_ANNOT_FORM))) {
+ if (!(m_pFormFillEnv->HasPermissions(FPDFPERM_MODIFY) ||
+ m_pFormFillEnv->HasPermissions(FPDFPERM_ANNOT_FORM))) {
return CJS_Result::Failure(JSMessage::kPermissionError);
}
@@ -506,9 +506,9 @@
const std::vector<v8::Local<v8::Value>>& params) {
if (!m_pFormFillEnv)
return CJS_Result::Failure(JSMessage::kBadObjectError);
- if (!(m_pFormFillEnv->GetPermissions(FPDFPERM_MODIFY) ||
- m_pFormFillEnv->GetPermissions(FPDFPERM_ANNOT_FORM) ||
- m_pFormFillEnv->GetPermissions(FPDFPERM_FILL_FORM))) {
+ if (!(m_pFormFillEnv->HasPermissions(FPDFPERM_MODIFY) ||
+ m_pFormFillEnv->HasPermissions(FPDFPERM_ANNOT_FORM) ||
+ m_pFormFillEnv->HasPermissions(FPDFPERM_FILL_FORM))) {
return CJS_Result::Failure(JSMessage::kPermissionError);
}
@@ -733,7 +733,7 @@
if (!pDictionary)
return CJS_Result::Failure(JSMessage::kBadObjectError);
- if (!m_pFormFillEnv->GetPermissions(FPDFPERM_MODIFY))
+ if (!m_pFormFillEnv->HasPermissions(FPDFPERM_MODIFY))
return CJS_Result::Failure(JSMessage::kPermissionError);
pDictionary->SetNewFor<CPDF_String>(propName, pRuntime->ToWideString(vp));
@@ -769,7 +769,7 @@
v8::Local<v8::Value> vp) {
if (!m_pFormFillEnv)
return CJS_Result::Failure(JSMessage::kBadObjectError);
- if (!m_pFormFillEnv->GetPermissions(FPDFPERM_MODIFY))
+ if (!m_pFormFillEnv->HasPermissions(FPDFPERM_MODIFY))
return CJS_Result::Failure(JSMessage::kPermissionError);
m_bDelay = pRuntime->ToBoolean(vp);
@@ -1198,9 +1198,9 @@
if (!m_pFormFillEnv)
return CJS_Result::Failure(JSMessage::kBadObjectError);
- if (!(m_pFormFillEnv->GetPermissions(FPDFPERM_MODIFY) ||
- m_pFormFillEnv->GetPermissions(FPDFPERM_ANNOT_FORM) ||
- m_pFormFillEnv->GetPermissions(FPDFPERM_FILL_FORM))) {
+ if (!(m_pFormFillEnv->HasPermissions(FPDFPERM_MODIFY) ||
+ m_pFormFillEnv->HasPermissions(FPDFPERM_ANNOT_FORM) ||
+ m_pFormFillEnv->HasPermissions(FPDFPERM_FILL_FORM))) {
return CJS_Result::Failure(JSMessage::kPermissionError);
}
@@ -1222,7 +1222,7 @@
const std::vector<v8::Local<v8::Value>>& params) {
if (!m_pFormFillEnv)
return CJS_Result::Failure(JSMessage::kBadObjectError);
- if (!m_pFormFillEnv->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
+ if (!m_pFormFillEnv->HasPermissions(FPDFPERM_EXTRACT_ACCESS))
return CJS_Result::Failure(JSMessage::kPermissionError);
// TODO(tsepez): check maximum allowable params.
@@ -1267,7 +1267,7 @@
const std::vector<v8::Local<v8::Value>>& params) {
if (!m_pFormFillEnv)
return CJS_Result::Failure(JSMessage::kBadObjectError);
- if (!m_pFormFillEnv->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
+ if (!m_pFormFillEnv->HasPermissions(FPDFPERM_EXTRACT_ACCESS))
return CJS_Result::Failure(JSMessage::kBadObjectError);
return CJS_Result::Failure(JSMessage::kNotSupportedError);
}
@@ -1277,7 +1277,7 @@
const std::vector<v8::Local<v8::Value>>& params) {
if (!m_pFormFillEnv)
return CJS_Result::Failure(JSMessage::kBadObjectError);
- if (!m_pFormFillEnv->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
+ if (!m_pFormFillEnv->HasPermissions(FPDFPERM_EXTRACT_ACCESS))
return CJS_Result::Failure(JSMessage::kPermissionError);
int nPageNo = params.size() > 0 ? pRuntime->ToInt32(params[0]) : 0;
diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp
index b6aa9bb..64991cd 100644
--- a/fxjs/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -610,9 +610,9 @@
const WideString& csFieldName) {
m_pJSDoc.Reset(pDocument);
m_pFormFillEnv.Reset(pDocument->GetFormFillEnv());
- m_bCanSet = m_pFormFillEnv->GetPermissions(FPDFPERM_FILL_FORM) ||
- m_pFormFillEnv->GetPermissions(FPDFPERM_ANNOT_FORM) ||
- m_pFormFillEnv->GetPermissions(FPDFPERM_MODIFY);
+ m_bCanSet = m_pFormFillEnv->HasPermissions(FPDFPERM_FILL_FORM) ||
+ m_pFormFillEnv->HasPermissions(FPDFPERM_ANNOT_FORM) ||
+ m_pFormFillEnv->HasPermissions(FPDFPERM_MODIFY);
CPDFSDK_InteractiveForm* pRDForm = m_pFormFillEnv->GetInteractiveForm();
CPDF_InteractiveForm* pForm = pRDForm->GetInteractiveForm();
