CPDF_Annot::GetRect() should return CFX_FloatRect.

fpdfsdk/fsdk_mgr.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 "fpdfsdk/include/fsdk_mgr.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 558 matching lines @@
   CPDFSDK_AnnotIterator annotIterator(this, true);
   while (CPDFSDK_Annot* pSDKAnnot = annotIterator.Next()) {
     CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr();
     pAnnotHandlerMgr->Annot_OnDraw(this, pSDKAnnot, pDevice, pUser2Device, 0);
   }
 }
 
 const CPDF_Annot* CPDFSDK_PageView::GetPDFAnnotAtPoint(FX_FLOAT pageX,
                                                        FX_FLOAT pageY) {
   for (const auto& pAnnot : m_pAnnotList->All()) {
-    CFX_FloatRect annotRect;
-    pAnnot->GetRect(annotRect);
+    CFX_FloatRect annotRect = pAnnot->GetRect();
     if (annotRect.Contains(pageX, pageY))
       return pAnnot.get();
   }
   return nullptr;
 }
 
 const CPDF_Annot* CPDFSDK_PageView::GetPDFWidgetAtPoint(FX_FLOAT pageX,
                                                         FX_FLOAT pageY) {
   for (const auto& pAnnot : m_pAnnotList->All()) {
     if (pAnnot->GetSubType() == "Widget") {
-      CFX_FloatRect annotRect;
-      pAnnot->GetRect(annotRect);
+      CFX_FloatRect annotRect = pAnnot->GetRect();
       if (annotRect.Contains(pageX, pageY))
         return pAnnot.get();
     }
   }
   return nullptr;
 }
 
 CPDFSDK_Annot* CPDFSDK_PageView::GetFXAnnotAtPoint(FX_FLOAT pageX,
                                                    FX_FLOAT pageY) {
   CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
@@ skipping 447 matching lines @@
 int CPDFSDK_PageView::GetPageIndexForStaticPDF() const {
 #ifdef PDF_ENABLE_XFA
   CPDF_Page* pPage = m_page->GetPDFPage();
 #else   // PDF_ENABLE_XFA
   CPDF_Page* pPage = m_page;
 #endif  // PDF_ENABLE_XFA
   CPDF_Dictionary* pDict = pPage->m_pFormDict;
   CPDF_Document* pDoc = m_pSDKDoc->GetPDFDocument();
   return (pDoc && pDict) ? pDoc->GetPageIndex(pDict->GetObjNum()) : -1;
 }