commit 46ab5abf23910983663b3daeb6dc2f6a98ee24a8
author Tom Sepez <tsepez@chromium.org> Tue Oct 09 23:15:56 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Oct 09 23:15:56 2018 +0000
tree 0f9a78a0e8357bfd00c8f3183824ddcbf10612d2
parent bf2d7b7588c744183d0ee845b173e52f0fbda220

Remove some string comparisons in CPDF_Action.

We have a string to enum tokenizer. Use it.
Re-order .cpp to match .h in one place.

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

core/fpdfdoc/cpdf_action.cpp

diff --git a/core/fpdfdoc/cpdf_action.cpp b/core/fpdfdoc/cpdf_action.cpp
index 6238b05..6e9e9f7 100644
--- a/core/fpdfdoc/cpdf_action.cpp
+++ b/core/fpdfdoc/cpdf_action.cpp
@@ -27,28 +27,7 @@
 
 CPDF_Action::CPDF_Action(const CPDF_Action& that) = default;
 
-CPDF_Action::~CPDF_Action() {}
-
-CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const {
-  if (!m_pDict)
-    return CPDF_Dest();
-
-  ByteString type = m_pDict->GetStringFor("S");
-  if (type != "GoTo" && type != "GoToR")
-    return CPDF_Dest();
-
-  const CPDF_Object* pDest = m_pDict->GetDirectObjectFor("D");
-  if (!pDest)
-    return CPDF_Dest();
-  if (pDest->IsString() || pDest->IsName()) {
-    CPDF_NameTree name_tree(pDoc, "Dests");
-    return CPDF_Dest(name_tree.LookupNamedDest(pDoc, pDest->GetUnicodeText()));
-  }
-  if (const CPDF_Array* pArray = pDest->AsArray())
-    return CPDF_Dest(pArray);
-
-  return CPDF_Dest();
-}
+CPDF_Action::~CPDF_Action() = default;
 
 CPDF_Action::ActionType CPDF_Action::GetType() const {
   if (!m_pDict)
@@ -65,10 +44,28 @@
   return Unknown;
 }
 
+CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const {
+  ActionType type = GetType();
+  if (type != GoTo && type != GoToR)
+    return CPDF_Dest();
+
+  const CPDF_Object* pDest = m_pDict->GetDirectObjectFor("D");
+  if (!pDest)
+    return CPDF_Dest();
+  if (pDest->IsString() || pDest->IsName()) {
+    CPDF_NameTree name_tree(pDoc, "Dests");
+    return CPDF_Dest(name_tree.LookupNamedDest(pDoc, pDest->GetUnicodeText()));
+  }
+  if (const CPDF_Array* pArray = pDest->AsArray())
+    return CPDF_Dest(pArray);
+
+  return CPDF_Dest();
+}
+
 WideString CPDF_Action::GetFilePath() const {
-  ByteString type = m_pDict->GetStringFor("S");
-  if (type != "GoToR" && type != "Launch" && type != "SubmitForm" &&
-      type != "ImportData") {
+  ActionType type = GetType();
+  if (type != GoToR && type != Launch && type != SubmitForm &&
+      type != ImportData) {
     return WideString();
   }
 
@@ -76,24 +73,23 @@
   if (pFile)
     return CPDF_FileSpec(pFile).GetFileName();
 
-  if (type == "Launch") {
-    const CPDF_Dictionary* pWinDict = m_pDict->GetDictFor("Win");
-    if (pWinDict) {
-      return WideString::FromLocal(
-          pWinDict->GetStringFor(pdfium::stream::kF).AsStringView());
-    }
-  }
-  return WideString();
+  if (type != Launch)
+    return WideString();
+
+  const CPDF_Dictionary* pWinDict = m_pDict->GetDictFor("Win");
+  if (!pWinDict)
+    return WideString();
+
+  return WideString::FromLocal(
+      pWinDict->GetStringFor(pdfium::stream::kF).AsStringView());
 }
 
 ByteString CPDF_Action::GetURI(const CPDF_Document* pDoc) const {
-  ByteString csURI;
-  if (!m_pDict)
-    return csURI;
-  if (m_pDict->GetStringFor("S") != "URI")
-    return csURI;
+  ActionType type = GetType();
+  if (type != URI)
+    return ByteString();
 
-  csURI = m_pDict->GetStringFor("URI");
+  ByteString csURI = m_pDict->GetStringFor("URI");
   const CPDF_Dictionary* pRoot = pDoc->GetRoot();
   const CPDF_Dictionary* pURI = pRoot->GetDictFor("URI");
   if (pURI) {