commit ec885bad72ef8bae21270d235ae5029ef2bdc134
author Tom Sepez <tsepez@chromium.org> Wed Oct 17 22:20:19 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Oct 17 22:20:19 2018 +0000
tree 735c9e243970f98b60dac836ae4f762170d3b73c
parent a8a69e742f57a58a61555242751542fbc3fc5267

Remove CPDFSDK_Annot::GetMinWidth() and GetMinHeight().

These are a pair of virtual functions that are never overriden and
are only used once in an ASSERT().

Change-Id: I6df9d20cc3e4c0679514fa5c0c15a4d797862b5d
Reviewed-on: https://pdfium-review.googlesource.com/c/44213
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

fpdfsdk/cpdfsdk_annot.cpp

diff --git a/fpdfsdk/cpdfsdk_annot.cpp b/fpdfsdk/cpdfsdk_annot.cpp
index 6d9029a..b60e05b 100644
--- a/fpdfsdk/cpdfsdk_annot.cpp
+++ b/fpdfsdk/cpdfsdk_annot.cpp
@@ -14,13 +14,6 @@
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
 #endif  // PDF_ENABLE_XFA
 
-namespace {
-
-const float kMinWidth = 1.0f;
-const float kMinHeight = 1.0f;
-
-}  // namespace
-
 CPDFSDK_Annot::CPDFSDK_Annot(CPDFSDK_PageView* pPageView)
     : m_pPageView(pPageView) {}
 
@@ -46,14 +39,6 @@
 
 #endif  // PDF_ENABLE_XFA
 
-float CPDFSDK_Annot::GetMinWidth() const {
-  return kMinWidth;
-}
-
-float CPDFSDK_Annot::GetMinHeight() const {
-  return kMinHeight;
-}
-
 int CPDFSDK_Annot::GetLayoutOrder() const {
   return 5;
 }

fpdfsdk/cpdfsdk_annot.h

diff --git a/fpdfsdk/cpdfsdk_annot.h b/fpdfsdk/cpdfsdk_annot.h
index 5f7d2ed..06cfb70 100644
--- a/fpdfsdk/cpdfsdk_annot.h
+++ b/fpdfsdk/cpdfsdk_annot.h
@@ -39,8 +39,6 @@
   virtual CXFA_FFWidget* GetXFAWidget() const;
 #endif  // PDF_ENABLE_XFA
 
-  virtual float GetMinWidth() const;
-  virtual float GetMinHeight() const;
   virtual int GetLayoutOrder() const;
   virtual CPDF_Annot* GetPDFAnnot() const;
   virtual CPDF_Annot::Subtype GetAnnotSubtype() const;

fpdfsdk/cpdfsdk_baannot.cpp

diff --git a/fpdfsdk/cpdfsdk_baannot.cpp b/fpdfsdk/cpdfsdk_baannot.cpp
index dc4f3f9..5a0d4be 100644
--- a/fpdfsdk/cpdfsdk_baannot.cpp
+++ b/fpdfsdk/cpdfsdk_baannot.cpp
@@ -50,9 +50,8 @@
 }
 
 void CPDFSDK_BAAnnot::SetRect(const CFX_FloatRect& rect) {
-  ASSERT(rect.right - rect.left >= GetMinWidth());
-  ASSERT(rect.top - rect.bottom >= GetMinHeight());
-
+  ASSERT(rect.right - rect.left >= 1.0f);
+  ASSERT(rect.top - rect.bottom >= 1.0f);
   GetAnnotDict()->SetRectFor("Rect", rect);
 }