commit 60fd9fc63744419a760201af596515d411b7e194
author Dan Sinclair <dsinclair@chromium.org> Tue Feb 21 17:21:08 2017 -0500
committer Chromium commit bot <commit-bot@chromium.org> Wed Feb 22 01:32:00 2017 +0000
tree 8e4d8f3b2571bf0061af977f005bd65199fa0043
parent 6eec1c45c9c6e0812950d55ae88340cf41bc243a

Convert OutputSelectedRect to take a rect

This updates the CPDFSDK_FormFillEnvironment::OutputSelectedRect to match to
CFX_SystemHandler::OutputSelectedRect method.

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

fpdfsdk/cfx_systemhandler.cpp

diff --git a/fpdfsdk/cfx_systemhandler.cpp b/fpdfsdk/cfx_systemhandler.cpp
index 14d7729..b6dc19d 100644
--- a/fpdfsdk/cfx_systemhandler.cpp
+++ b/fpdfsdk/cfx_systemhandler.cpp
@@ -68,7 +68,8 @@
   UnderlyingPageType* pPage = pAnnot->GetUnderlyingPage();
   ASSERT(pPage);
 
-  m_pFormFillEnv->OutputSelectedRect(pPage, ptA.x, ptB.y, ptB.x, ptA.y);
+  m_pFormFillEnv->OutputSelectedRect(pPage,
+                                     CFX_FloatRect(ptA.x, ptA.y, ptB.x, ptB.y));
 }
 
 bool CFX_SystemHandler::IsSelectionImplemented() const {

fpdfsdk/cpdfsdk_formfillenvironment.cpp

diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index 4aae48c..4ef766d 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -240,13 +240,13 @@
   }
 }
 
-void CPDFSDK_FormFillEnvironment::OutputSelectedRect(FPDF_PAGE page,
-                                                     double left,
-                                                     double top,
-                                                     double right,
-                                                     double bottom) {
-  if (m_pInfo && m_pInfo->FFI_OutputSelectedRect)
-    m_pInfo->FFI_OutputSelectedRect(m_pInfo, page, left, top, right, bottom);
+void CPDFSDK_FormFillEnvironment::OutputSelectedRect(
+    FPDF_PAGE page,
+    const CFX_FloatRect& rect) {
+  if (m_pInfo && m_pInfo->FFI_OutputSelectedRect) {
+    m_pInfo->FFI_OutputSelectedRect(m_pInfo, page, rect.left, rect.top,
+                                    rect.right, rect.bottom);
+  }
 }
 
 void CPDFSDK_FormFillEnvironment::SetCursor(int nCursorType) {

fpdfsdk/cpdfsdk_formfillenvironment.h

diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h
index b180e98..eead873 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.h
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -69,11 +69,7 @@
   bool ProcOpenAction();
 
   void Invalidate(FPDF_PAGE page, const FX_RECT& rect);
-  void OutputSelectedRect(FPDF_PAGE page,
-                          double left,
-                          double top,
-                          double right,
-                          double bottom);
+  void OutputSelectedRect(FPDF_PAGE page, const CFX_FloatRect& rect);
 
   void SetCursor(int nCursorType);
   int SetTimer(int uElapse, TimerCallback lpTimerFunc);