Add CFX_FloatRect::GetDeflated

This CL adds a method to CFX_FloatRect to get a new deflated rectangle
from a given rectangle.

Change-Id: I781222257c82baf94d5f77deede52fbe4e97c701
Reviewed-on: https://pdfium-review.googlesource.com/7850
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

1 files changed, 5 insertions, 14 deletions

diff --git a/fpdfsdk/pdfwindow/cpwl_wnd.cpp b/fpdfsdk/pdfwindow/cpwl_wnd.cpp
index 5aae2dfa92..863b9aab9a 100644
--- a/fpdfsdk/pdfwindow/cpwl_wnd.cpp
+++ b/fpdfsdk/pdfwindow/cpwl_wnd.cpp
@@ -292,14 +292,9 @@ void CPWL_Wnd::DrawThisAppearance(CFX_RenderDevice* pDevice,
     return;
 
   if (HasFlag(PWS_BACKGROUND)) {
-    CFX_FloatRect rcClient = rectWnd;
-    if (!rcClient.IsEmpty()) {
-      float width =
-          static_cast<float>(GetBorderWidth() + GetInnerBorderWidth());
-      rcClient.Deflate(width, width);
-      rcClient.Normalize();
-    }
-    CPWL_Utils::DrawFillRect(pDevice, pUser2Device, rcClient,
+    float width = static_cast<float>(GetBorderWidth() + GetInnerBorderWidth());
+    CPWL_Utils::DrawFillRect(pDevice, pUser2Device,
+                             rectWnd.GetDeflated(width, width),
                              GetBackgroundColor(), GetTransparency());
   }
 
@@ -468,13 +463,9 @@ CFX_FloatRect CPWL_Wnd::GetWindowRect() const {
 
 CFX_FloatRect CPWL_Wnd::GetClientRect() const {
   CFX_FloatRect rcWindow = GetWindowRect();
-  CFX_FloatRect rcClient = rcWindow;
-  if (!rcClient.IsEmpty()) {
-    float width = static_cast<float>(GetBorderWidth() + GetInnerBorderWidth());
-    rcClient.Deflate(width, width);
-    rcClient.Normalize();
-  }
 
+  float width = static_cast<float>(GetBorderWidth() + GetInnerBorderWidth());
+  CFX_FloatRect rcClient = rcWindow.GetDeflated(width, width);
   if (CPWL_ScrollBar* pVSB = GetVScrollBar())
     rcClient.right -= pVSB->GetScrollBarWidth();