Fix an assertion failure in CXFA_DefFontMgr::GetDefaultFont()

xfa/src/fxfa/src/app/xfa_ffnotify.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/src/foxitlib.h"
 #include "xfa/src/fxfa/src/common/xfa_common.h"
 #include "xfa_fwladapter.h"
 #include "xfa_ffdocview.h"
@@ skipping 533 matching lines @@
                                  void* pParam2) {
   if (!pSender->IsFormContainer()) {
     return;
   }
   CXFA_FFDocView* pDocView = m_pDoc->GetDocView();
   if (!pDocView) {
     return;
   }
   FX_BOOL bLayoutReady =
       !(pDocView->m_bInLayoutStatus) &&
-      (pDocView->GetLayoutStatus() >= XFA_DOCVIEW_LAYOUTSTATUS_End);
+      (pDocView->GetLayoutStatus() == XFA_DOCVIEW_LAYOUTSTATUS_End);
   if (bLayoutReady) {
     m_pDoc->GetDocProvider()->SetChangeMark(m_pDoc);
   }
 }
 void CXFA_FFNotify::OnChildRemoved(CXFA_Node* pSender,
                                    void* pParam,
                                    void* pParam2) {
   if (CXFA_FFDocView* pDocView = m_pDoc->GetDocView()) {
     FX_BOOL bLayoutReady =
         !(pDocView->m_bInLayoutStatus) &&
-        (pDocView->GetLayoutStatus() >= XFA_DOCVIEW_LAYOUTSTATUS_End);
+        (pDocView->GetLayoutStatus() == XFA_DOCVIEW_LAYOUTSTATUS_End);
     if (bLayoutReady) {
       m_pDoc->GetDocProvider()->SetChangeMark(m_pDoc);
     }
   }
 }
 void CXFA_FFNotify::OnLayoutItemAdd(CXFA_FFDocView* pDocView,
                                     IXFA_DocLayout* pLayout,
                                     CXFA_LayoutItem* pSender,
                                     void* pParam,
                                     void* pParam2) {
   CXFA_FFWidget* pWidget = static_cast<CXFA_FFWidget*>(pSender);
   int32_t iPageIdx = (int32_t)(uintptr_t)pParam;
   IXFA_PageView* pNewPageView = pDocView->GetPageView(iPageIdx);
   FX_DWORD dwStatus = (FX_DWORD)(uintptr_t)pParam2;
   FX_DWORD dwFilter = XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable |
                       XFA_WIDGETSTATUS_Printable;
   pWidget->ModifyStatus(dwStatus, dwFilter);
-  if (pDocView->GetLayoutStatus() >= XFA_DOCVIEW_LAYOUTSTATUS_End) {
-    IXFA_PageView* pPrePageView = pWidget->GetPageView();
-    if (pPrePageView != pNewPageView ||
-        (dwStatus & (XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable)) ==
-            (XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable)) {
-      pWidget->SetPageView(pNewPageView);
-      m_pDoc->GetDocProvider()->WidgetEvent(pWidget, pWidget->GetDataAcc(),
-                                            XFA_WIDGETEVENT_PostAdded,
-                                            pNewPageView, pPrePageView);
-    }
-    if ((dwStatus & XFA_WIDGETSTATUS_Visible) == 0) {
-      return;
-    }
-    if (pWidget->IsLoaded()) {
-      CFX_RectF rtOld;
-      pWidget->GetWidgetRect(rtOld);
-      CFX_RectF rtNew = pWidget->ReCacheWidgetRect();
-      if (rtOld != rtNew) {
-        pWidget->PerformLayout();
-      }
-    } else {
-      pWidget->LoadWidget();
-    }
-    pWidget->AddInvalidateRect(NULL);
+  IXFA_PageView* pPrePageView = pWidget->GetPageView();
+  if (pPrePageView != pNewPageView ||
+      (dwStatus & (XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable)) ==
+          (XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable)) {
+    pWidget->SetPageView(pNewPageView);
+    m_pDoc->GetDocProvider()->WidgetEvent(pWidget, pWidget->GetDataAcc(),
+                                          XFA_WIDGETEVENT_PostAdded,
+                                          pNewPageView, pPrePageView);
+  }
+  if (pDocView->GetLayoutStatus() != XFA_DOCVIEW_LAYOUTSTATUS_End ||
+      !(dwStatus & XFA_WIDGETSTATUS_Visible)) {
+    return;
+  }
+  if (pWidget->IsLoaded()) {
+    CFX_RectF rtOld;
+    pWidget->GetWidgetRect(rtOld);
+    if (rtOld != pWidget->ReCacheWidgetRect())
+      pWidget->PerformLayout();
   } else {
-    pWidget->SetPageView(pNewPageView);
+    pWidget->LoadWidget();
   }
+  pWidget->AddInvalidateRect(nullptr);
 }
 void CXFA_FFNotify::OnLayoutItemRemoving(CXFA_FFDocView* pDocView,
                                          IXFA_DocLayout* pLayout,
                                          CXFA_LayoutItem* pSender,
                                          void* pParam,
                                          void* pParam2) {
   CXFA_FFWidget* pWidget = static_cast<CXFA_FFWidget*>(pSender);
   pDocView->DeleteLayoutItem(pWidget);
-  if (pDocView->GetLayoutStatus() < XFA_DOCVIEW_LAYOUTSTATUS_End)
-    return;
   m_pDoc->GetDocProvider()->WidgetEvent(pWidget, pWidget->GetDataAcc(),
                                         XFA_WIDGETEVENT_PreRemoved, nullptr,
                                         pWidget->GetPageView());
   pWidget->AddInvalidateRect(nullptr);
 }
 void CXFA_FFNotify::OnLayoutItemRectChanged(CXFA_FFDocView* pDocView,
                                             IXFA_DocLayout* pLayout,
                                             CXFA_LayoutItem* pSender,
                                             void* pParam,
                                             void* pParam2) {
@@ skipping 18 matching lines @@
     }
   }
   FX_DWORD dwOldStatus = pWidget->GetStatus();
   FX_DWORD dwFilter = XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable |
                       XFA_WIDGETSTATUS_Printable;
   if ((dwOldStatus & dwFilter) == dwStatus) {
     return;
   }
   pWidget->ModifyStatus(dwStatus, dwFilter);
 }