From d8f397878b5cd83ba4b75b3e69331986357301b9 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 18 Jul 2016 06:49:48 -0700 Subject: Remove CFX_Edit_Refresh::Analyse Unused method, removed. Review-Url: https://codereview.chromium.org/2148353002 --- fpdfsdk/fxedit/fxet_edit.cpp | 67 -------------------------------------- fpdfsdk/fxedit/include/fxet_edit.h | 1 - 2 files changed, 68 deletions(-) diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index fb219ca16c..603c459cf7 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -349,73 +349,6 @@ void CFX_Edit_Refresh::NoAnalyse() { } } -void CFX_Edit_Refresh::Analyse(int32_t nAlignment) { - FX_BOOL bLineTopChanged = FALSE; - CFX_FloatRect rcResult; - FX_FLOAT fWidthDiff; - - int32_t szMax = std::max(m_OldLineRects.GetSize(), m_NewLineRects.GetSize()); - int32_t i = 0; - - while (i < szMax) { - CFX_Edit_LineRect* pOldRect = m_OldLineRects.GetAt(i); - CFX_Edit_LineRect* pNewRect = m_NewLineRects.GetAt(i); - - if (pOldRect) { - if (pNewRect) { - if (bLineTopChanged) { - rcResult = pOldRect->m_rcLine; - rcResult.Union(pNewRect->m_rcLine); - m_RefreshRects.Add(rcResult); - } else { - if (*pNewRect != *pOldRect) { - if (!pNewRect->IsSameTop(*pOldRect) || - !pNewRect->IsSameHeight(*pOldRect)) { - bLineTopChanged = TRUE; - continue; - } - - if (nAlignment == 0) { - if (pNewRect->m_wrLine.BeginPos != pOldRect->m_wrLine.BeginPos) { - rcResult = pOldRect->m_rcLine; - rcResult.Union(pNewRect->m_rcLine); - m_RefreshRects.Add(rcResult); - } else { - if (!pNewRect->IsSameLeft(*pOldRect)) { - rcResult = pOldRect->m_rcLine; - rcResult.Union(pNewRect->m_rcLine); - } else { - fWidthDiff = - pNewRect->m_rcLine.Width() - pOldRect->m_rcLine.Width(); - rcResult = pNewRect->m_rcLine; - if (fWidthDiff > 0.0f) { - rcResult.left = rcResult.right - fWidthDiff; - } else { - rcResult.left = rcResult.right; - rcResult.right -= fWidthDiff; - } - } - m_RefreshRects.Add(rcResult); - } - } else { - rcResult = pOldRect->m_rcLine; - rcResult.Union(pNewRect->m_rcLine); - m_RefreshRects.Add(rcResult); - } - } - } - } else { - m_RefreshRects.Add(pOldRect->m_rcLine); - } - } else { - if (pNewRect) { - m_RefreshRects.Add(pNewRect->m_rcLine); - } - } - i++; - } -} - void CFX_Edit_Refresh::AddRefresh(const CFX_FloatRect& rect) { m_RefreshRects.Add(rect); } diff --git a/fpdfsdk/fxedit/include/fxet_edit.h b/fpdfsdk/fxedit/include/fxet_edit.h index 4287705592..e6253cb345 100644 --- a/fpdfsdk/fxedit/include/fxet_edit.h +++ b/fpdfsdk/fxedit/include/fxet_edit.h @@ -118,7 +118,6 @@ class CFX_Edit_Refresh { void BeginRefresh(); void Push(const CPVT_WordRange& linerange, const CFX_FloatRect& rect); void NoAnalyse(); - void Analyse(int32_t nAlignment); void AddRefresh(const CFX_FloatRect& rect); const CFX_Edit_RectArray* GetRefreshRects() const; void EndRefresh(); -- cgit v1.2.3