Fix and enable lint checks.

This CL fixes and enables:
  * readability/namespace
  * readability/multiline_string
  * readability/multiline_comment
  * readability/inheritance
  * readability/function
  * readability/braces

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1747123002 .

23 files changed, 59 insertions, 52 deletions

diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h
index 5a21176241..793eb16fb8 100644
--- a/xfa/include/fwl/lightwidget/picturebox.h
+++ b/xfa/include/fwl/lightwidget/picturebox.h
@@ -40,7 +40,7 @@ class CFWL_PictureBox : public CFWL_Widget {
       m_fOffSetX = 0.0f;
       m_fOffSetY = 0.0f;
       m_pBitmap = NULL;
-    };
+    }
     virtual FWL_ERR GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption);
     virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget);
     virtual CFX_DIBitmap* GetErrorPicture(IFWL_Widget* pWidget);
diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fdp/src/css/fde_cssdatatable.h
index df396228fc..2502ed7fe5 100644
--- a/xfa/src/fdp/src/css/fde_cssdatatable.h
+++ b/xfa/src/fdp/src/css/fde_cssdatatable.h
@@ -21,7 +21,7 @@ class CFDE_CSSFunction : public CFX_Target {
   IFDE_CSSValue* GetArgs(int32_t index) const {
     return m_pArgList->GetValue(index);
   }
-  const FX_WCHAR* GetFuncName() const { return m_pszFuncName; };
+  const FX_WCHAR* GetFuncName() const { return m_pszFuncName; }
 
  protected:
   IFDE_CSSValueList* m_pArgList;
diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
index 4eea30c150..73d0921b15 100644
--- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
+++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp
@@ -932,11 +932,12 @@ FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty(
         }
         const FDE_CSSCOLORTABLE* pColorItem =
             FDE_GetCSSColorByName(pszValue, iValueLen);
-        if (pColorItem != NULL)
+        if (pColorItem != NULL) {
           if (pColor == NULL) {
             pColor = FXTARGET_NewWith(pStaticStore)
                 CFDE_CSSPrimitiveValue(pColorItem->dwValue);
           }
+        }
       } break;
       case FDE_CSSPRIMITIVETYPE_RGB:
         if (pColor == NULL) {
diff --git a/xfa/src/fdp/src/fde/fde_object.h b/xfa/src/fdp/src/fde/fde_object.h
index 222968c357..4e90ed2aa6 100644
--- a/xfa/src/fdp/src/fde/fde_object.h
+++ b/xfa/src/fdp/src/fde/fde_object.h
@@ -143,7 +143,7 @@ class CFDE_HatchBrush : public IFDE_HatchBrush, public CFX_Target {
     }
   }
 
