commit 5e9600bdf7089606d313f40fc1b8b220527d3671
author Lei Zhang <thestig@chromium.org> Thu Feb 13 17:54:59 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Feb 13 17:54:59 2020 +0000
tree 563f1df82965ba8abeab3a8ace6b2cc9edc943c2
parent 2d0e357ddb74625e5cd39738af965ea226e2a6da

Fix regression with CheckStyleFromCaption().

CheckStyleFromCaption() should default to different styles for
check boxes and radio buttons. This regressed in
https://pdfium-review.googlesource.com/66330 which always used the check
style.

Change-Id: I186815e6fb230bc4cf687048d9df20ac0ee37be9
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/66391
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

fpdfsdk/cpdfsdk_appstream.cpp

diff --git a/fpdfsdk/cpdfsdk_appstream.cpp b/fpdfsdk/cpdfsdk_appstream.cpp
index 89b8d19..a0fc3b0 100644
--- a/fpdfsdk/cpdfsdk_appstream.cpp
+++ b/fpdfsdk/cpdfsdk_appstream.cpp
@@ -1115,12 +1115,15 @@
   pImageDict->SetNewFor<CPDF_String>("Name", name, false);
 }
 
-CheckStyle CheckStyleFromCaption(const WideString& wsCaption) {
-  if (wsCaption.IsEmpty())
-    return CheckStyle::kCheck;
+CheckStyle CheckStyleFromCaption(const WideString& caption,
+                                 CheckStyle default_style) {
+  if (caption.IsEmpty())
+    return default_style;
 
   // Character values are ZapfDingbats encodings of named glyphs.
-  switch (wsCaption[0]) {
+  switch (caption[0]) {
+    case L'4':
+      return CheckStyle::kCheck;
     case L'l':
       return CheckStyle::kCircle;
     case L'8':
@@ -1131,9 +1134,8 @@
       return CheckStyle::kSquare;
     case L'H':
       return CheckStyle::kStar;
-    case L'4':
     default:
-      return CheckStyle::kCheck;
+      return default_style;
   }
 }
 
@@ -1379,7 +1381,9 @@
     crText = CFX_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
   }
 
-  CheckStyle nStyle = CheckStyleFromCaption(pControl->GetNormalCaption());
+  CheckStyle nStyle =
+      CheckStyleFromCaption(pControl->GetNormalCaption(),
+                            /*default_style=*/CheckStyle::kCheck);
   ByteString csAP_N_ON =
       GetRectFillAppStream(rcWindow, crBackground) +
       GetBorderAppStreamInternal(rcWindow, fBorderWidth, crBorder, crLeftTop,
@@ -1472,7 +1476,9 @@
     crText = CFX_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
   }
 
-  CheckStyle nStyle = CheckStyleFromCaption(pControl->GetNormalCaption());
+  CheckStyle nStyle =
+      CheckStyleFromCaption(pControl->GetNormalCaption(),
+                            /*default_style=*/CheckStyle::kCircle);
 
   ByteString csAP_N_ON;
   CFX_FloatRect rcCenter = rcWindow.GetCenterSquare().GetDeflated(1.0f, 1.0f);