Merge to XFA - else after returns.

core/src/fpdfdoc/doc_utils.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/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 static const int FPDFDOC_UTILS_MAXRECURSION = 32;
@@ skipping 637 matching lines @@
         return NULL;
     }
     CPDF_DefaultAppearance cDA = pFormDict->GetString("DA");
     CFX_ByteString csFontNameTag;
     FX_FLOAT fFontSize;
     cDA.GetFont(csFontNameTag, fFontSize);
     return GetInterFormFont(pFormDict, pDocument, csFontNameTag);
 }
 CPDF_IconFit::ScaleMethod CPDF_IconFit::GetScaleMethod()
 {
-    if (m_pDict == NULL) {
+    if (!m_pDict) {
         return Always;
     }
     CFX_ByteString csSW = m_pDict->GetString("SW", "A");
     if (csSW == "B") {
         return Bigger;
-    } else if (csSW == "S") {
+    }
+    if (csSW == "S") {
         return Smaller;
-    } else if (csSW == "N") {
+    }
+    if (csSW == "N") {
         return Never;
     }
     return Always;
 }
 FX_BOOL CPDF_IconFit::IsProportionalScale()
 {
     if (m_pDict == NULL) {
         return TRUE;
     }
     return m_pDict->GetString("S", "P") != "A";
@@ skipping 44 matching lines @@
     CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
     if (pAttr) {
         return pAttr;
     }
     CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
     if (pParent == NULL) {
         return NULL;
     }
     return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
 }