commit 362a124809853480e16268da968c1bb1625a38af
author Lei Zhang <thestig@chromium.org> Mon Jun 07 19:50:08 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jun 07 19:50:08 2021 +0000
tree b705a437c0ab830eeb7903a00078139025138336
parent f267f5acee65b3c7aa00e3b6a474729da1d75b60

Remove dead code in CJS_Field::get_{fill,stroke}_color().

All the possible color types have been handled, so the else case is
unreachable.

Change-Id: I294e626db514948b1c8e9288bd081ba74e020015
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/81511
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

fxjs/cjs_field.cpp

diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp
index d0bfc76..1e73aa8 100644
--- a/fxjs/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -1293,25 +1293,27 @@
     return CJS_Result::Failure(JSMessage::kBadObjectError);
 
   CFX_Color color;
-  CFX_Color::Type iColorType = pFormControl->GetBackgroundColor().color_type;
-  if (iColorType == CFX_Color::Type::kTransparent) {
-    color = CFX_Color(CFX_Color::Type::kTransparent);
-  } else if (iColorType == CFX_Color::Type::kGray) {
-    color = CFX_Color(CFX_Color::Type::kGray,
-                      pFormControl->GetOriginalBackgroundColorComponent(0));
-  } else if (iColorType == CFX_Color::Type::kRGB) {
-    color = CFX_Color(CFX_Color::Type::kRGB,
-                      pFormControl->GetOriginalBackgroundColorComponent(0),
-                      pFormControl->GetOriginalBackgroundColorComponent(1),
-                      pFormControl->GetOriginalBackgroundColorComponent(2));
-  } else if (iColorType == CFX_Color::Type::kCMYK) {
-    color = CFX_Color(CFX_Color::Type::kCMYK,
-                      pFormControl->GetOriginalBackgroundColorComponent(0),
-                      pFormControl->GetOriginalBackgroundColorComponent(1),
-                      pFormControl->GetOriginalBackgroundColorComponent(2),
-                      pFormControl->GetOriginalBackgroundColorComponent(3));
-  } else {
-    return CJS_Result::Failure(JSMessage::kValueError);
+  switch (pFormControl->GetBackgroundColor().color_type) {
+    case CFX_Color::Type::kTransparent:
+      color = CFX_Color(CFX_Color::Type::kTransparent);
+      break;
+    case CFX_Color::Type::kGray:
+      color = CFX_Color(CFX_Color::Type::kGray,
+                        pFormControl->GetOriginalBackgroundColorComponent(0));
+      break;
+    case CFX_Color::Type::kRGB:
+      color = CFX_Color(CFX_Color::Type::kRGB,
+                        pFormControl->GetOriginalBackgroundColorComponent(0),
+                        pFormControl->GetOriginalBackgroundColorComponent(1),
+                        pFormControl->GetOriginalBackgroundColorComponent(2));
+      break;
+    case CFX_Color::Type::kCMYK:
+      color = CFX_Color(CFX_Color::Type::kCMYK,
+                        pFormControl->GetOriginalBackgroundColorComponent(0),
+                        pFormControl->GetOriginalBackgroundColorComponent(1),
+                        pFormControl->GetOriginalBackgroundColorComponent(2),
+                        pFormControl->GetOriginalBackgroundColorComponent(3));
+      break;
   }
 
   v8::Local<v8::Value> array =
@@ -1830,25 +1832,27 @@
     return CJS_Result::Failure(JSMessage::kBadObjectError);
 
   CFX_Color color;
-  CFX_Color::Type iColorType = pFormControl->GetBorderColorARGB().color_type;
-  if (iColorType == CFX_Color::Type::kTransparent) {
-    color = CFX_Color(CFX_Color::Type::kTransparent);
-  } else if (iColorType == CFX_Color::Type::kGray) {
-    color = CFX_Color(CFX_Color::Type::kGray,
-                      pFormControl->GetOriginalBorderColorComponent(0));
-  } else if (iColorType == CFX_Color::Type::kRGB) {
-    color = CFX_Color(CFX_Color::Type::kRGB,
-                      pFormControl->GetOriginalBorderColorComponent(0),
-                      pFormControl->GetOriginalBorderColorComponent(1),
-                      pFormControl->GetOriginalBorderColorComponent(2));
-  } else if (iColorType == CFX_Color::Type::kCMYK) {
-    color = CFX_Color(CFX_Color::Type::kCMYK,
-                      pFormControl->GetOriginalBorderColorComponent(0),
-                      pFormControl->GetOriginalBorderColorComponent(1),
-                      pFormControl->GetOriginalBorderColorComponent(2),
-                      pFormControl->GetOriginalBorderColorComponent(3));
-  } else {
-    return CJS_Result::Failure(JSMessage::kObjectTypeError);
+  switch (pFormControl->GetBorderColorARGB().color_type) {
+    case CFX_Color::Type::kTransparent:
+      color = CFX_Color(CFX_Color::Type::kTransparent);
+      break;
+    case CFX_Color::Type::kGray:
+      color = CFX_Color(CFX_Color::Type::kGray,
+                        pFormControl->GetOriginalBorderColorComponent(0));
+      break;
+    case CFX_Color::Type::kRGB:
+      color = CFX_Color(CFX_Color::Type::kRGB,
+                        pFormControl->GetOriginalBorderColorComponent(0),
+                        pFormControl->GetOriginalBorderColorComponent(1),
+                        pFormControl->GetOriginalBorderColorComponent(2));
+      break;
+    case CFX_Color::Type::kCMYK:
+      color = CFX_Color(CFX_Color::Type::kCMYK,
+                        pFormControl->GetOriginalBorderColorComponent(0),
+                        pFormControl->GetOriginalBorderColorComponent(1),
+                        pFormControl->GetOriginalBorderColorComponent(2),
+                        pFormControl->GetOriginalBorderColorComponent(3));
+      break;
   }
 
   v8::Local<v8::Value> array =