Merge to XFA - else after returns.

core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fpdfapi/fpdf_parser.h"
 const char PDF_CharType[256] = {
   //NUL  SOH  STX  ETX  EOT  ENQ  ACK  BEL  BS   HT   LF   VT   FF   CR   SO   SI
     'W', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'W', 'W', 'R', 'W', 'W', 'R', 'R',
@@ skipping 147 matching lines @@
     int type;
     ParseWord(pStart, dwSize, type);
     if (dwSize == 1 && pStart[0] == '<') {
         while (m_dwCurPos < m_dwSize && m_pData[m_dwCurPos] != '>') {
             m_dwCurPos ++;
         }
         if (m_dwCurPos < m_dwSize) {
             m_dwCurPos ++;
         }
         return CFX_ByteStringC(pStart, (FX_STRSIZE)(m_dwCurPos - (pStart - m_pData)));
-    } else if (dwSize == 1 && pStart[0] == '(') {
+    }
+    if (dwSize == 1 && pStart[0] == '(') {
         int level = 1;
         while (m_dwCurPos < m_dwSize) {
             if (m_pData[m_dwCurPos] == ')') {
                 level --;
                 if (level == 0) {
                     break;
                 }
             }
             if (m_pData[m_dwCurPos] == '\\') {
                 if (m_dwSize <= m_dwCurPos) {
@@ skipping 291 matching lines @@
         if (pFound) {
             return pFound;
         }
     }
     return NULL;
 }
 CPDF_Object* CPDF_NumberTree::LookupValue(int num)
 {
     return SearchNumberNode(m_pRoot, num);
 }