Cleanup FWL default values part II.

xfa/fwl/core/cfwl_widget.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 "xfa/fwl/core/cfwl_widget.h"
 
 #include <algorithm>
 #include <utility>
@@ skipping 58 matching lines @@
   if (!bAutoSize) {
     rect = m_pProperties->m_rtWidget;
     return;
   }
 
   if (HasEdge()) {
     FX_FLOAT fEdge = GetEdgeWidth();
     rect.Inflate(fEdge, fEdge);
   }
   if (HasBorder()) {
-    FX_FLOAT fBorder = GetBorderSize();
+    FX_FLOAT fBorder = GetBorderSize(true);
     rect.Inflate(fBorder, fBorder);
   }
 }
 
 void CFWL_Widget::SetWidgetRect(const CFX_RectF& rect) {
   m_pProperties->m_rtWidget = rect;
   if (IsChild())
     return;
 
   m_pWidgetMgr->SetWidgetRect_Native(this, rect);
@@ skipping 220 matching lines @@
 }
 
 bool CFWL_Widget::IsOffscreen() const {
   return !!(m_pProperties->m_dwStyles & FWL_WGTSTYLE_Offscreen);
 }
 
 void CFWL_Widget::GetEdgeRect(CFX_RectF& rtEdge) {
   rtEdge = m_pProperties->m_rtWidget;
   rtEdge.left = rtEdge.top = 0;
   if (HasBorder()) {
-    FX_FLOAT fCX = GetBorderSize();
+    FX_FLOAT fCX = GetBorderSize(true);
     FX_FLOAT fCY = GetBorderSize(false);
     rtEdge.Deflate(fCX, fCY);
   }
 }
 
 FX_FLOAT CFWL_Widget::GetBorderSize(bool bCX) {
   FX_FLOAT* pfBorder = static_cast<FX_FLOAT*>(GetThemeCapacity(
       bCX ? CFWL_WidgetCapacity::CXBorder : CFWL_WidgetCapacity::CYBorder));
   if (!pfBorder)
     return 0;
@@ skipping 61 matching lines @@
   if (!pRet)
     return nullptr;
 
   while (CFWL_Widget* pOuter = pRet->GetOuter())
     pRet = pOuter;
   return pRet;
 }
 
 CFX_SizeF CFWL_Widget::CalcTextSize(const CFX_WideString& wsText,
                                     IFWL_ThemeProvider* pTheme,
-                                    bool bMultiLine,
-                                    int32_t iLineWidth) {
+                                    bool bMultiLine) {
   if (!pTheme)
     return CFX_SizeF();
 
   CFWL_ThemeText calPart;
   calPart.m_pWidget = this;
   calPart.m_wsText = wsText;
   calPart.m_dwTTOStyles =
       bMultiLine ? FDE_TTOSTYLE_LineWrap : FDE_TTOSTYLE_SingleLine;
   calPart.m_iTTOAlign = FDE_TTOALIGNMENT_TopLeft;
   CFX_RectF rect;
-  FX_FLOAT fWidth = bMultiLine
-                        ? (iLineWidth > 0 ? (FX_FLOAT)iLineWidth
-                                          : FWL_WGT_CalcMultiLineDefWidth)
-                        : FWL_WGT_CalcWidth;
+  FX_FLOAT fWidth =
+      bMultiLine ? FWL_WGT_CalcMultiLineDefWidth : FWL_WGT_CalcWidth;
   rect.Set(0, 0, fWidth, FWL_WGT_CalcHeight);
   pTheme->CalcTextRect(&calPart, rect);
   return CFX_SizeF(rect.width, rect.height);
 }
 
 void CFWL_Widget::CalcTextRect(const CFX_WideString& wsText,
                                IFWL_ThemeProvider* pTheme,
                                uint32_t dwTTOStyles,
                                int32_t iTTOAlign,
                                CFX_RectF& rect) {
@@ skipping 292 matching lines @@
     }
     default:
       break;
   }
 }
 
 void CFWL_Widget::OnProcessEvent(CFWL_Event* pEvent) {}
 
 void CFWL_Widget::OnDrawWidget(CFX_Graphics* pGraphics,
                                const CFX_Matrix* pMatrix) {}