Remove |page| parameter in FPDFAnnot_GetFormFieldFlags(). It is not actually used for anything. Change-Id: I39f23508fd14be6e902e01fb5cf35045892d1b4d Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/57930 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp index 1274b4a..7877695 100644 --- a/fpdfsdk/fpdf_annot.cpp +++ b/fpdfsdk/fpdf_annot.cpp
@@ -841,17 +841,11 @@ } FPDF_EXPORT int FPDF_CALLCONV -FPDFAnnot_GetFormFieldFlags(FPDF_FORMHANDLE hHandle, - FPDF_PAGE page, - FPDF_ANNOTATION annot) { +FPDFAnnot_GetFormFieldFlags(FPDF_FORMHANDLE hHandle, FPDF_ANNOTATION annot) { CPDFSDK_InteractiveForm* pForm = FormHandleToInteractiveForm(hHandle); if (!pForm) return FPDF_FORMFLAG_NONE; - CPDF_Page* pPage = CPDFPageFromFPDFPage(page); - if (!pPage) - return FPDF_FORMFLAG_NONE; - CPDF_Dictionary* pAnnotDict = GetAnnotDictFromFPDFAnnotation(annot); if (!pAnnotDict) return FPDF_FORMFLAG_NONE;
diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp index aaf3657..625a4b0 100644 --- a/fpdfsdk/fpdf_annot_embeddertest.cpp +++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -1427,7 +1427,7 @@ ASSERT_TRUE(annot); // Check that the flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_FALSE(flags & FPDF_FORMFLAG_READONLY); } @@ -1437,7 +1437,7 @@ ASSERT_TRUE(annot); // Check that the flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_TRUE(flags & FPDF_FORMFLAG_READONLY); } @@ -1456,7 +1456,7 @@ ASSERT_TRUE(annot); // Check that the flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_FALSE(flags & FPDF_FORMFLAG_READONLY); EXPECT_TRUE(flags & FPDF_FORMFLAG_CHOICE_COMBO); EXPECT_TRUE(flags & FPDF_FORMFLAG_CHOICE_EDIT); @@ -1468,7 +1468,7 @@ ASSERT_TRUE(annot); // Check that the flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_FALSE(flags & FPDF_FORMFLAG_READONLY); EXPECT_TRUE(flags & FPDF_FORMFLAG_CHOICE_COMBO); EXPECT_FALSE(flags & FPDF_FORMFLAG_CHOICE_EDIT); @@ -1480,7 +1480,7 @@ ASSERT_TRUE(annot); // Check that the flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_TRUE(flags & FPDF_FORMFLAG_READONLY); EXPECT_TRUE(flags & FPDF_FORMFLAG_CHOICE_COMBO); EXPECT_FALSE(flags & FPDF_FORMFLAG_CHOICE_EDIT); @@ -1526,7 +1526,7 @@ ASSERT_TRUE(annot); // Check that interactive form annotation flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_FALSE(flags & FPDF_FORMFLAG_READONLY); } @@ -1537,7 +1537,7 @@ ASSERT_TRUE(annot); // Check that interactive form annotation flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_TRUE(flags & FPDF_FORMFLAG_READONLY); } @@ -1557,7 +1557,7 @@ ASSERT_TRUE(annot); // Check that interactive form annotation flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_FALSE(flags & FPDF_FORMFLAG_READONLY); EXPECT_TRUE(flags & FPDF_FORMFLAG_CHOICE_COMBO); EXPECT_TRUE(flags & FPDF_FORMFLAG_CHOICE_EDIT); @@ -1570,7 +1570,7 @@ ASSERT_TRUE(annot); // Check that interactive form annotation flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_FALSE(flags & FPDF_FORMFLAG_READONLY); EXPECT_TRUE(flags & FPDF_FORMFLAG_CHOICE_COMBO); EXPECT_FALSE(flags & FPDF_FORMFLAG_CHOICE_EDIT); @@ -1583,7 +1583,7 @@ ASSERT_TRUE(annot); // Check that interactive form annotation flag values are as expected. - int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), page, annot.get()); + int flags = FPDFAnnot_GetFormFieldFlags(form_handle(), annot.get()); EXPECT_TRUE(flags & FPDF_FORMFLAG_READONLY); EXPECT_TRUE(flags & FPDF_FORMFLAG_CHOICE_COMBO); EXPECT_FALSE(flags & FPDF_FORMFLAG_CHOICE_EDIT);
diff --git a/public/fpdf_annot.h b/public/fpdf_annot.h index e6e7765..411efae 100644 --- a/public/fpdf_annot.h +++ b/public/fpdf_annot.h
@@ -519,18 +519,15 @@ int flags); // Experimental API. -// Get the annotation flags of |annot|, which is an interactive form -// annotation in |page|. +// Get the annotation flags of |annot|. // // hHandle - handle to the form fill module, returned by // FPDFDOC_InitFormFillEnvironment(). -// page - handle to a page. // annot - handle to an interactive form annotation. // // Returns the annotation flags specific to interactive forms. FPDF_EXPORT int FPDF_CALLCONV FPDFAnnot_GetFormFieldFlags(FPDF_FORMHANDLE handle, - FPDF_PAGE page, FPDF_ANNOTATION annot); // Experimental API.