From d24236a926deeb8b9589c330c27dbd300b7f8c9d Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 29 Jun 2017 18:28:58 -0700 Subject: Remove pointless CFX_FloatRect construction. Also just call CFX_FloatRect() instead of explicitly writing out all zeros. Change-Id: I7574e64791d0c9ba613b14d0a613737dfbf39b12 Reviewed-on: https://pdfium-review.googlesource.com/7172 Reviewed-by: Ryan Harrison Commit-Queue: Lei Zhang --- core/fpdfapi/page/cpdf_pageobjectholder.cpp | 2 +- core/fpdfapi/page/cpdf_streamcontentparser.cpp | 4 +-- fpdfsdk/cpdfsdk_widgethandler.cpp | 3 +- fpdfsdk/formfiller/cffl_formfiller.cpp | 10 +++--- fpdfsdk/pdfwindow/cpwl_combo_box.cpp | 4 +-- fpdfsdk/pdfwindow/cpwl_edit.cpp | 2 +- fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp | 2 +- fpdfsdk/pdfwindow/cpwl_utils.cpp | 46 ++++++-------------------- 8 files changed, 24 insertions(+), 49 deletions(-) diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.cpp b/core/fpdfapi/page/cpdf_pageobjectholder.cpp index 614fa34d2b..2b7e62b535 100644 --- a/core/fpdfapi/page/cpdf_pageobjectholder.cpp +++ b/core/fpdfapi/page/cpdf_pageobjectholder.cpp @@ -55,7 +55,7 @@ void CPDF_PageObjectHolder::Transform(const CFX_Matrix& matrix) { CFX_FloatRect CPDF_PageObjectHolder::CalcBoundingBox() const { if (m_PageObjectList.empty()) - return CFX_FloatRect(0, 0, 0, 0); + return CFX_FloatRect(); float left = 1000000.0f; float right = -1000000.0f; diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp index 151b0e644e..e00dbc54fd 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp +++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp @@ -75,11 +75,11 @@ CFX_FloatRect GetShadingBBox(CPDF_ShadingPattern* pShading, CPDF_Stream* pStream = ToStream(pShading->GetShadingObject()); CPDF_ColorSpace* pCS = pShading->GetCS(); if (!pStream || !pCS) - return CFX_FloatRect(0, 0, 0, 0); + return CFX_FloatRect(); CPDF_MeshStream stream(type, pShading->GetFuncs(), pStream, pCS); if (!stream.Load()) - return CFX_FloatRect(0, 0, 0, 0); + return CFX_FloatRect(); CFX_FloatRect rect; bool bStarted = false; diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp index 68d95edb0e..6092500526 100644 --- a/fpdfsdk/cpdfsdk_widgethandler.cpp +++ b/fpdfsdk/cpdfsdk_widgethandler.cpp @@ -276,8 +276,7 @@ CFX_FloatRect CPDFSDK_WidgetHandler::GetViewBBox(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot) { if (!pAnnot->IsSignatureWidget() && m_pFormFiller) return CFX_FloatRect(m_pFormFiller->GetViewBBox(pPageView, pAnnot)); - - return CFX_FloatRect(0, 0, 0, 0); + return CFX_FloatRect(); } CFX_WideString CPDFSDK_WidgetHandler::GetSelectedText(CPDFSDK_Annot* pAnnot) { diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index 80f725ba1a..281f0d74a7 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -6,6 +6,8 @@ #include "fpdfsdk/formfiller/cffl_formfiller.h" +#include + #include "core/fpdfapi/page/cpdf_page.h" #include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" @@ -54,8 +56,7 @@ CFX_FloatRect CFFL_FormFiller::GetWindowRect(CPDFSDK_PageView* pPageView) { if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false)) { return pWnd->GetWindowRect(); } - - return CFX_FloatRect(0, 0, 0, 0); + return CFX_FloatRect(); } FX_RECT CFFL_FormFiller::GetViewBBox(CPDFSDK_PageView* pPageView, @@ -433,8 +434,7 @@ CFX_FloatRect CFFL_FormFiller::GetPDFWindowRect() const { float fWidth = rectAnnot.right - rectAnnot.left; float fHeight = rectAnnot.top - rectAnnot.bottom; if ((m_pWidget->GetRotate() / 90) & 0x01) - return CFX_FloatRect(0, 0, fHeight, fWidth); - + std::swap(fWidth, fHeight); return CFX_FloatRect(0, 0, fWidth, fHeight); } @@ -450,7 +450,7 @@ CFX_FloatRect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) { if (rcPage.Contains(rcFocus)) return rcFocus; } - return CFX_FloatRect(0, 0, 0, 0); + return CFX_FloatRect(); } CFX_FloatRect CFFL_FormFiller::FFLtoPWL(const CFX_FloatRect& rect) { diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp b/fpdfsdk/pdfwindow/cpwl_combo_box.cpp index 3a6f08c6cd..3223db1b5f 100644 --- a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp +++ b/fpdfsdk/pdfwindow/cpwl_combo_box.cpp @@ -293,7 +293,7 @@ void CPWL_ComboBox::CreateEdit(const PWL_CREATEPARAM& cp) { if (!HasFlag(PCBS_ALLOWCUSTOMTEXT)) ecp.dwFlags |= PWS_READONLY; - ecp.rcRectWnd = CFX_FloatRect(0, 0, 0, 0); + ecp.rcRectWnd = CFX_FloatRect(); ecp.dwBorderWidth = 0; ecp.nBorderStyle = BorderStyle::SOLID; m_pEdit->Create(ecp); @@ -330,7 +330,7 @@ void CPWL_ComboBox::CreateListBox(const PWL_CREATEPARAM& cp) { lcp.nBorderStyle = BorderStyle::SOLID; lcp.dwBorderWidth = 1; lcp.eCursorType = FXCT_ARROW; - lcp.rcRectWnd = CFX_FloatRect(0, 0, 0, 0); + lcp.rcRectWnd = CFX_FloatRect(); if (cp.dwFlags & PWS_AUTOFONTSIZE) lcp.fFontSize = PWLCB_DEFAULTFONTSIZE; diff --git a/fpdfsdk/pdfwindow/cpwl_edit.cpp b/fpdfsdk/pdfwindow/cpwl_edit.cpp index aa257b9308..4ad107653d 100644 --- a/fpdfsdk/pdfwindow/cpwl_edit.cpp +++ b/fpdfsdk/pdfwindow/cpwl_edit.cpp @@ -179,7 +179,7 @@ void CPWL_Edit::SetParamByFlag() { m_pEdit->EnableUndo(HasFlag(PES_UNDO)); if (HasFlag(PES_TEXTOVERFLOW)) { - SetClipRect(CFX_FloatRect(0.0f, 0.0f, 0.0f, 0.0f)); + SetClipRect(CFX_FloatRect()); m_pEdit->SetTextOverflow(true, false); } else { if (m_pEditCaret) { diff --git a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp b/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp index 3390696e01..d8a157a189 100644 --- a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp +++ b/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp @@ -122,7 +122,7 @@ void CPWL_EditCtrl::CreateEditCaret(const PWL_CREATEPARAM& cp) { ecp.dwFlags = PWS_CHILD | PWS_NOREFRESHCLIP; ecp.dwBorderWidth = 0; ecp.nBorderStyle = BorderStyle::SOLID; - ecp.rcRectWnd = CFX_FloatRect(0, 0, 0, 0); + ecp.rcRectWnd = CFX_FloatRect(); m_pEditCaret->Create(ecp); } diff --git a/fpdfsdk/pdfwindow/cpwl_utils.cpp b/fpdfsdk/pdfwindow/cpwl_utils.cpp index ce263eff8b..4dd897d7d2 100644 --- a/fpdfsdk/pdfwindow/cpwl_utils.cpp +++ b/fpdfsdk/pdfwindow/cpwl_utils.cpp @@ -353,22 +353,19 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, Icon.SetIconFit(&IconFit); Icon.SetPDFStream(pIconStream); - CFX_FloatRect rcLabel = CFX_FloatRect(0, 0, 0, 0); - CFX_FloatRect rcIcon = CFX_FloatRect(0, 0, 0, 0); + CFX_FloatRect rcLabel; + CFX_FloatRect rcIcon; float fWidth = 0.0f; float fHeight = 0.0f; switch (nLayOut) { case PPBL_LABEL: rcLabel = rcBBox; - rcIcon = CFX_FloatRect(0, 0, 0, 0); break; case PPBL_ICON: rcIcon = rcBBox; - rcLabel = CFX_FloatRect(0, 0, 0, 0); break; case PPBL_ICONTOPLABELBOTTOM: - if (pIconStream) { if (IsFloatZero(fFontSize)) { fHeight = rcBBox.top - rcBBox.bottom; @@ -380,7 +377,6 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, fHeight = rcLabelContent.Height(); if (rcBBox.bottom + fHeight > rcBBox.top) { - rcIcon = CFX_FloatRect(0, 0, 0, 0); rcLabel = rcBBox; } else { rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.right, @@ -391,12 +387,9 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, } } else { rcLabel = rcBBox; - rcIcon = CFX_FloatRect(0, 0, 0, 0); } - break; case PPBL_LABELTOPICONBOTTOM: - if (pIconStream) { if (IsFloatZero(fFontSize)) { fHeight = rcBBox.top - rcBBox.bottom; @@ -409,7 +402,6 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, fHeight = rcLabelContent.Height(); if (rcBBox.bottom + fHeight > rcBBox.top) { - rcIcon = CFX_FloatRect(0, 0, 0, 0); rcLabel = rcBBox; } else { rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.top - fHeight, @@ -420,21 +412,17 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, } } else { rcLabel = rcBBox; - rcIcon = CFX_FloatRect(0, 0, 0, 0); } - break; case PPBL_ICONLEFTLABELRIGHT: - if (pIconStream) { if (IsFloatZero(fFontSize)) { fWidth = rcBBox.right - rcBBox.left; - rcLabel = CFX_FloatRect(rcBBox.right - fWidth * fAutoFontScale, - rcBBox.bottom, rcBBox.right, rcBBox.top); - rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcLabel.left, - rcBBox.top); - if (rcLabelContent.Width() < fWidth * fAutoFontScale) { + rcLabel = CFX_FloatRect(rcBBox.right - fWidth * fAutoFontScale, + rcBBox.bottom, rcBBox.right, rcBBox.top); + rcIcon = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcLabel.left, + rcBBox.top); } else { if (rcLabelContent.Width() < fWidth) { rcLabel = CFX_FloatRect(rcBBox.right - rcLabelContent.Width(), @@ -443,15 +431,12 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, rcBBox.top); } else { rcLabel = rcBBox; - rcIcon = CFX_FloatRect(0, 0, 0, 0); } } } else { fWidth = rcLabelContent.Width(); - if (rcBBox.left + fWidth > rcBBox.right) { rcLabel = rcBBox; - rcIcon = CFX_FloatRect(0, 0, 0, 0); } else { rcLabel = CFX_FloatRect(rcBBox.right - fWidth, rcBBox.bottom, rcBBox.right, rcBBox.top); @@ -461,22 +446,18 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, } } else { rcLabel = rcBBox; - rcIcon = CFX_FloatRect(0, 0, 0, 0); } - break; case PPBL_LABELLEFTICONRIGHT: - if (pIconStream) { if (IsFloatZero(fFontSize)) { fWidth = rcBBox.right - rcBBox.left; - rcLabel = - CFX_FloatRect(rcBBox.left, rcBBox.bottom, - rcBBox.left + fWidth * fAutoFontScale, rcBBox.top); - rcIcon = CFX_FloatRect(rcLabel.right, rcBBox.bottom, rcBBox.right, - rcBBox.top); - if (rcLabelContent.Width() < fWidth * fAutoFontScale) { + rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, + rcBBox.left + fWidth * fAutoFontScale, + rcBBox.top); + rcIcon = CFX_FloatRect(rcLabel.right, rcBBox.bottom, rcBBox.right, + rcBBox.top); } else { if (rcLabelContent.Width() < fWidth) { rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, @@ -486,15 +467,12 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, rcBBox.top); } else { rcLabel = rcBBox; - rcIcon = CFX_FloatRect(0, 0, 0, 0); } } } else { fWidth = rcLabelContent.Width(); - if (rcBBox.left + fWidth > rcBBox.right) { rcLabel = rcBBox; - rcIcon = CFX_FloatRect(0, 0, 0, 0); } else { rcLabel = CFX_FloatRect(rcBBox.left, rcBBox.bottom, rcBBox.left + fWidth, rcBBox.top); @@ -504,9 +482,7 @@ CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox, } } else { rcLabel = rcBBox; - rcIcon = CFX_FloatRect(0, 0, 0, 0); } - break; case PPBL_LABELOVERICON: rcLabel = rcBBox; -- cgit v1.2.3