Removing default params from CFX_Edit.

fpdfsdk/fxedit/fxet_edit.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/fxedit/include/fxet_edit.h"
 
 #include <algorithm>
 
@@ skipping 751 matching lines @@
     m_pEdit->SelectNone();
     m_pEdit->SetSel(m_wrSel.BeginPos, m_wrSel.EndPos);
     m_pEdit->Clear(FALSE, TRUE);
   }
 }
 
 void CFXEU_Clear::Undo() {
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wrSel.BeginPos);
-    m_pEdit->InsertText(m_swText.c_str(), DEFAULT_CHARSET, nullptr, nullptr,
-                        FALSE, TRUE);
+    m_pEdit->InsertText(m_swText.c_str(), DEFAULT_CHARSET, FALSE, TRUE);
     m_pEdit->SetSel(m_wrSel.BeginPos, m_wrSel.EndPos);
   }
 }
 
 CFXEU_InsertText::CFXEU_InsertText(CFX_Edit* pEdit,
                                    const CPVT_WordPlace& wpOldPlace,
                                    const CPVT_WordPlace& wpNewPlace,
                                    const CFX_WideString& swText,
-                                   int32_t charset,
-                                   const CPVT_SecProps* pSecProps,
-                                   const CPVT_WordProps* pWordProps)
+                                   int32_t charset)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
       m_swText(swText),
-      m_nCharset(charset),
-      m_SecProps(),
-      m_WordProps() {
-  if (pSecProps)
-    m_SecProps = *pSecProps;
-  if (pWordProps)
-    m_WordProps = *pWordProps;
-}
+      m_nCharset(charset) {}
 
 CFXEU_InsertText::~CFXEU_InsertText() {}
 
 void CFXEU_InsertText::Redo() {
   if (m_pEdit && IsLast()) {
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wpOld);
-    m_pEdit->InsertText(m_swText.c_str(), m_nCharset, &m_SecProps, &m_WordProps,

[Lei Zhang, 2016/07/13 19:35:15]

Can you help convince me this is safe to remove?

[dsinclair, 2016/07/14 14:16:53]

CFXEU_InsertText is created in CFX_Edit::InsertText and passed pSecProps and
pWordProps from the InsertText call. So, if those are always null, these are
always null and can be removed.

InsertText() is called on:
  * 772 nullptr, nullptr
  * Here, which passed values
  * 1799 with passed through values from InsertText override.

The default values for those pointers are both nullptr in the header. They are
never set in any other caller. So, they have to be null.

-                        FALSE, TRUE);
+    m_pEdit->InsertText(m_swText.c_str(), m_nCharset, FALSE, TRUE);
   }
 }
 
 void CFXEU_InsertText::Undo() {
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetSel(m_wpOld, m_wpNew);
     m_pEdit->Clear(FALSE, TRUE);
   }
 }
@@ skipping 680 matching lines @@
 }
 
 CPDF_VariableText* CFX_Edit::GetVariableText() {
   return m_pVT.get();
 }
 
 IPVT_FontMap* CFX_Edit::GetFontMap() {
   return m_pVTProvider ? m_pVTProvider->GetFontMap() : nullptr;
 }
 
