Merge to XFA - else after returns.

core/src/fxge/ge/fx_ge_path.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 "../../../../third_party/base/numerics/safe_math.h"
 #include "../../../include/fxcrt/fx_system.h"
 #include "../../../include/fxge/fx_ge.h"
 
@@ skipping 37 matching lines @@
 }
 void CFX_ClipRgn::IntersectMaskRect(FX_RECT rect, FX_RECT mask_rect, CFX_DIBitmapRef Mask)
 {
     const CFX_DIBitmap* mask_dib = Mask;
     m_Type = MaskF;
     m_Box = rect;
     m_Box.Intersect(mask_rect);
     if (m_Box.IsEmpty()) {
         m_Type = RectI;
         return;
-    } else if (m_Box == mask_rect) {
+    }
+    if (m_Box == mask_rect) {
         m_Mask = Mask;
         return;
     }
     CFX_DIBitmap* new_dib = m_Mask.New();
     if (!new_dib) {
         return;
     }
     new_dib->Create(m_Box.Width(), m_Box.Height(), FXDIB_8bppMask);
     for (int row = m_Box.top; row < m_Box.bottom; row ++) {
         uint8_t* dest_scan = new_dib->GetBuffer() + new_dib->GetPitch() * (row - m_Box.top);
@@ skipping 153 matching lines @@
         }
         FX_FLOAT point_y;
         if (end_y < start_y) {
             point_y = end_y - hw;
         } else {
             point_y = end_y + hw;
         }
         rect.UpdateRect(end_x + hw, point_y);
         rect.UpdateRect(end_x - hw, point_y);
         return;
-    } else if (start_y == end_y) {
+    }
+    if (start_y == end_y) {
         FX_FLOAT point_x;
         if (end_x < start_x) {
             point_x = end_x - hw;
         } else {
             point_x = end_x + hw;
         }
         rect.UpdateRect(point_x, end_y + hw);
         rect.UpdateRect(point_x, end_y - hw);
         return;
     }
@@ skipping 377 matching lines @@
     if (m_DashArray) {
         FX_Free(m_DashArray);
     }
     m_DashArray = NULL;
     m_DashCount = count;
     if (count == 0) {
         return;
     }
     m_DashArray = FX_Alloc(FX_FLOAT, count);
 }