Cleanup caret show/hide code

xfa/fwl/core/cfwl_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 "xfa/fwl/core/cfwl_edit.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 63 matching lines @@
       m_iMaxRecord(128) {
   m_rtClient.Reset();
   m_rtEngine.Reset();
   m_rtStatic.Reset();
 
   InitCaret();
 }
 
 CFWL_Edit::~CFWL_Edit() {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused)
-    ShowCaret(false);
+    HideCaret(nullptr);
   ClearRecord();
 }
 
 FWL_Type CFWL_Edit::GetClassID() const {
   return FWL_Type::Edit;
 }
 
 void CFWL_Edit::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   if (!bAutoSize) {
     rect = m_pProperties->m_rtWidget;
@@ skipping 23 matching lines @@
         wsText, m_pProperties->m_pThemeProvider,
         !!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine));
     rect.Set(0, 0, sz.x, sz.y);
   }
   CFWL_Widget::GetWidgetRect(rect, true);
 }
 
 void CFWL_Edit::SetStates(uint32_t dwStates, bool bSet) {
   if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Invisible) ||
       (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)) {
-    ShowCaret(false);
+    HideCaret(nullptr);
   }
   CFWL_Widget::SetStates(dwStates, bSet);
 }
 
 void CFWL_Edit::Update() {
   if (IsLocked())
     return;
   if (!m_pProperties->m_pThemeProvider)
     m_pProperties->m_pThemeProvider = GetAvailableTheme();
 
@@ skipping 744 matching lines @@
   CFX_RectF rtClient;
   GetClientRect(rtClient);
   rtCaret.Intersect(rtClient);
 
   if (rtCaret.left > rtClient.right()) {
     FX_FLOAT right = rtCaret.right();
     rtCaret.left = rtClient.right() - 1;
     rtCaret.width = right - rtCaret.left;
   }
 
-  bool bShow =
-      m_pProperties->m_dwStates & FWL_WGTSTATE_Focused && !rtCaret.IsEmpty();
-  ShowCaret(bShow, &rtCaret);
+  if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused && !rtCaret.IsEmpty())
+    ShowCaret(&rtCaret);
+  else
+    HideCaret(&rtCaret);
 }
 
 CFWL_ScrollBar* CFWL_Edit::UpdateScroll() {
   bool bShowHorz =
       m_pHorzScrollBar &&
       ((m_pHorzScrollBar->GetStates() & FWL_WGTSTATE_Invisible) == 0);
   bool bShowVert =
       m_pVertScrollBar &&
       ((m_pVertScrollBar->GetStates() & FWL_WGTSTATE_Invisible) == 0);
   if (!bShowHorz && !bShowVert)
@@ skipping 253 matching lines @@
   prop->m_pParent = this;
   prop->m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
   CFWL_ScrollBar* sb = new CFWL_ScrollBar(m_pOwnerApp, std::move(prop), this);
   if (bVert)
     m_pVertScrollBar.reset(sb);
   else
     m_pHorzScrollBar.reset(sb);
 }
 
