commit 956553e715787cfc4dd8423d5e9a04a0131878c3
author jaepark <jaepark@google.com> Wed Aug 31 06:49:27 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 31 06:49:27 2016 -0700
tree 08622d504322d5dae37b5bb5025a90c81ebdee6b
parent 87dffc0315477150c9c1964913b65bc97bdf654f

Use enum class for subtypes of CPDF_Annot.

Comparing CFX_ByteString for annotation subtypes is inefficient and
error-prone. This CL uses enum class to compare annotation subtypes.

Also, remove unused IPDFSDK_AnnotHandler::GetType() and
FSDK_XFAWIDGET_TYPENAME.

Review-Url: https://codereview.chromium.org/2295953002

fpdfsdk/fsdk_baseform_embeddertest.cpp

diff --git a/fpdfsdk/fsdk_baseform_embeddertest.cpp b/fpdfsdk/fsdk_baseform_embeddertest.cpp
index c87073d..53611ae 100644
--- a/fpdfsdk/fsdk_baseform_embeddertest.cpp
+++ b/fpdfsdk/fsdk_baseform_embeddertest.cpp
@@ -42,7 +42,8 @@
       CPDFSDK_Document::FromFPDFFormHandle(form_handle());
   {
     // Page 0 specifies "row order".
-    CBA_AnnotIterator iter(pSDKDoc->GetPageView(0), "Widget");
+    CBA_AnnotIterator iter(pSDKDoc->GetPageView(0),
+                           CPDF_Annot::Subtype::WIDGET);
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), RightTop);
     pAnnot = iter.GetNextAnnot(pAnnot);
@@ -67,7 +68,8 @@
   }
   {
     // Page 1 specifies "column order"
-    CBA_AnnotIterator iter(pSDKDoc->GetPageView(1), "Widget");
+    CBA_AnnotIterator iter(pSDKDoc->GetPageView(1),
+                           CPDF_Annot::Subtype::WIDGET);
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), RightTop);
     pAnnot = iter.GetNextAnnot(pAnnot);
@@ -92,7 +94,8 @@
   }
   {
     // Page 2 specifies "struct order"
-    CBA_AnnotIterator iter(pSDKDoc->GetPageView(2), "Widget");
+    CBA_AnnotIterator iter(pSDKDoc->GetPageView(2),
+                           CPDF_Annot::Subtype::WIDGET);
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), LeftBottom);
     pAnnot = iter.GetNextAnnot(pAnnot);