commit aed62531a9b08deb236cc423dc27dbe0810d6d1a
author Henrique Nakashima <hnakashima@chromium.org> Tue Apr 17 20:34:38 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Apr 17 20:34:38 2018 +0000
tree 6a46e06d0fdf97341c2282a30852b0d394a405ff
parent 884b33e78f8f12e143a0ebef725cb6a4b784ce43

Create new FPDFPageObjMark_CountParams() API.

Bug: pdfium:1037
Change-Id: I1b7035eb199f9dd1d730b0b1112aa455f0fabcc2
Reviewed-on: https://pdfium-review.googlesource.com/30870
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>

fpdfsdk/fpdf_edit_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index 8019155..8f54bf8 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -468,11 +468,14 @@
           GetPlatformWString(reinterpret_cast<unsigned short*>(buffer));
       if (name == L"Prime") {
         prime_count++;
+        EXPECT_EQ(0, FPDFPageObjMark_CountParams(mark));
         primes.push_back(page_object);
       } else if (name == L"Square") {
         square_count++;
+        EXPECT_EQ(1, FPDFPageObjMark_CountParams(mark));
       } else if (name == L"GreaterThanTen") {
         greater_than_ten_count++;
+        EXPECT_EQ(0, FPDFPageObjMark_CountParams(mark));
       } else {
         FAIL();
       }

fpdfsdk/fpdf_editpage.cpp

diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
index 20d8894..7a8bbabf2 100644
--- a/fpdfsdk/fpdf_editpage.cpp
+++ b/fpdfsdk/fpdf_editpage.cpp
@@ -269,6 +269,21 @@
       buflen);
 }
 
+FPDF_EXPORT int FPDF_CALLCONV
+FPDFPageObjMark_CountParams(FPDF_PAGEOBJECTMARK mark) {
+  if (!mark)
+    return -1;
+
+  const CPDF_ContentMarkItem* pMarkItem =
+      CPDFContentMarkItemFromFPDFPageObjectMark(mark);
+
+  const CPDF_Dictionary* pParams = pMarkItem->GetParam();
+  if (!pParams)
+    return 0;
+
+  return pParams->GetCount();
+}
+
 FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
 FPDFPageObj_HasTransparency(FPDF_PAGEOBJECT pageObject) {
   if (!pageObject)

fpdfsdk/fpdf_view_c_api_test.c

diff --git a/fpdfsdk/fpdf_view_c_api_test.c b/fpdfsdk/fpdf_view_c_api_test.c
index 114693c..e23efa2 100644
--- a/fpdfsdk/fpdf_view_c_api_test.c
+++ b/fpdfsdk/fpdf_view_c_api_test.c
@@ -148,6 +148,7 @@
     CHK(FPDFPageObj_CountMarks);
     CHK(FPDFPageObj_GetMark);
     CHK(FPDFPageObjMark_GetName);
+    CHK(FPDFPageObjMark_CountParams);
     CHK(FPDFImageObj_LoadJpegFile);
     CHK(FPDFImageObj_LoadJpegFileInline);
     CHK(FPDFImageObj_SetMatrix);