-  virtual int32_t GetHatchStyle() const { return m_iStyle; };
+  virtual int32_t GetHatchStyle() const { return m_iStyle; }
   virtual FX_BOOL SetHatchStyle(int32_t iHatchStyle) {
     m_iStyle = iHatchStyle;
     return m_iStyle >= FDE_HATCHSTYLE_Min && m_iStyle <= FDE_HATCHSTYLE_Max;
diff --git a/xfa/src/fgas/src/font/fx_gefont.h b/xfa/src/fgas/src/font/fx_gefont.h
index 8fb207d588..ef7803d2a5 100644
--- a/xfa/src/fgas/src/font/fx_gefont.h
+++ b/xfa/src/fgas/src/font/fx_gefont.h
@@ -52,7 +52,7 @@ class CFX_GEFont : public IFX_Font {
   virtual void SetLogicalFontStyle(FX_DWORD dwLogFontStyle) {
     m_bUseLogFontStyle = TRUE;
     m_dwLogFontStyle = dwLogFontStyle;
-  };
+  }
 #endif
 
  protected:
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
index 6ad4918203..8ec8fc51fe 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
@@ -66,11 +66,12 @@ IFX_Font* CFX_StdFontMgrImp::GetDefFontByCodePage(
     return pFont ? LoadFont(pFont, dwFontStyles, wCodePage) : NULL;
   }
   FX_LPCFONTDESCRIPTOR pFD;
-  if ((pFD = FindFont(pszFontFamily, dwFontStyles, TRUE, wCodePage)) == NULL)
-    if ((pFD = FindFont(NULL, dwFontStyles, TRUE, wCodePage)) == NULL)
-      if ((pFD = FindFont(NULL, dwFontStyles, FALSE, wCodePage)) == NULL) {
+  if ((pFD = FindFont(pszFontFamily, dwFontStyles, TRUE, wCodePage)) == NULL) {
+    if ((pFD = FindFont(NULL, dwFontStyles, TRUE, wCodePage)) == NULL) {
+      if ((pFD = FindFont(NULL, dwFontStyles, FALSE, wCodePage)) == NULL)
         return NULL;
-      }
+    }
+  }
   FXSYS_assert(pFD != NULL);
   pFont = IFX_Font::LoadFont(pFD->wsFontFace, dwFontStyles, wCodePage, this);
   if (pFont != NULL) {
@@ -146,11 +147,12 @@ IFX_Font* CFX_StdFontMgrImp::LoadFont(const FX_WCHAR* pszFontFamily,
     return pFont ? LoadFont(pFont, dwFontStyles, wCodePage) : NULL;
   }
   FX_LPCFONTDESCRIPTOR pFD = NULL;
-  if ((pFD = FindFont(pszFontFamily, dwFontStyles, TRUE, wCodePage)) == NULL)
+  if ((pFD = FindFont(pszFontFamily, dwFontStyles, TRUE, wCodePage)) == NULL) {
     if ((pFD = FindFont(pszFontFamily, dwFontStyles, FALSE, wCodePage)) ==
         NULL) {
       return NULL;
     }
+  }
   FXSYS_assert(pFD != NULL);
   if (wCodePage == 0xFFFF) {
     wCodePage = FX_GetCodePageFromCharset(pFD->uCharSet);
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h
index 1314d2f465..d1cc095805 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.h
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h
@@ -106,15 +106,16 @@ struct FX_FontDescriptorInfo {
  public:
   CFX_FontDescriptor* pFont;
   int32_t nPenalty;
-  bool operator>(const FX_FontDescriptorInfo& x) {
-    return nPenalty > x.nPenalty;
-  };
-  bool operator<(const FX_FontDescriptorInfo& x) {
-    return nPenalty < x.nPenalty;
-  };
-  bool operator==(const FX_FontDescriptorInfo& x) {
-    return nPenalty == x.nPenalty;
-  };
+
+  bool operator>(const FX_FontDescriptorInfo& other) const {
+    return nPenalty > other.nPenalty;
+  }
+  bool operator<(const FX_FontDescriptorInfo& other) const {
+    return nPenalty < other.nPenalty;
+  }
+  bool operator==(const FX_FontDescriptorInfo& other) const {
+    return nPenalty == other.nPenalty;
+  }
 };
 typedef CFX_ArrayTemplate<FX_FontDescriptorInfo> CFX_FontDescriptorInfos;
 
@@ -131,7 +132,7 @@ struct FX_HandleParentPath {
 class CFX_FontSourceEnum_File : public IFX_FontSourceEnum {
  public:
   CFX_FontSourceEnum_File();
-  virtual void Release() { delete this; };
+  virtual void Release() { delete this; }
   virtual FX_POSITION GetStartPosition(void* pUserData = NULL);
   virtual IFX_FileAccess* GetNext(FX_POSITION& pos, void* pUserData = NULL);
 
diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp
index 4b17615e07..b1f9d5e9ae 100644
--- a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp
+++ b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp
@@ -531,11 +531,12 @@ FX_DWORD CFX_RTFBreak::AppendChar_Arabic(CFX_RTFChar* pCurChar,
       if (m_bVertical != FX_IsOdd(iLastRotation)) {
         iCharWidth = 1000;
       } else {
-        if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode))
+        if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode)) {
           if (!m_pFont->GetCharWidth(pLastChar->m_wCharCode, iCharWidth,
                                      m_bCharCode)) {
             iCharWidth = m_iDefChar;
           }
+        }
       }
       iCharWidth *= m_iFontSize;
       iCharWidth = iCharWidth * m_iHorizontalScale / 100;
@@ -548,13 +549,12 @@ FX_DWORD CFX_RTFBreak::AppendChar_Arabic(CFX_RTFChar* pCurChar,
       m_pArabicChar->GetFormChar(pCurChar, (bAlef ? NULL : pLastChar), NULL);
   if (m_bVertical != FX_IsOdd(iRotation)) {
     iCharWidth = 1000;
-  } else {
-    if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode))
-      if (!m_pFont->GetCharWidth(pCurChar->m_wCharCode, iCharWidth,
-                                 m_bCharCode)) {
-        iCharWidth = m_iDefChar;
-      }
+  } else if (!m_pFont->GetCharWidth(wForm, iCharWidth, m_bCharCode) &&
+             !m_pFont->GetCharWidth(pCurChar->m_wCharCode, iCharWidth,
+                                    m_bCharCode)) {
+    iCharWidth = m_iDefChar;
   }
+
   iCharWidth *= m_iFontSize;
   iCharWidth = iCharWidth * m_iHorizontalScale / 100;
   pCurChar->m_iCharWidth = iCharWidth;
diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h
index a54b83bf3d..7aecef7f10 100644
--- a/xfa/src/fgas/src/layout/fx_rtfbreak.h
+++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h
@@ -69,8 +69,8 @@ class CFX_RTFBreak : public IFX_RTFBreak {
   CFX_RTFBreak(FX_DWORD dwPolicies);
   ~CFX_RTFBreak();
   void Release() override { delete this; }
-  void SetLineBoundary(FX_FLOAT fLineStart, FX_FLOAT fLineEnd) override final;
-  void SetLineStartPos(FX_FLOAT fLinePos) override final;
+  void SetLineBoundary(FX_FLOAT fLineStart, FX_FLOAT fLineEnd) override;
+  void SetLineStartPos(FX_FLOAT fLinePos) override;
   FX_DWORD GetLayoutStyles() const override { return m_dwLayoutStyles; }
   void SetLayoutStyles(FX_DWORD dwLayoutStyles) override;
   void SetFont(IFX_Font* pFont) override;
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
index 5fafb98d68..2a33c6e720 100644
--- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
@@ -189,7 +189,7 @@ void CFWL_ComboEditImp::FlagFocus(FX_BOOL bSet) {
     m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
     ShowCaret(FALSE);
   }
-};
+}
 void CFWL_ComboEditImp::SetComboBoxFocus(FX_BOOL bSet) {
   m_pOuter->SetFocus(bSet);
 }
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
index 74c7ef21fe..66852d0815 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
@@ -1996,11 +1996,10 @@ void CFWL_EditImpDelegate::OnKeyDown(CFWL_MsgKey* pMsg) {
     }
     default: {
 #if (_FX_OS_ == _FX_MACOSX_)
-      if (pMsg->m_dwFlags & FWL_KEYFLAG_Command)
+      if (pMsg->m_dwFlags & FWL_KEYFLAG_Command) {
 #else
-      if (pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl)
+      if (pMsg->m_dwFlags & FWL_KEYFLAG_Ctrl) {
 #endif
-      {
         if (dwKeyCode == 0x43 || dwKeyCode == 0x63) {
           m_pOwner->DoClipboard(1);
           return;
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
index 21a11e373d..e80f33ec9a 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h
@@ -45,8 +45,8 @@ class CFWL_ToolTipImp : public CFWL_FormImp {
   void RefreshToolTipPos();
   class CFWL_ToolTipTimer : public IFWL_Timer {
    public:
-    CFWL_ToolTipTimer(){};
-    ~CFWL_ToolTipTimer(){};
+    CFWL_ToolTipTimer() {}
+    ~CFWL_ToolTipTimer() {}
     CFWL_ToolTipTimer(CFWL_ToolTipImp* pToolTip);
     virtual int32_t Run(FWL_HTIMER hTimer);
     CFWL_ToolTipImp* m_pToolTip;
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp
index 329d4c7936..0ddfaf8f25 100644
--- a/xfa/src/fwl/src/core/fwl_noteimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp
@@ -30,9 +30,8 @@ FX_BOOL CFWL_NoteLoop::PreProcessMessage(CFWL_Message* pMessage) {
 }
 FWL_ERR CFWL_NoteLoop::Idle(int32_t count) {
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_)
-  if (count <= 0)
+  if (count <= 0) {
 #endif
-  {
     CFWL_EvtIdle ev;
     IFWL_App* pApp = FWL_GetApp();
     if (!pApp)
@@ -41,7 +40,9 @@ FWL_ERR CFWL_NoteLoop::Idle(int32_t count) {
     if (!pDriver)
       return FWL_ERR_Indefinite;
     pDriver->SendNote(&ev);
+#if (_FX_OS_ == _FX_WIN32_DESKTOP_)
   }
+#endif
   return FWL_ERR_Indefinite;
 }
 CFWL_WidgetImp* CFWL_NoteLoop::GetForm() {
diff --git a/xfa/src/fxbarcode/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp
index d76ec810d6..644ead3294 100644
--- a/xfa/src/fxbarcode/BC_BarCode.cpp
+++ b/xfa/src/fxbarcode/BC_BarCode.cpp
@@ -122,7 +122,7 @@ void CBC_CodeBase::SetBarcodeColor(FX_ARGB foregroundColor) {
     m_pBCWriter->SetBarcodeColor(foregroundColor);
   }
 }
-CBC_OneCode::CBC_OneCode(){};
+CBC_OneCode::CBC_OneCode() {}
 CBC_OneCode::~CBC_OneCode() {}
 FX_BOOL CBC_OneCode::CheckContentValidity(const CFX_WideStringC& contents) {
   if (m_pBCWriter) {
diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.h b/xfa/src/fxbarcode/BC_TwoDimWriter.h
index 4e04c016fe..c46691c619 100644
--- a/xfa/src/fxbarcode/BC_TwoDimWriter.h
+++ b/xfa/src/fxbarcode/BC_TwoDimWriter.h
@@ -24,7 +24,7 @@ class CBC_TwoDimWriter : public CBC_Writer {
   virtual void RenderDeviceResult(CFX_RenderDevice* device,
                                   const CFX_Matrix* matrix);
   virtual FX_BOOL SetErrorCorrectionLevel(int32_t level) = 0;
-  virtual int32_t GetErrorCorrectionLevel() { return m_iCorrectLevel; };
+  virtual int32_t GetErrorCorrectionLevel() { return m_iCorrectLevel; }
 
  protected:
   int32_t m_iCorrectLevel;
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.h b/xfa/src/fxbarcode/oned/BC_OneDimWriter.h
index 4cda681cb4..f8001dc5c7 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.h
@@ -34,7 +34,7 @@ class CBC_OneDimWriter : public CBC_Writer {
                           int32_t& outLength,
                           int32_t& e) {
     return NULL;
-  };
+  }
   virtual void RenderResult(const CFX_WideStringC& contents,
                             uint8_t* code,
                             int32_t codeLength,
@@ -49,7 +49,7 @@ class CBC_OneDimWriter : public CBC_Writer {
                                   int32_t& e);
   virtual FX_BOOL CheckContentValidity(const CFX_WideStringC& contents) {
     return TRUE;
-  };
+  }
   virtual CFX_WideString FilterContents(const CFX_WideStringC& contents) {
     return CFX_WideString();
   }
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h
index 9b4bb7c979..03067ced5a 100644
--- a/xfa/src/fxfa/src/app/xfa_textlayout.h
+++ b/xfa/src/fxfa/src/app/xfa_textlayout.h
@@ -190,7 +190,7 @@ class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target {
   virtual FX_DWORD AddRef() { return ++m_dwRefCount; }
 
  public:
-  const FX_WCHAR* GetLinkURL() { return m_pszURLContent; };
+  const FX_WCHAR* GetLinkURL() { return m_pszURLContent; }
 
  protected:
   IFX_MEMAllocator* m_pAllocator;
diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h
index ebd3a0f00e..47be3165fe 100644
--- a/xfa/src/fxfa/src/common/xfa_script.h
+++ b/xfa/src/fxfa/src/common/xfa_script.h
@@ -38,7 +38,7 @@ enum XFA_RESOVENODE_RSTYPE {
 
 class CXFA_HVALUEArray : public CFX_ArrayTemplate<FXJSE_HVALUE> {
  public:
-  CXFA_HVALUEArray(FXJSE_HRUNTIME hRunTime) : m_hRunTime(hRunTime){};
+  CXFA_HVALUEArray(FXJSE_HRUNTIME hRunTime) : m_hRunTime(hRunTime) {}
   ~CXFA_HVALUEArray() {
     for (int32_t i = 0; i < GetSize(); i++) {
       FXJSE_Value_Release(GetAt(i));
diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/src/fm2js/xfa_error.h
index 41b1942215..474b28b7c9 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_error.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_error.h
@@ -24,8 +24,8 @@ enum XFA_FM_ERRMSG {
 
 class CXFA_FMErrorInfo {
  public:
-  CXFA_FMErrorInfo() : linenum(0){};
-  ~CXFA_FMErrorInfo(){};
+  CXFA_FMErrorInfo() : linenum(0) {}
+  ~CXFA_FMErrorInfo() {}
   FX_DWORD linenum;
   CFX_WideString message;
 };
diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h
index f70ee60e5f..2d2da0cb89 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_expression.h
+++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h
@@ -23,7 +23,7 @@ class CXFA_FMExpression {
  public:
   CXFA_FMExpression(FX_DWORD line);
   CXFA_FMExpression(FX_DWORD line, XFA_FM_EXPTYPE type);
-  virtual ~CXFA_FMExpression(){};
+  virtual ~CXFA_FMExpression() {}
   virtual void ToJavaScript(CFX_WideTextBuf& javascript);
   virtual void ToImpliedReturnJS(CFX_WideTextBuf&);
   FX_DWORD GetLine() { return m_line; }
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
index 381dc92ff8..3d46f85c8c 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
@@ -1676,7 +1676,7 @@ static void XFA_ItemLayoutProcessor_AddTrailerBeforeSplit(
   }
   pProcessor->m_pLayoutItem->m_sSize.y += fHeight;
   pProcessor->m_pLayoutItem->AddChild(pTrailerLayoutItem);
-};
+}
 static void XFA_ItemLayoutProcessor_AddLeaderAfterSplit(
     CXFA_ItemLayoutProcessor* pProcessor,
     CXFA_ContentLayoutItem* pLeaderLayoutItem) {
@@ -1717,7 +1717,7 @@ static void XFA_ItemLayoutProcessor_AddLeaderAfterSplit(
   }
   pProcessor->m_pLayoutItem->m_sSize.y += fHeight;
   pProcessor->m_pLayoutItem->AddChild(pLeaderLayoutItem);
-};
+}
 static void XFA_ItemLayoutProcessor_AddPendingNode(
     CXFA_ItemLayoutProcessor* pProcessor,
     CXFA_Node* pPendingNode,
diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
index 1c5bd758a8..c7a288bb27 100644
--- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
@@ -178,24 +178,27 @@ CXFA_Node* CXFA_Node::GetNodeItem(XFA_NODEITEM eItem,
   switch (eItem) {
     case XFA_NODEITEM_NextSibling:
       pNode = m_pNext;
-      if (eType != XFA_OBJECTTYPEMASK)
+      if (eType != XFA_OBJECTTYPEMASK) {
         while (pNode && pNode->GetObjectType() != eType) {
           pNode = pNode->m_pNext;
         }
+      }
       break;
     case XFA_NODEITEM_FirstChild:
       pNode = m_pChild;
-      if (eType != XFA_OBJECTTYPEMASK)
+      if (eType != XFA_OBJECTTYPEMASK) {
         while (pNode && pNode->GetObjectType() != eType) {
           pNode = pNode->m_pNext;
         }
+      }
       break;
     case XFA_NODEITEM_Parent:
       pNode = m_pParent;
-      if (eType != XFA_OBJECTTYPEMASK)
+      if (eType != XFA_OBJECTTYPEMASK) {
         while (pNode && pNode->GetObjectType() != eType) {
           pNode = pNode->m_pParent;
         }
+      }
       break;
     case XFA_NODEITEM_PrevSibling:
       if (m_pParent) {
diff --git a/xfa/src/fxjse/src/runtime.h b/xfa/src/fxjse/src/runtime.h
index 77a447f442..65b7db06c8 100644
--- a/xfa/src/fxjse/src/runtime.h
+++ b/xfa/src/fxjse/src/runtime.h
@@ -14,7 +14,7 @@ class CFXJSE_RuntimeList;
 
 class CFXJSE_RuntimeData {
  protected:
-  CFXJSE_RuntimeData(v8::Isolate* pIsolate) : m_pIsolate(pIsolate){};
+  CFXJSE_RuntimeData(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}
 
  public:
   static CFXJSE_RuntimeData* Create(v8::Isolate* pIsolate);