Rename some UnsupportedInfo code.
s/RaiseUnSupportError/RaiseUnsupportedError/
s/CFSDK_UnsupportInfo_Adapter/UnsupportedInfoAdapter/
s/UnSupRecordDelegate/RecordUnsupportedErrorDelegate/
Change-Id: Ib47058559285e030b672dfaea48ee347f1ad6b8e
Reviewed-on: https://pdfium-review.googlesource.com/c/51250
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/cpdf_modulemgr.h b/core/fpdfapi/cpdf_modulemgr.h
index 39acfed..69b4833 100644
--- a/core/fpdfapi/cpdf_modulemgr.h
+++ b/core/fpdfapi/cpdf_modulemgr.h
@@ -19,17 +19,20 @@
class CCodec_ModuleMgr;
class CPDF_PageModule;
-class CFSDK_UnsupportInfo_Adapter {
- public:
- explicit CFSDK_UnsupportInfo_Adapter(void* unsp_info)
- : m_unsp_info(unsp_info) {}
+namespace fpdfapi {
- void* GetUnspInfo() const { return m_unsp_info; }
+class UnsupportedInfoAdapter {
+ public:
+ explicit UnsupportedInfoAdapter(void* info) : m_info(info) {}
+
+ void* info() const { return m_info; }
private:
- void* const m_unsp_info;
+ void* const m_info;
};
+} // namespace fpdfapi
+
class CPDF_ModuleMgr {
public:
static CPDF_ModuleMgr* Get();
@@ -39,10 +42,10 @@
void Init();
void SetUnsupportInfoAdapter(
- std::unique_ptr<CFSDK_UnsupportInfo_Adapter> pAdapter) {
+ std::unique_ptr<fpdfapi::UnsupportedInfoAdapter> pAdapter) {
m_pUnsupportInfoAdapter = std::move(pAdapter);
}
- CFSDK_UnsupportInfo_Adapter* GetUnsupportInfoAdapter() const {
+ fpdfapi::UnsupportedInfoAdapter* GetUnsupportInfoAdapter() const {
return m_pUnsupportInfoAdapter.get();
}
@@ -71,7 +74,7 @@
std::unique_ptr<CCodec_ModuleMgr> m_pCodecModule;
std::unique_ptr<CPDF_PageModule> m_pPageModule;
- std::unique_ptr<CFSDK_UnsupportInfo_Adapter> m_pUnsupportInfoAdapter;
+ std::unique_ptr<fpdfapi::UnsupportedInfoAdapter> m_pUnsupportInfoAdapter;
};
#endif // CORE_FPDFAPI_CPDF_MODULEMGR_H_
diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp
index f61f498..ed6513b 100644
--- a/fpdfsdk/cpdfsdk_helpers.cpp
+++ b/fpdfsdk/cpdfsdk_helpers.cpp
@@ -35,13 +35,12 @@
int g_last_error;
#endif // _WIN32
-bool RaiseUnSupportError(int nError) {
- CFSDK_UnsupportInfo_Adapter* pAdapter =
- CPDF_ModuleMgr::Get()->GetUnsupportInfoAdapter();
+bool RaiseUnsupportedError(int nError) {
+ auto* pAdapter = CPDF_ModuleMgr::Get()->GetUnsupportInfoAdapter();
if (!pAdapter)
return false;
- UNSUPPORT_INFO* info = static_cast<UNSUPPORT_INFO*>(pAdapter->GetUnspInfo());
+ UNSUPPORT_INFO* info = static_cast<UNSUPPORT_INFO*>(pAdapter->info());
if (info && info->FSDK_UnSupport_Handler)
info->FSDK_UnSupport_Handler(info, nError);
return true;
@@ -305,13 +304,13 @@
if (pRootDict) {
// Portfolios and Packages
if (pRootDict->KeyExist("Collection")) {
- RaiseUnSupportError(FPDF_UNSP_DOC_PORTABLECOLLECTION);
+ RaiseUnsupportedError(FPDF_UNSP_DOC_PORTABLECOLLECTION);
return;
}
if (pRootDict->KeyExist("Names")) {
const CPDF_Dictionary* pNameDict = pRootDict->GetDictFor("Names");
if (pNameDict && pNameDict->KeyExist("EmbeddedFiles")) {
- RaiseUnSupportError(FPDF_UNSP_DOC_ATTACHMENT);
+ RaiseUnsupportedError(FPDF_UNSP_DOC_ATTACHMENT);
return;
}
if (pNameDict && pNameDict->KeyExist("JavaScript")) {
@@ -322,7 +321,7 @@
for (size_t i = 0; i < pArray->size(); i++) {
ByteString cbStr = pArray->GetStringAt(i);
if (cbStr.Compare("com.adobe.acrobat.SharedReview.Register") == 0) {
- RaiseUnSupportError(FPDF_UNSP_DOC_SHAREDREVIEW);
+ RaiseUnsupportedError(FPDF_UNSP_DOC_SHAREDREVIEW);
return;
}
}
@@ -335,44 +334,44 @@
if (pStream) {
CPDF_Metadata metaData(pStream);
for (const auto& err : metaData.CheckForSharedForm())
- RaiseUnSupportError(static_cast<int>(err));
+ RaiseUnsupportedError(static_cast<int>(err));
}
}
// XFA Forms
if (!pDoc->GetExtension() && CPDF_InteractiveForm(pDoc).HasXFAForm())
- RaiseUnSupportError(FPDF_UNSP_DOC_XFAFORM);
+ RaiseUnsupportedError(FPDF_UNSP_DOC_XFAFORM);
}
void CheckForUnsupportedAnnot(const CPDF_Annot* pAnnot) {
switch (pAnnot->GetSubtype()) {
case CPDF_Annot::Subtype::FILEATTACHMENT:
- RaiseUnSupportError(FPDF_UNSP_ANNOT_ATTACHMENT);
+ RaiseUnsupportedError(FPDF_UNSP_ANNOT_ATTACHMENT);
break;
case CPDF_Annot::Subtype::MOVIE:
- RaiseUnSupportError(FPDF_UNSP_ANNOT_MOVIE);
+ RaiseUnsupportedError(FPDF_UNSP_ANNOT_MOVIE);
break;
case CPDF_Annot::Subtype::RICHMEDIA:
- RaiseUnSupportError(FPDF_UNSP_ANNOT_SCREEN_RICHMEDIA);
+ RaiseUnsupportedError(FPDF_UNSP_ANNOT_SCREEN_RICHMEDIA);
break;
case CPDF_Annot::Subtype::SCREEN: {
const CPDF_Dictionary* pAnnotDict = pAnnot->GetAnnotDict();
ByteString cbString = pAnnotDict->GetStringFor("IT");
if (cbString != "Img")
- RaiseUnSupportError(FPDF_UNSP_ANNOT_SCREEN_MEDIA);
+ RaiseUnsupportedError(FPDF_UNSP_ANNOT_SCREEN_MEDIA);
break;
}
case CPDF_Annot::Subtype::SOUND:
- RaiseUnSupportError(FPDF_UNSP_ANNOT_SOUND);
+ RaiseUnsupportedError(FPDF_UNSP_ANNOT_SOUND);
break;
case CPDF_Annot::Subtype::THREED:
- RaiseUnSupportError(FPDF_UNSP_ANNOT_3DANNOT);
+ RaiseUnsupportedError(FPDF_UNSP_ANNOT_3DANNOT);
break;
case CPDF_Annot::Subtype::WIDGET: {
const CPDF_Dictionary* pAnnotDict = pAnnot->GetAnnotDict();
ByteString cbString = pAnnotDict->GetStringFor(pdfium::form_fields::kFT);
if (cbString == pdfium::form_fields::kSig)
- RaiseUnSupportError(FPDF_UNSP_ANNOT_SIG);
+ RaiseUnsupportedError(FPDF_UNSP_ANNOT_SIG);
break;
}
default:
diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp
index 9f7b24b..e757481 100644
--- a/fpdfsdk/fpdf_ext.cpp
+++ b/fpdfsdk/fpdf_ext.cpp
@@ -75,7 +75,7 @@
return false;
CPDF_ModuleMgr::Get()->SetUnsupportInfoAdapter(
- pdfium::MakeUnique<CFSDK_UnsupportInfo_Adapter>(unsp_info));
+ pdfium::MakeUnique<fpdfapi::UnsupportedInfoAdapter>(unsp_info));
return true;
}
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 5551edc..ff03a32 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -634,18 +634,18 @@
UnloadPage(page);
}
-class UnSupRecordDelegate final : public EmbedderTest::Delegate {
+class RecordUnsupportedErrorDelegate final : public EmbedderTest::Delegate {
public:
- UnSupRecordDelegate() : type_(-1) {}
- ~UnSupRecordDelegate() override {}
+ RecordUnsupportedErrorDelegate() = default;
+ ~RecordUnsupportedErrorDelegate() override = default;
void UnsupportedHandler(int type) override { type_ = type; }
- int type_;
+ int type_ = -1;
};
TEST_F(FPDFViewEmbedderTest, UnSupportedOperations_NotFound) {
- UnSupRecordDelegate delegate;
+ RecordUnsupportedErrorDelegate delegate;
SetDelegate(&delegate);
ASSERT_TRUE(OpenDocument("hello_world.pdf"));
EXPECT_EQ(delegate.type_, -1);
@@ -653,7 +653,7 @@
}
TEST_F(FPDFViewEmbedderTest, UnSupportedOperations_LoadCustomDocument) {
- UnSupRecordDelegate delegate;
+ RecordUnsupportedErrorDelegate delegate;
SetDelegate(&delegate);
ASSERT_TRUE(OpenDocument("unsupported_feature.pdf"));
EXPECT_EQ(FPDF_UNSP_DOC_PORTABLECOLLECTION, delegate.type_);
@@ -665,7 +665,7 @@
ASSERT_TRUE(
PathService::GetTestFilePath("unsupported_feature.pdf", &file_path));
- UnSupRecordDelegate delegate;
+ RecordUnsupportedErrorDelegate delegate;
SetDelegate(&delegate);
FPDF_DOCUMENT doc = FPDF_LoadDocument(file_path.c_str(), "");
EXPECT_TRUE(doc != nullptr);
