Remove CPWL_Utils::{In,De}flateRect

This CL removes the custom InflateRect and Deflate rect code in CPWL_Utils in
favour of calling the CFX_FloatRect version. This required inlining some extra
code at each callsite to check the rect size and normalize.

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

1 files changed, 10 insertions, 3 deletions

diff --git a/fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp b/fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp
index 01ce4e6f0a..cf5d42372a 100644
--- a/fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp
+++ b/fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp
@@ -247,14 +247,21 @@ void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
                              ArgbEncode(nTransparency, 100, 100, 100), 0.0f);
 
   // draw inner border
-  rcDraw = CPWL_Utils::DeflateRect(rectWnd, 0.5f);
+  rcDraw = rectWnd;
+  if (!rcDraw.IsEmpty()) {
+    rcDraw.Deflate(0.5f, 0.5f);
+    rcDraw.Normalize();
+  }
   CPWL_Utils::DrawStrokeRect(pDevice, pUser2Device, rcDraw,
                              ArgbEncode(nTransparency, 255, 255, 255), 1.0f);
 
   if (m_eSBButtonType != PSBT_POS) {
     // draw background
-    rcDraw = CPWL_Utils::DeflateRect(rectWnd, 1.0f);
-
+    rcDraw = rectWnd;
+    if (!rcDraw.IsEmpty()) {
+      rcDraw.Deflate(1.0f, 1.0f);
+      rcDraw.Normalize();
+    }
     if (IsEnabled()) {
       CPWL_Utils::DrawShadow(pDevice, pUser2Device, true, false, rcDraw,
                              nTransparency, 80, 220);