summaryrefslogtreecommitdiff
path: root/core/fpdfdoc/cpdf_annot.cpp
diff options
context:
space:
mode:
authorjaepark <jaepark@google.com>2016-08-25 13:33:34 -0700
committerCommit bot <commit-bot@chromium.org>2016-08-25 13:33:34 -0700
commita1d2111945acb35cb3403226e68a1920910fa23e (patch)
treef8e0dafb97832a0cad15adc50c9b55c0d5b0c48a /core/fpdfdoc/cpdf_annot.cpp
parentd99a833da49272ee487293177f62274f58762033 (diff)
downloadpdfium-a1d2111945acb35cb3403226e68a1920910fa23e.tar.xz
CPDF_Annot::GetRect() should return CFX_FloatRect.
Avoid using reference argument and return CFX_FloatRect instead. Review-Url: https://codereview.chromium.org/2278153005
Diffstat (limited to 'core/fpdfdoc/cpdf_annot.cpp')
-rw-r--r--core/fpdfdoc/cpdf_annot.cpp18
1 files changed, 8 insertions, 10 deletions
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index 76d3f9c6d4..e70ee27a98 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -55,12 +55,13 @@ CFX_ByteString CPDF_Annot::GetSubType() const {
return m_sSubtype;
}
-void CPDF_Annot::GetRect(CFX_FloatRect& rect) const {
- if (!m_pAnnotDict) {
- return;
- }
- rect = m_pAnnotDict->GetRectBy("Rect");
+CFX_FloatRect CPDF_Annot::GetRect() const {
+ if (!m_pAnnotDict)
+ return CFX_FloatRect();
+
+ CFX_FloatRect rect = m_pAnnotDict->GetRectBy("Rect");
rect.Normalize();
+ return rect;
}
uint32_t CPDF_Annot::GetFlags() const {
@@ -133,9 +134,7 @@ static CPDF_Form* FPDFDOC_Annot_GetMatrix(const CPDF_Page* pPage,
CFX_FloatRect form_bbox = pForm->m_pFormDict->GetRectBy("BBox");
CFX_Matrix form_matrix = pForm->m_pFormDict->GetMatrixBy("Matrix");
form_matrix.TransformRect(form_bbox);
- CFX_FloatRect arect;
- pAnnot->GetRect(arect);
- matrix.MatchRect(arect, form_bbox);
+ matrix.MatchRect(pAnnot->GetRect(), form_bbox);
matrix.Concat(*pUser2Device);
return pForm;
}
@@ -272,8 +271,7 @@ void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice,
graph_state.m_DashArray[0] = graph_state.m_DashArray[1] = 3 * 1.0f;
}
}
- CFX_FloatRect rect;
- GetRect(rect);
+ CFX_FloatRect rect = GetRect();
CFX_PathData path;
width /= 2;
path.AppendRect(rect.left + width, rect.bottom + width, rect.right - width,