summaryrefslogtreecommitdiff
path: root/core/fpdfdoc/csection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfdoc/csection.cpp')
-rw-r--r--core/fpdfdoc/csection.cpp186
1 files changed, 87 insertions, 99 deletions
diff --git a/core/fpdfdoc/csection.cpp b/core/fpdfdoc/csection.cpp
index ce78418dc5..981f6d0b54 100644
--- a/core/fpdfdoc/csection.cpp
+++ b/core/fpdfdoc/csection.cpp
@@ -10,6 +10,8 @@
#include "core/fpdfdoc/cline.h"
#include "core/fpdfdoc/cpvt_wordinfo.h"
+#include "third_party/base/ptr_util.h"
+#include "third_party/base/stl_util.h"
CSection::CSection(CPDF_VariableText* pVT) : m_pVT(pVT) {}
@@ -23,7 +25,7 @@ void CSection::ResetAll() {
}
void CSection::ResetLineArray() {
- m_LineArray.RemoveAll();
+ m_LineArray.clear();
}
void CSection::ResetWordArray() {
@@ -34,10 +36,10 @@ void CSection::ResetWordArray() {
}
void CSection::ResetLinePlace() {
- for (int32_t i = 0, sz = m_LineArray.GetSize(); i < sz; i++) {
- if (CLine* pLine = m_LineArray.GetAt(i)) {
- pLine->LinePlace = CPVT_WordPlace(SecPlace.nSecIndex, i, -1);
- }
+ int32_t i = 0;
+ for (auto& pLine : m_LineArray) {
+ pLine->LinePlace = CPVT_WordPlace(SecPlace.nSecIndex, i, -1);
+ ++i;
}
}
@@ -55,7 +57,8 @@ CPVT_WordPlace CSection::AddWord(const CPVT_WordPlace& place,
}
CPVT_WordPlace CSection::AddLine(const CPVT_LineInfo& lineinfo) {
- return CPVT_WordPlace(SecPlace.nSecIndex, m_LineArray.Add(lineinfo), -1);
+ m_LineArray.push_back(pdfium::MakeUnique<CLine>(lineinfo));
+ return CPVT_WordPlace(SecPlace.nSecIndex, m_LineArray.size() - 1, -1);
}
CPVT_FloatRect CSection::Rearrange() {
@@ -70,78 +73,69 @@ CFX_SizeF CSection::GetSectionSize(float fFontSize) {
}
CPVT_WordPlace CSection::GetBeginWordPlace() const {
- if (CLine* pLine = m_LineArray.GetAt(0)) {
- return pLine->GetBeginWordPlace();
- }
- return SecPlace;
+ if (m_LineArray.empty())
+ return SecPlace;
+ return m_LineArray.front()->GetBeginWordPlace();
}
CPVT_WordPlace CSection::GetEndWordPlace() const {
- if (CLine* pLine = m_LineArray.GetAt(m_LineArray.GetSize() - 1)) {
- return pLine->GetEndWordPlace();
- }
- return SecPlace;
+ if (m_LineArray.empty())
+ return SecPlace;
+ return m_LineArray.back()->GetEndWordPlace();
}
CPVT_WordPlace CSection::GetPrevWordPlace(const CPVT_WordPlace& place) const {
- if (place.nLineIndex < 0) {
+ if (place.nLineIndex < 0)
return GetBeginWordPlace();
- }
- if (place.nLineIndex >= m_LineArray.GetSize()) {
+
+ if (place.nLineIndex >= pdfium::CollectionSize<int32_t>(m_LineArray))
return GetEndWordPlace();
- }
- if (CLine* pLine = m_LineArray.GetAt(place.nLineIndex)) {
- if (place.nWordIndex == pLine->m_LineInfo.nBeginWordIndex) {
- return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, -1);
- }
- if (place.nWordIndex < pLine->m_LineInfo.nBeginWordIndex) {
- if (CLine* pPrevLine = m_LineArray.GetAt(place.nLineIndex - 1)) {
- return pPrevLine->GetEndWordPlace();
- }
- } else {
- return pLine->GetPrevWordPlace(place);
- }
- }
- return place;
+
+ CLine* pLine = m_LineArray[place.nLineIndex].get();
+ if (place.nWordIndex == pLine->m_LineInfo.nBeginWordIndex)
+ return CPVT_WordPlace(place.nSecIndex, place.nLineIndex, -1);
+
+ if (place.nWordIndex >= pLine->m_LineInfo.nBeginWordIndex)
+ return pLine->GetPrevWordPlace(place);
+
+ if (!pdfium::IndexInBounds(m_LineArray, place.nLineIndex - 1))
+ return place;
+
+ return m_LineArray[place.nLineIndex - 1]->GetEndWordPlace();
}
CPVT_WordPlace CSection::GetNextWordPlace(const CPVT_WordPlace& place) const {
- if (place.nLineIndex < 0) {
+ if (place.nLineIndex < 0)
return GetBeginWordPlace();
- }
- if (place.nLineIndex >= m_LineArray.GetSize()) {
+
+ if (place.nLineIndex >= pdfium::CollectionSize<int32_t>(m_LineArray))
return GetEndWordPlace();
- }
- if (CLine* pLine = m_LineArray.GetAt(place.nLineIndex)) {
- if (place.nWordIndex >= pLine->m_LineInfo.nEndWordIndex) {
- if (CLine* pNextLine = m_LineArray.GetAt(place.nLineIndex + 1)) {
- return pNextLine->GetBeginWordPlace();
- }
- } else {
- return pLine->GetNextWordPlace(place);
- }
- }
- return place;
+
+ CLine* pLine = m_LineArray[place.nLineIndex].get();
+ if (place.nWordIndex < pLine->m_LineInfo.nEndWordIndex)
+ return pLine->GetNextWordPlace(place);
+
+ if (!pdfium::IndexInBounds(m_LineArray, place.nLineIndex + 1))
+ return place;
+
+ return m_LineArray[place.nLineIndex + 1]->GetBeginWordPlace();
}
void CSection::UpdateWordPlace(CPVT_WordPlace& place) const {
int32_t nLeft = 0;
- int32_t nRight = m_LineArray.GetSize() - 1;
+ int32_t nRight = pdfium::CollectionSize<int32_t>(m_LineArray) - 1;
int32_t nMid = (nLeft + nRight) / 2;
while (nLeft <= nRight) {
- if (CLine* pLine = m_LineArray.GetAt(nMid)) {
- if (place.nWordIndex < pLine->m_LineInfo.nBeginWordIndex) {
- nRight = nMid - 1;
- nMid = (nLeft + nRight) / 2;
- } else if (place.nWordIndex > pLine->m_LineInfo.nEndWordIndex) {
- nLeft = nMid + 1;
- nMid = (nLeft + nRight) / 2;
- } else {
- place.nLineIndex = nMid;
- return;
- }
+ CLine* pLine = m_LineArray[nMid].get();
+ if (place.nWordIndex < pLine->m_LineInfo.nBeginWordIndex) {
+ nRight = nMid - 1;
+ nMid = (nLeft + nRight) / 2;
+ } else if (place.nWordIndex > pLine->m_LineInfo.nEndWordIndex) {
+ nLeft = nMid + 1;
+ nMid = (nLeft + nRight) / 2;
} else {
- break;
+ place.nLineIndex = nMid;
+ return;
}
}
}
@@ -152,58 +146,52 @@ CPVT_WordPlace CSection::SearchWordPlace(const CFX_PointF& point) const {
bool bUp = true;
bool bDown = true;
int32_t nLeft = 0;
- int32_t nRight = m_LineArray.GetSize() - 1;
- int32_t nMid = m_LineArray.GetSize() / 2;
- float fTop = 0;
- float fBottom = 0;
+ int32_t nRight = pdfium::CollectionSize<int32_t>(m_LineArray) - 1;
+ int32_t nMid = pdfium::CollectionSize<int32_t>(m_LineArray) / 2;
while (nLeft <= nRight) {
- if (CLine* pLine = m_LineArray.GetAt(nMid)) {
- fTop = pLine->m_LineInfo.fLineY - pLine->m_LineInfo.fLineAscent -
- m_pVT->GetLineLeading(m_SecInfo);
- fBottom = pLine->m_LineInfo.fLineY - pLine->m_LineInfo.fLineDescent;
- if (IsFloatBigger(point.y, fTop)) {
- bUp = false;
- }
- if (IsFloatSmaller(point.y, fBottom)) {
- bDown = false;
- }
- if (IsFloatSmaller(point.y, fTop)) {
- nRight = nMid - 1;
- nMid = (nLeft + nRight) / 2;
- continue;
- } else if (IsFloatBigger(point.y, fBottom)) {
- nLeft = nMid + 1;
- nMid = (nLeft + nRight) / 2;
- continue;
- } else {
- place = SearchWordPlace(
- point.x,
- CPVT_WordRange(pLine->GetNextWordPlace(pLine->GetBeginWordPlace()),
- pLine->GetEndWordPlace()));
- place.nLineIndex = nMid;
- return place;
- }
+ CLine* pLine = m_LineArray[nMid].get();
+ float fTop = pLine->m_LineInfo.fLineY - pLine->m_LineInfo.fLineAscent -
+ m_pVT->GetLineLeading(m_SecInfo);
+ float fBottom = pLine->m_LineInfo.fLineY - pLine->m_LineInfo.fLineDescent;
+ if (IsFloatBigger(point.y, fTop))
+ bUp = false;
+ if (IsFloatSmaller(point.y, fBottom))
+ bDown = false;
+ if (IsFloatSmaller(point.y, fTop)) {
+ nRight = nMid - 1;
+ nMid = (nLeft + nRight) / 2;
+ continue;
+ }
+ if (IsFloatBigger(point.y, fBottom)) {
+ nLeft = nMid + 1;
+ nMid = (nLeft + nRight) / 2;
+ continue;
}
+ place = SearchWordPlace(
+ point.x,
+ CPVT_WordRange(pLine->GetNextWordPlace(pLine->GetBeginWordPlace()),
+ pLine->GetEndWordPlace()));
+ place.nLineIndex = nMid;
+ return place;
}
- if (bUp) {
+ if (bUp)
place = GetBeginWordPlace();
- }
- if (bDown) {
+ if (bDown)
place = GetEndWordPlace();
- }
return place;
}
CPVT_WordPlace CSection::SearchWordPlace(
float fx,
const CPVT_WordPlace& lineplace) const {
- if (CLine* pLine = m_LineArray.GetAt(lineplace.nLineIndex)) {
- return SearchWordPlace(
- fx - m_SecInfo.rcSection.left,
- CPVT_WordRange(pLine->GetNextWordPlace(pLine->GetBeginWordPlace()),
- pLine->GetEndWordPlace()));
- }
- return GetBeginWordPlace();
+ if (!pdfium::IndexInBounds(m_LineArray, lineplace.nLineIndex))
+ return GetBeginWordPlace();
+
+ CLine* pLine = m_LineArray[lineplace.nLineIndex].get();
+ return SearchWordPlace(
+ fx - m_SecInfo.rcSection.left,
+ CPVT_WordRange(pLine->GetNextWordPlace(pLine->GetBeginWordPlace()),
+ pLine->GetEndWordPlace()));
}
CPVT_WordPlace CSection::SearchWordPlace(float fx,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:19:46 +0000