Cleanup some CPDFSDK_PageView annotation code.

fpdfsdk/cpdfsdk_document.cpp

 // Copyright 2016 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/cpdfsdk_document.h"
 
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
@@ skipping 21 matching lines @@
 CPDFSDK_Document::CPDFSDK_Document(UnderlyingDocumentType* pDoc,
                                    CPDFSDK_Environment* pEnv)
     : m_pDoc(pDoc),
       m_pEnv(pEnv),
       m_bChangeMask(FALSE),
       m_bBeingDestroyed(FALSE) {}
 
 CPDFSDK_Document::~CPDFSDK_Document() {
   m_bBeingDestroyed = TRUE;
 
-  for (auto& it : m_pageMap)
-    it.second->KillFocusAnnotIfNeeded();
+  for (auto& it : m_pageMap) {
+    if (it.second->IsValidSDKAnnot(GetFocusAnnot()))
+      KillFocusAnnot(0);
+  }
 
   for (auto& it : m_pageMap)
     delete it.second;
   m_pageMap.clear();
 }
 
 CPDFSDK_PageView* CPDFSDK_Document::GetPageView(
     UnderlyingPageType* pUnderlyingPage,
     bool ReNew) {
   auto it = m_pageMap.find(pUnderlyingPage);
@@ skipping 83 matching lines @@
 
   CPDFSDK_PageView* pPageView = it->second;
   if (pPageView->IsLocked() || pPageView->IsBeingDestroyed())
     return;
 
   // Mark the page view so we do not come into |RemovePageView| a second
   // time while we're in the process of removing.
   pPageView->SetBeingDestroyed();
 
   // This must happen before we remove |pPageView| from the map because
-  // |KillFocusAnnotIfNeeded| can call into the |GetPage| method which will
+  // |KillFocusAnnot| can call into the |GetPage| method which will
   // look for this page view in the map, if it doesn't find it a new one will
   // be created. We then have two page views pointing to the same page and
   // bad things happen.
-  pPageView->KillFocusAnnotIfNeeded();
+  if (pPageView->IsValidSDKAnnot(GetFocusAnnot()))
+    KillFocusAnnot(0);
 
   // Remove the page from the map to make sure we don't accidentally attempt
   // to use the |pPageView| while we're cleaning it up.
   m_pageMap.erase(it);
 
   delete pPageView;
 }
 
 UnderlyingPageType* CPDFSDK_Document::GetPage(int nIndex) {
   return UnderlyingFromFPDFPage(m_pEnv->GetPage(m_pDoc, nIndex));
 }
 
 CPDFSDK_InterForm* CPDFSDK_Document::GetInterForm() {
   if (!m_pInterForm)
     m_pInterForm = pdfium::MakeUnique<CPDFSDK_InterForm>(this);
   return m_pInterForm.get();
 }
 
 void CPDFSDK_Document::UpdateAllViews(CPDFSDK_PageView* pSender,
                                       CPDFSDK_Annot* pAnnot) {
   for (const auto& it : m_pageMap) {
     CPDFSDK_PageView* pPageView = it.second;
-    if (pPageView != pSender) {
+    if (pPageView != pSender)
       pPageView->UpdateView(pAnnot);
-    }
   }
 }
 
-CPDFSDK_Annot* CPDFSDK_Document::GetFocusAnnot() {
-  return m_pFocusAnnot.Get();
-}
-
-FX_BOOL CPDFSDK_Document::SetFocusAnnot(CPDFSDK_Annot::ObservedPtr* pAnnot,
-                                        uint32_t nFlag) {
+FX_BOOL CPDFSDK_Document::SetFocusAnnot(CPDFSDK_Annot::ObservedPtr* pAnnot) {
   if (m_bBeingDestroyed)
     return FALSE;
-
   if (m_pFocusAnnot == *pAnnot)
     return TRUE;
-
-  if (m_pFocusAnnot) {
-    if (!KillFocusAnnot(nFlag))
-      return FALSE;
-  }
-
+  if (m_pFocusAnnot && !KillFocusAnnot(0))
+    return FALSE;
   if (!*pAnnot)
     return FALSE;
 
 #ifdef PDF_ENABLE_XFA
   CPDFSDK_Annot::ObservedPtr pLastFocusAnnot(m_pFocusAnnot.Get());
 #endif  // PDF_ENABLE_XFA
   CPDFSDK_PageView* pPageView = (*pAnnot)->GetPageView();
   if (pPageView && pPageView->IsValid()) {
     CPDFSDK_AnnotHandlerMgr* pAnnotHandler = m_pEnv->GetAnnotHandlerMgr();
     if (!m_pFocusAnnot) {
 #ifdef PDF_ENABLE_XFA
       if (!pAnnotHandler->Annot_OnChangeFocus(pAnnot, &pLastFocusAnnot))
         return FALSE;
 #endif  // PDF_ENABLE_XFA
-      if (!pAnnotHandler->Annot_OnSetFocus(pAnnot, nFlag))
+      if (!pAnnotHandler->Annot_OnSetFocus(pAnnot, 0))
         return FALSE;
       if (!m_pFocusAnnot) {
         m_pFocusAnnot.Reset(pAnnot->Get());
         return TRUE;
       }
     }
   }
   return FALSE;
 }
 
@@ skipping 22 matching lines @@
       if (!m_pFocusAnnot)
         return TRUE;
     } else {
       m_pFocusAnnot.Reset(pFocusAnnot.Get());
     }
   }
   return FALSE;
 }
 
 void CPDFSDK_Document::OnCloseDocument() {
-  KillFocusAnnot();
+  KillFocusAnnot(0);
 }
 
 FX_BOOL CPDFSDK_Document::GetPermissions(int nFlag) {
   return GetPDFDocument()->GetUserPermissions() & nFlag;
 }
 
 IJS_Runtime* CPDFSDK_Document::GetJsRuntime() {
   return m_pEnv->GetJSRuntime();
 }
 
 CFX_WideString CPDFSDK_Document::GetPath() {
   return m_pEnv->JS_docGetFilePath();
 }