-void CFX_Edit::SetPlateRect(const CFX_FloatRect& rect, FX_BOOL bPaint) {
+void CFX_Edit::SetPlateRect(const CFX_FloatRect& rect) {
   m_pVT->SetPlateRect(rect);
   m_ptScrollPos = CFX_FloatPoint(rect.left, rect.top);
-  if (bPaint)
-    Paint();
+  Paint();
 }
 
 void CFX_Edit::SetAlignmentH(int32_t nFormat, FX_BOOL bPaint) {
   m_pVT->SetAlignment(nFormat);
   if (bPaint)
     Paint();
 }
 
 void CFX_Edit::SetAlignmentV(int32_t nFormat, FX_BOOL bPaint) {
   m_nAlignment = nFormat;
   if (bPaint)
     Paint();
 }
 
 void CFX_Edit::SetPasswordChar(uint16_t wSubWord, FX_BOOL bPaint) {
   m_pVT->SetPasswordChar(wSubWord);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetLimitChar(int32_t nLimitChar, FX_BOOL bPaint) {
+void CFX_Edit::SetLimitChar(int32_t nLimitChar) {
   m_pVT->SetLimitChar(nLimitChar);
-  if (bPaint)
-    Paint();
+  Paint();
 }
 
-void CFX_Edit::SetCharArray(int32_t nCharArray, FX_BOOL bPaint) {
+void CFX_Edit::SetCharArray(int32_t nCharArray) {
   m_pVT->SetCharArray(nCharArray);
-  if (bPaint)
-    Paint();
+  Paint();
 }
 
-void CFX_Edit::SetCharSpace(FX_FLOAT fCharSpace, FX_BOOL bPaint) {
+void CFX_Edit::SetCharSpace(FX_FLOAT fCharSpace) {
   m_pVT->SetCharSpace(fCharSpace);
-  if (bPaint)
-    Paint();
-}
-
-void CFX_Edit::SetHorzScale(int32_t nHorzScale, FX_BOOL bPaint) {
-  m_pVT->SetHorzScale(nHorzScale);
-  if (bPaint)
-    Paint();
+  Paint();
 }
 
 void CFX_Edit::SetMultiLine(FX_BOOL bMultiLine, FX_BOOL bPaint) {
   m_pVT->SetMultiLine(bMultiLine);
   if (bPaint)
     Paint();
 }
 
 void CFX_Edit::SetAutoReturn(FX_BOOL bAuto, FX_BOOL bPaint) {
   m_pVT->SetAutoReturn(bAuto);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint) {
-  m_pVT->SetLineLeading(fLineLeading);
-  if (bPaint)
-    Paint();
-}
-
 void CFX_Edit::SetAutoFontSize(FX_BOOL bAuto, FX_BOOL bPaint) {
   m_pVT->SetAutoFontSize(bAuto);
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetFontSize(FX_FLOAT fFontSize, FX_BOOL bPaint) {
+void CFX_Edit::SetFontSize(FX_FLOAT fFontSize) {
   m_pVT->SetFontSize(fFontSize);
-  if (bPaint)
-    Paint();
+  Paint();
 }
 
 void CFX_Edit::SetAutoScroll(FX_BOOL bAuto, FX_BOOL bPaint) {
   m_bEnableScroll = bAuto;
   if (bPaint)
     Paint();
 }
 
 void CFX_Edit::SetTextOverflow(FX_BOOL bAllowed, FX_BOOL bPaint) {
   m_bEnableOverflow = bAllowed;
@@ skipping 22 matching lines @@
 void CFX_Edit::SetSel(const CPVT_WordPlace& begin, const CPVT_WordPlace& end) {
   if (m_pVT->IsValid()) {
     SelectNone();
 
     m_SelState.Set(begin, end);
 
     SetCaret(m_SelState.EndPos);
 
     if (m_SelState.IsExist()) {
       ScrollToCaret();
-      CPVT_WordRange wr(m_SelState.BeginPos, m_SelState.EndPos);
-      Refresh(RP_OPTIONAL, &wr);
+      Refresh();
       SetCaretInfo();
     } else {
       ScrollToCaret();
       SetCaretInfo();
     }
   }
 }
 
 void CFX_Edit::GetSel(int32_t& nStartChar, int32_t& nEndChar) const {
   nStartChar = -1;
@@ skipping 118 matching lines @@
 
   if (wr1.EndPos.WordCmp(wr2.EndPos) < 0) {
     wrRet.EndPos = wr2.EndPos;
   } else {
     wrRet.EndPos = wr1.EndPos;
   }
 
   return wrRet;
 }
 
-void CFX_Edit::SetText(const FX_WCHAR* text,
-                       int32_t charset,
-                       const CPVT_SecProps* pSecProps,
-                       const CPVT_WordProps* pWordProps) {
-  SetText(text, charset, pSecProps, pWordProps, TRUE, TRUE);
+void CFX_Edit::SetText(const FX_WCHAR* text) {
+  Empty();
+  DoInsertText(CPVT_WordPlace(0, 0, -1), text, DEFAULT_CHARSET);
+  Paint();
 }
 
-FX_BOOL CFX_Edit::InsertWord(uint16_t word,
-                             int32_t charset,
-                             const CPVT_WordProps* pWordProps) {
-  return InsertWord(word, charset, pWordProps, TRUE, TRUE);
+FX_BOOL CFX_Edit::InsertWord(uint16_t word, int32_t charset) {
+  return InsertWord(word, charset, nullptr, TRUE, TRUE);
 }
 
-FX_BOOL CFX_Edit::InsertReturn(const CPVT_SecProps* pSecProps,
-                               const CPVT_WordProps* pWordProps) {
-  return InsertReturn(pSecProps, pWordProps, TRUE, TRUE);
+FX_BOOL CFX_Edit::InsertReturn() {
+  return InsertReturn(nullptr, nullptr, TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::Backspace() {
   return Backspace(TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::Delete() {
   return Delete(TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::Clear() {
   return Clear(TRUE, TRUE);
 }
 
-FX_BOOL CFX_Edit::InsertText(const FX_WCHAR* text,
-                             int32_t charset,
-                             const CPVT_SecProps* pSecProps,
-                             const CPVT_WordProps* pWordProps) {
-  return InsertText(text, charset, pSecProps, pWordProps, TRUE, TRUE);
+FX_BOOL CFX_Edit::InsertText(const FX_WCHAR* text, int32_t charset) {
+  return InsertText(text, charset, TRUE, TRUE);
 }
 
 FX_FLOAT CFX_Edit::GetFontSize() const {
   return m_pVT->GetFontSize();
 }
 
 uint16_t CFX_Edit::GetPasswordChar() const {
   return m_pVT->GetPasswordChar();
 }
 
@@ skipping 47 matching lines @@
     return m_pVT->SearchWordPlace(EditToVT(point));
   }
 
   return CPVT_WordPlace();
 }
 
 void CFX_Edit::Paint() {
   if (m_pVT->IsValid()) {
     RearrangeAll();
     ScrollToCaret();
-    Refresh(RP_NOANALYSE);
+    Refresh();
     SetCaretOrigin();
     SetCaretInfo();
   }
 }
 
 void CFX_Edit::RearrangeAll() {
   if (m_pVT->IsValid()) {
     m_pVT->UpdateWordPlace(m_wpCaret);
     m_pVT->RearrangeAll();
     m_pVT->UpdateWordPlace(m_wpCaret);
@@ skipping 26 matching lines @@
     }
   }
 }
 
 void CFX_Edit::SelectAll() {
   if (m_pVT->IsValid()) {
     m_SelState = CFX_Edit_Select(GetWholeWordRange());
     SetCaret(m_SelState.EndPos);
 
     ScrollToCaret();
-    CPVT_WordRange wrVisible = GetVisibleWordRange();
-    Refresh(RP_OPTIONAL, &wrVisible);
+    Refresh();
     SetCaretInfo();
   }
 }
 
 void CFX_Edit::SelectNone() {
   if (m_pVT->IsValid()) {
     if (m_SelState.IsExist()) {
-      CPVT_WordRange wrTemp = m_SelState.ConvertToWordRange();
       m_SelState.Default();
-      Refresh(RP_OPTIONAL, &wrTemp);
+      Refresh();
     }
   }
 }
 
 FX_BOOL CFX_Edit::IsSelected() const {
   return m_SelState.IsExist();
 }
 
 CFX_FloatPoint CFX_Edit::VTToEdit(const CFX_FloatPoint& point) const {
   CFX_FloatRect rcContent = m_pVT->GetContentRect();
@@ skipping 72 matching lines @@
   }
 }
 
 void CFX_Edit::SetScrollPosX(FX_FLOAT fx) {
   if (!m_bEnableScroll)
     return;
 
   if (m_pVT->IsValid()) {
     if (!FX_EDIT_IsFloatEqual(m_ptScrollPos.x, fx)) {
       m_ptScrollPos.x = fx;
-      Refresh(RP_NOANALYSE);
+      Refresh();
     }
   }
 }
 
 void CFX_Edit::SetScrollPosY(FX_FLOAT fy) {
   if (!m_bEnableScroll)
     return;
 
   if (m_pVT->IsValid()) {
     if (!FX_EDIT_IsFloatEqual(m_ptScrollPos.y, fy)) {
       m_ptScrollPos.y = fy;
-      Refresh(RP_NOANALYSE);
+      Refresh();
 
       if (m_pNotify) {
         if (!m_bNotifyFlag) {
           m_bNotifyFlag = TRUE;
           m_pNotify->IOnSetScrollPosY(fy);
           m_bNotifyFlag = FALSE;
         }
       }
     }
   }
@@ skipping 86 matching lines @@
         SetScrollPosY(ptFoot.y + rcPlate.Height());
       }
     } else if (FX_EDIT_IsFloatBigger(ptHeadEdit.y, rcPlate.top)) {
       if (FX_EDIT_IsFloatBigger(ptFootEdit.y, rcPlate.bottom)) {
         SetScrollPosY(ptHead.y);
       }
     }
   }
 }
 
-void CFX_Edit::Refresh(REFRESH_PLAN_E ePlan,
-                       const CPVT_WordRange* pRange1,
-                       const CPVT_WordRange* pRange2) {
+void CFX_Edit::Refresh() {
   if (m_bEnableRefresh && m_pVT->IsValid()) {
     m_Refresh.BeginRefresh();
     RefreshPushLineRects(GetVisibleWordRange());
 
     m_Refresh.NoAnalyse();
     m_ptRefreshScrollPos = m_ptScrollPos;
 
     if (m_pNotify) {
       if (!m_bNotifyFlag) {
         m_bNotifyFlag = TRUE;
@@ skipping 199 matching lines @@
 void CFX_Edit::OnMouseMove(const CFX_FloatPoint& point,
                            FX_BOOL bShift,
                            FX_BOOL bCtrl) {
   if (m_pVT->IsValid()) {
     SetCaret(m_pVT->SearchWordPlace(EditToVT(point)));
 
     if (m_wpCaret != m_wpOldCaret) {
       m_SelState.SetEndPos(m_wpCaret);
 
       ScrollToCaret();
-      CPVT_WordRange wr(m_wpOldCaret, m_wpCaret);
-      Refresh(RP_OPTIONAL, &wr);
+      Refresh();
       SetCaretOrigin();
       SetCaretInfo();
     }
   }
 }
 
 void CFX_Edit::OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl) {
   if (m_pVT->IsValid()) {
     SetCaret(m_pVT->GetUpWordPlace(m_wpCaret, m_ptCaret));
 
     if (bShift) {
       if (m_SelState.IsExist())
         m_SelState.SetEndPos(m_wpCaret);
       else
         m_SelState.Set(m_wpOldCaret, m_wpCaret);
 
       if (m_wpOldCaret != m_wpCaret) {
         ScrollToCaret();
-        CPVT_WordRange wr(m_wpOldCaret, m_wpCaret);
-        Refresh(RP_OPTIONAL, &wr);
+        Refresh();
         SetCaretInfo();
       }
     } else {
       SelectNone();
 
       ScrollToCaret();
       SetCaretInfo();
     }
   }
 }
 
 void CFX_Edit::OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl) {
   if (m_pVT->IsValid()) {
     SetCaret(m_pVT->GetDownWordPlace(m_wpCaret, m_ptCaret));
 
     if (bShift) {
       if (m_SelState.IsExist())
         m_SelState.SetEndPos(m_wpCaret);
       else
         m_SelState.Set(m_wpOldCaret, m_wpCaret);
 
       if (m_wpOldCaret != m_wpCaret) {
         ScrollToCaret();
-        CPVT_WordRange wr(m_wpOldCaret, m_wpCaret);
-        Refresh(RP_OPTIONAL, &wr);
+        Refresh();
         SetCaretInfo();
       }
     } else {
       SelectNone();
 
       ScrollToCaret();
       SetCaretInfo();
     }
   }
 }
 
 void CFX_Edit::OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl) {
   if (m_pVT->IsValid()) {
     if (bShift) {
       if (m_wpCaret == m_pVT->GetLineBeginPlace(m_wpCaret) &&
           m_wpCaret != m_pVT->GetSectionBeginPlace(m_wpCaret))
         SetCaret(m_pVT->GetPrevWordPlace(m_wpCaret));
 
       SetCaret(m_pVT->GetPrevWordPlace(m_wpCaret));
 
       if (m_SelState.IsExist())
         m_SelState.SetEndPos(m_wpCaret);
       else
         m_SelState.Set(m_wpOldCaret, m_wpCaret);
 
       if (m_wpOldCaret != m_wpCaret) {
         ScrollToCaret();
-        CPVT_WordRange wr(m_wpOldCaret, m_wpCaret);
-        Refresh(RP_OPTIONAL, &wr);
+        Refresh();
         SetCaretInfo();
       }
     } else {
       if (m_SelState.IsExist()) {
         if (m_SelState.BeginPos.WordCmp(m_SelState.EndPos) < 0)
           SetCaret(m_SelState.BeginPos);
         else
           SetCaret(m_SelState.EndPos);
 
         SelectNone();
@@ skipping 23 matching lines @@
           m_wpCaret != m_pVT->GetSectionEndPlace(m_wpCaret))
         SetCaret(m_pVT->GetNextWordPlace(m_wpCaret));
 
       if (m_SelState.IsExist())
         m_SelState.SetEndPos(m_wpCaret);
       else
         m_SelState.Set(m_wpOldCaret, m_wpCaret);
 
       if (m_wpOldCaret != m_wpCaret) {
         ScrollToCaret();
-        CPVT_WordRange wr(m_wpOldCaret, m_wpCaret);
-        Refresh(RP_OPTIONAL, &wr);
+        Refresh();
         SetCaretInfo();
       }
     } else {
       if (m_SelState.IsExist()) {
         if (m_SelState.BeginPos.WordCmp(m_SelState.EndPos) > 0)
           SetCaret(m_SelState.BeginPos);
         else
           SetCaret(m_SelState.EndPos);
 
         SelectNone();
@@ skipping 21 matching lines @@
         SetCaret(m_pVT->GetBeginWordPlace());
       else
         SetCaret(m_pVT->GetLineBeginPlace(m_wpCaret));
 
       if (m_SelState.IsExist())
         m_SelState.SetEndPos(m_wpCaret);
       else
         m_SelState.Set(m_wpOldCaret, m_wpCaret);
 
       ScrollToCaret();
-      CPVT_WordRange wr(m_wpOldCaret, m_wpCaret);
-      Refresh(RP_OPTIONAL, &wr);
+      Refresh();
       SetCaretInfo();
     } else {
       if (m_SelState.IsExist()) {
         if (m_SelState.BeginPos.WordCmp(m_SelState.EndPos) < 0)
           SetCaret(m_SelState.BeginPos);
         else
           SetCaret(m_SelState.EndPos);
 
         SelectNone();
         ScrollToCaret();
@@ skipping 19 matching lines @@
         SetCaret(m_pVT->GetEndWordPlace());
       else
         SetCaret(m_pVT->GetLineEndPlace(m_wpCaret));
 
       if (m_SelState.IsExist())
         m_SelState.SetEndPos(m_wpCaret);
       else
         m_SelState.Set(m_wpOldCaret, m_wpCaret);
 
       ScrollToCaret();
-      CPVT_WordRange wr(m_wpOldCaret, m_wpCaret);
-      Refresh(RP_OPTIONAL, &wr);
+      Refresh();
       SetCaretInfo();
     } else {
       if (m_SelState.IsExist()) {
         if (m_SelState.BeginPos.WordCmp(m_SelState.EndPos) > 0)
           SetCaret(m_SelState.BeginPos);
         else
           SetCaret(m_SelState.EndPos);
 
         SelectNone();
         ScrollToCaret();
         SetCaretInfo();
       } else {
         if (bCtrl)
           SetCaret(m_pVT->GetEndWordPlace());
         else
           SetCaret(m_pVT->GetLineEndPlace(m_wpCaret));
 
         ScrollToCaret();
         SetCaretOrigin();
         SetCaretInfo();
       }
     }
   }
 }
 
-void CFX_Edit::SetText(const FX_WCHAR* text,
-                       int32_t charset,
-                       const CPVT_SecProps* pSecProps,
-                       const CPVT_WordProps* pWordProps,
-                       FX_BOOL bAddUndo,
-                       FX_BOOL bPaint) {
-  Empty();
-  DoInsertText(CPVT_WordPlace(0, 0, -1), text, charset, pSecProps, pWordProps);
-  if (bPaint)
-    Paint();
-}
-
 FX_BOOL CFX_Edit::InsertWord(uint16_t word,
                              int32_t charset,
                              const CPVT_WordProps* pWordProps,
                              FX_BOOL bAddUndo,
                              FX_BOOL bPaint) {
   if (IsTextOverflow())
     return FALSE;
 
   if (m_pVT->IsValid()) {
     m_pVT->UpdateWordPlace(m_wpCaret);
@@ skipping 35 matching lines @@
 
     if (m_wpCaret != m_wpOldCaret) {
       if (bAddUndo && m_bEnableUndo) {
         AddEditUndoItem(new CFXEU_InsertReturn(this, m_wpOldCaret, m_wpCaret,
                                                pSecProps, pWordProps));
       }
 
       if (bPaint) {
         RearrangePart(CPVT_WordRange(m_wpOldCaret, m_wpCaret));
         ScrollToCaret();
-        CPVT_WordRange wr(m_wpOldCaret, GetVisibleWordRange().EndPos);
-        Refresh(RP_ANALYSE, &wr);
+        Refresh();
         SetCaretOrigin();
         SetCaretInfo();
       }
 
       if (m_bOprNotify && m_pOprNotify)
         m_pOprNotify->OnInsertReturn(m_wpCaret, m_wpOldCaret);
 
       return TRUE;
     }
   }
@@ skipping 28 matching lines @@
               section.SecProps, section.WordProps));
         else
           AddEditUndoItem(new CFXEU_Backspace(
               this, m_wpOldCaret, m_wpCaret, word.Word, word.nCharset,
               section.SecProps, word.WordProps));
       }
 
       if (bPaint) {
         RearrangePart(CPVT_WordRange(m_wpCaret, m_wpOldCaret));
         ScrollToCaret();
-
-        CPVT_WordRange wr;
-        if (m_wpCaret.SecCmp(m_wpOldCaret) != 0)
-          wr = CPVT_WordRange(m_pVT->GetPrevWordPlace(m_wpCaret),
-                              GetVisibleWordRange().EndPos);
-        else if (m_wpCaret.LineCmp(m_wpOldCaret) != 0)
-          wr = CPVT_WordRange(m_pVT->GetLineBeginPlace(m_wpCaret),
-                              m_pVT->GetSectionEndPlace(m_wpCaret));
-        else
-          wr = CPVT_WordRange(m_pVT->GetPrevWordPlace(m_wpCaret),
-                              m_pVT->GetSectionEndPlace(m_wpCaret));
-
-        Refresh(RP_ANALYSE, &wr);
-
+        Refresh();
         SetCaretOrigin();
         SetCaretInfo();
       }
 
       if (m_bOprNotify && m_pOprNotify)
         m_pOprNotify->OnBackSpace(m_wpCaret, m_wpOldCaret);
 
       return TRUE;
     }
   }
@@ skipping 29 matching lines @@
             section.SecProps, section.WordProps, bSecEnd));
       else
         AddEditUndoItem(new CFXEU_Delete(
             this, m_wpOldCaret, m_wpCaret, word.Word, word.nCharset,
             section.SecProps, word.WordProps, bSecEnd));
     }
 
     if (bPaint) {
       RearrangePart(CPVT_WordRange(m_wpOldCaret, m_wpCaret));
       ScrollToCaret();
-
-      CPVT_WordRange wr;
-      if (bSecEnd)
-        wr = CPVT_WordRange(m_pVT->GetPrevWordPlace(m_wpOldCaret),
-                            GetVisibleWordRange().EndPos);
-      else if (m_wpCaret.LineCmp(m_wpOldCaret) != 0)
-        wr = CPVT_WordRange(m_pVT->GetLineBeginPlace(m_wpCaret),
-                            m_pVT->GetSectionEndPlace(m_wpCaret));
-      else
-        wr = CPVT_WordRange(m_pVT->GetPrevWordPlace(m_wpOldCaret),
-                            m_pVT->GetSectionEndPlace(m_wpCaret));
-
-      Refresh(RP_ANALYSE, &wr);
-
+      Refresh();
       SetCaretOrigin();
       SetCaretInfo();
     }
 
     if (m_bOprNotify && m_pOprNotify)
       m_pOprNotify->OnDelete(m_wpCaret, m_wpOldCaret);
 
     return TRUE;
   }
 
@@ skipping 23 matching lines @@
   if (bAddUndo && m_bEnableUndo)
     AddEditUndoItem(new CFXEU_Clear(this, range, GetSelText()));
 
   SelectNone();
   SetCaret(m_pVT->DeleteWords(range));
   m_SelState.Set(m_wpCaret, m_wpCaret);
 
   if (bPaint) {
     RearrangePart(range);
     ScrollToCaret();
-
-    CPVT_WordRange wr(m_wpOldCaret, GetVisibleWordRange().EndPos);
-    Refresh(RP_ANALYSE, &wr);
-
+    Refresh();
     SetCaretOrigin();
     SetCaretInfo();
   }
 
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnClear(m_wpCaret, m_wpOldCaret);
 
   return TRUE;
 }
 
 FX_BOOL CFX_Edit::InsertText(const FX_WCHAR* text,
                              int32_t charset,
-                             const CPVT_SecProps* pSecProps,
-                             const CPVT_WordProps* pWordProps,
                              FX_BOOL bAddUndo,
                              FX_BOOL bPaint) {
   if (IsTextOverflow())
     return FALSE;
 
   m_pVT->UpdateWordPlace(m_wpCaret);
-  SetCaret(DoInsertText(m_wpCaret, text, charset, pSecProps, pWordProps));
+  SetCaret(DoInsertText(m_wpCaret, text, charset));
   m_SelState.Set(m_wpCaret, m_wpCaret);
 
   if (m_wpCaret != m_wpOldCaret) {
     if (bAddUndo && m_bEnableUndo) {
-      AddEditUndoItem(new CFXEU_InsertText(this, m_wpOldCaret, m_wpCaret, text,
-                                           charset, pSecProps, pWordProps));
+      AddEditUndoItem(
+          new CFXEU_InsertText(this, m_wpOldCaret, m_wpCaret, text, charset));
     }
 
     if (bPaint)
       PaintInsertText(m_wpOldCaret, m_wpCaret);
 
     if (m_bOprNotify && m_pOprNotify)
       m_pOprNotify->OnInsertText(m_wpCaret, m_wpOldCaret);
 
     return TRUE;
   }
   return FALSE;
 }
 
 void CFX_Edit::PaintInsertText(const CPVT_WordPlace& wpOld,
                                const CPVT_WordPlace& wpNew) {
   if (m_pVT->IsValid()) {
     RearrangePart(CPVT_WordRange(wpOld, wpNew));
     ScrollToCaret();
-
-    CPVT_WordRange wr;
-    if (m_wpCaret.LineCmp(wpOld) != 0)
-      wr = CPVT_WordRange(m_pVT->GetLineBeginPlace(wpOld),
-                          m_pVT->GetSectionEndPlace(wpNew));
-    else
-      wr = CPVT_WordRange(wpOld, m_pVT->GetSectionEndPlace(wpNew));
-    Refresh(RP_ANALYSE, &wr);
+    Refresh();
     SetCaretOrigin();
     SetCaretInfo();
   }
 }
 
 FX_BOOL CFX_Edit::Redo() {
   if (m_bEnableUndo) {
     if (m_Undo.CanRedo()) {
       m_Undo.Redo();
       return TRUE;
@@ skipping 145 matching lines @@
   CPVT_Line line;
   pIterator->GetLine(line);
 
   pIterator->SetAt(wpOld);
 
   return line.ptLine.y + line.fLineDescent;
 }
 
 CPVT_WordPlace CFX_Edit::DoInsertText(const CPVT_WordPlace& place,
                                       const FX_WCHAR* text,
-                                      int32_t charset,
-                                      const CPVT_SecProps* pSecProps,
-                                      const CPVT_WordProps* pWordProps) {
+                                      int32_t charset) {
   CPVT_WordPlace wp = place;
 
   if (m_pVT->IsValid()) {
     CFX_WideString sText = text;
 
     for (int32_t i = 0, sz = sText.GetLength(); i < sz; i++) {
       uint16_t word = sText[i];
       switch (word) {
         case 0x0D:
-          wp = m_pVT->InsertSection(wp, pSecProps, pWordProps);
+          wp = m_pVT->InsertSection(wp, nullptr, nullptr);
           if (sText[i + 1] == 0x0A)
             i++;
           break;
         case 0x0A:
-          wp = m_pVT->InsertSection(wp, pSecProps, pWordProps);
+          wp = m_pVT->InsertSection(wp, nullptr, nullptr);
           if (sText[i + 1] == 0x0D)
             i++;
           break;
         case 0x09:
           word = 0x20;
         default:
           wp = m_pVT->InsertWord(wp, word, GetCharSetFromUnicode(word, charset),
-                                 pWordProps);
+                                 nullptr);
           break;
       }
     }
   }
 
   return wp;
 }
 
 int32_t CFX_Edit::GetCharSetFromUnicode(uint16_t word, int32_t nOldCharset) {
   if (IPVT_FontMap* pFontMap = GetFontMap())
@@ skipping 135 matching lines @@
 int32_t CFX_Edit_RectArray::GetSize() const {
   return m_Rects.GetSize();
 }
 
 CFX_FloatRect* CFX_Edit_RectArray::GetAt(int32_t nIndex) const {
   if (nIndex < 0 || nIndex >= m_Rects.GetSize())
     return nullptr;
 
   return m_Rects.GetAt(nIndex);
 }