-bool FWL_ShowCaret(CFWL_Widget* pWidget,
-                   bool bVisible,
-                   const CFX_RectF* pRtAnchor) {
-  CXFA_FFWidget* pXFAWidget =
-      static_cast<CXFA_FFWidget*>(pWidget->GetLayoutItem());
-  if (!pXFAWidget)
-    return false;
-
-  IXFA_DocEnvironment* pDocEnvironment =
-      pXFAWidget->GetDoc()->GetDocEnvironment();
-  if (!pDocEnvironment)
-    return false;
-
-  if (bVisible) {
-    CFX_Matrix mt;
-    pXFAWidget->GetRotateMatrix(mt);
-    CFX_RectF rt(*pRtAnchor);
-    mt.TransformRect(rt);
-    pDocEnvironment->DisplayCaret(pXFAWidget, bVisible, &rt);
-    return true;
-  }
-
-  pDocEnvironment->DisplayCaret(pXFAWidget, bVisible, pRtAnchor);
-  return true;
-}
-
-void CFWL_Edit::ShowCaret(bool bVisible, CFX_RectF* pRect) {
+void CFWL_Edit::ShowCaret(CFX_RectF* pRect) {
   if (m_pCaret) {
-    m_pCaret->ShowCaret(bVisible);
-    if (bVisible && !pRect->IsEmpty())
+    m_pCaret->ShowCaret();
+    if (!pRect->IsEmpty())
       m_pCaret->SetWidgetRect(*pRect);
     Repaint(&m_rtEngine);
     return;
   }
 
   CFWL_Widget* pOuter = this;
-  if (bVisible) {
-    pRect->Offset(m_pProperties->m_rtWidget.left,
-                  m_pProperties->m_rtWidget.top);
-  }
+  pRect->Offset(m_pProperties->m_rtWidget.left, m_pProperties->m_rtWidget.top);
   while (pOuter->GetOuter()) {
     pOuter = pOuter->GetOuter();
-    if (bVisible) {
-      CFX_RectF rtOuter;
-      pOuter->GetWidgetRect(rtOuter);
-      pRect->Offset(rtOuter.left, rtOuter.top);
-    }
+
+    CFX_RectF rtOuter;
+    pOuter->GetWidgetRect(rtOuter);
+    pRect->Offset(rtOuter.left, rtOuter.top);
   }
-  FWL_ShowCaret(pOuter, bVisible, pRect);
+
+  CXFA_FFWidget* pXFAWidget =
+      static_cast<CXFA_FFWidget*>(pOuter->GetLayoutItem());
+  if (!pXFAWidget)
+    return;
+
+  IXFA_DocEnvironment* pDocEnvironment =
+      pXFAWidget->GetDoc()->GetDocEnvironment();
+  if (!pDocEnvironment)
+    return;
+
+  CFX_Matrix mt;
+  pXFAWidget->GetRotateMatrix(mt);
+
+  CFX_RectF rt(*pRect);
+  mt.TransformRect(rt);
+  pDocEnvironment->DisplayCaret(pXFAWidget, true, &rt);
+}
+
+void CFWL_Edit::HideCaret(CFX_RectF* pRect) {
+  if (m_pCaret) {
+    m_pCaret->HideCaret();
+    Repaint(&m_rtEngine);
+    return;
+  }
+
+  CFWL_Widget* pOuter = this;
+  while (pOuter->GetOuter())
+    pOuter = pOuter->GetOuter();
+
+  CXFA_FFWidget* pXFAWidget =
+      static_cast<CXFA_FFWidget*>(pOuter->GetLayoutItem());
+  if (!pXFAWidget)
+    return;
+
+  IXFA_DocEnvironment* pDocEnvironment =
+      pXFAWidget->GetDoc()->GetDocEnvironment();
+  if (!pDocEnvironment)
+    return;
+
+  pDocEnvironment->DisplayCaret(pXFAWidget, false, pRect);
 }
 
 bool CFWL_Edit::ValidateNumberChar(FX_WCHAR cNum) {
   if (!m_bSetRange)
     return true;
 
   CFX_WideString wsText = m_EdtEngine.GetText(0);
   if (wsText.IsEmpty()) {
     if (cNum == L'0')
       return false;
@@ skipping 15 matching lines @@
   }
 
   if (wsText.GetInteger() <= m_iMax)
     return true;
   return false;
 }
 
 void CFWL_Edit::InitCaret() {
   if (!m_pCaret) {
     if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_InnerCaret)) {
-      m_pCaret.reset(new CFWL_Caret(
-          m_pOwnerApp, pdfium::MakeUnique<CFWL_WidgetProperties>(), this));
+      m_pCaret = pdfium::MakeUnique<CFWL_Caret>(
+          m_pOwnerApp, pdfium::MakeUnique<CFWL_WidgetProperties>(), this);
       m_pCaret->SetParent(this);
       m_pCaret->SetStates(m_pProperties->m_dwStates);
     }
   } else if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_InnerCaret) ==
              0) {
     m_pCaret.reset();
   }
 }
 
 void CFWL_Edit::ClearRecord() {
@@ skipping 99 matching lines @@
   uint32_t dwStyleEx = GetStylesEx();
   bool bRepaint = !!(dwStyleEx & FWL_STYLEEXT_EDT_InnerCaret);
   if (bSet) {
     m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
 
     UpdateVAlignment();
     UpdateOffset();
     UpdateCaret();
   } else if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) {
     m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
-    ShowCaret(false);
+    HideCaret(nullptr);
     if ((dwStyleEx & FWL_STYLEEXT_EDT_NoHideSel) == 0) {
       int32_t nSel = CountSelRanges();
       if (nSel > 0) {
         ClearSelections();
         bRepaint = true;
       }
       m_EdtEngine.SetCaretPos(0, true);
       UpdateOffset();
     }
     ClearRecord();
@@ skipping 251 matching lines @@
   UpdateOffset(pScrollBar, fPos - iCurPos);
   UpdateCaret();
 
   CFX_RectF rect;
   GetWidgetRect(rect);
   CFX_RectF rtInvalidate;
   rtInvalidate.Set(0, 0, rect.width + 2, rect.height + 2);
   Repaint(&rtInvalidate);
   return true;
 }