summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorjinming_wang <jinming_wang@foxitsoftware.com>2016-03-18 16:35:40 +0800
committerjinming_wang <jinming_wang@foxitsoftware.com>2016-03-18 16:35:40 +0800
commita1cef70c08a16e2b9d7ec14987a8b20660d83534 (patch)
treebaf5d5e71a2d33fca8793288e97e77a28a00f6ac /fpdfsdk
parent900323a8857ce0d9f6a57e535cd864b0f649bb9c (diff)
downloadpdfium-a1cef70c08a16e2b9d7ec14987a8b20660d83534.tar.xz
Trigger page view event when re-layout is finished
BUG=pdfium:401 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1758553003 .
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp60
-rw-r--r--fpdfsdk/fsdk_mgr.cpp7
-rw-r--r--fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h9
-rw-r--r--fpdfsdk/include/fsdk_mgr.h4
4 files changed, 60 insertions, 20 deletions
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
index 6e0edf646e..d13bbec6cf 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
@@ -44,9 +44,13 @@ CPDFXFA_Document::CPDFXFA_Document(CPDF_Document* pPDFDoc,
m_pXFADoc(nullptr),
m_pXFADocView(nullptr),
m_pApp(pProvider),
- m_pJSContext(nullptr) {}
+ m_pJSContext(nullptr),
+ m_nLoadStatus(FXFA_LOADSTATUS_PRELOAD),
+ m_nPageCount(0) {}
CPDFXFA_Document::~CPDFXFA_Document() {
+ m_nLoadStatus = FXFA_LOADSTATUS_CLOSING;
+
if (m_pXFADoc) {
IXFA_App* pApp = m_pApp->GetXFAApp();
if (pApp) {
@@ -67,9 +71,13 @@ CPDFXFA_Document::~CPDFXFA_Document() {
else
delete m_pPDFDoc;
}
+
+ m_nLoadStatus = FXFA_LOADSTATUS_CLOSED;
}
FX_BOOL CPDFXFA_Document::LoadXFADoc() {
+ m_nLoadStatus = FXFA_LOADSTATUS_LOADING;
+
if (!m_pPDFDoc)
return FALSE;
@@ -115,6 +123,8 @@ FX_BOOL CPDFXFA_Document::LoadXFADoc() {
m_pXFADocView->DoLayout(NULL);
m_pXFADocView->StopLayout();
+ m_nLoadStatus = FXFA_LOADSTATUS_LOADED;
+
return TRUE;
}
@@ -147,7 +157,8 @@ CPDFXFA_Page* CPDFXFA_Document::GetPage(int page_index) {
if (pPage)
pPage->AddRef();
} else {
- m_XFAPageList.SetSize(GetPageCount());
+ m_nPageCount = GetPageCount();
+ m_XFAPageList.SetSize(m_nPageCount);
}
if (pPage)
return pPage;
@@ -480,25 +491,38 @@ FX_BOOL CPDFXFA_Document::PopupMenu(IXFA_Widget* hWidget,
void CPDFXFA_Document::PageViewEvent(IXFA_PageView* pPageView,
FX_DWORD dwFlags) {
- if (!pPageView || (dwFlags != XFA_PAGEVIEWEVENT_PostAdded &&
- dwFlags != XFA_PAGEVIEWEVENT_PostRemoved)) {
- return;
- }
- CPDFXFA_Page* pPage = nullptr;
CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
- if (dwFlags == XFA_PAGEVIEWEVENT_PostAdded) {
- int nPageIndex = pPageView->GetPageViewIndex();
- pPage = GetPage(nPageIndex);
- if (pPage)
- pPage->SetXFAPageView(pPageView);
- pEnv->FFI_PageEvent(nPageIndex, dwFlags);
+ if (!pEnv)
return;
+
+ if (m_nLoadStatus != FXFA_LOADSTATUS_LOADING &&
+ m_nLoadStatus != FXFA_LOADSTATUS_CLOSING &&
+ XFA_PAGEVIEWEVENT_StopLayout == dwFlags) {
+ int nNewCount = GetPageCount();
+ if (nNewCount == m_nPageCount)
+ return;
+
+ IXFA_DocView* pXFADocView = GetXFADocView();
+ if (!pXFADocView)
+ return;
+ for (int iPageIter = 0; iPageIter < m_nPageCount; iPageIter++) {
+ CPDFXFA_Page* pPage = m_XFAPageList.GetAt(iPageIter);
+ if (!pPage)
+ continue;
+ m_pSDKDoc->RemovePageView(pPage);
+ IXFA_PageView* pXFAPageView = pXFADocView->GetPageView(iPageIter);
+ pPage->SetXFAPageView(pXFAPageView);
+ if (pXFAPageView)
+ pXFAPageView->LoadPageView(nullptr);
+ }
+
+ int flag = (nNewCount < m_nPageCount) ? FXFA_PAGEVIEWEVENT_POSTREMOVED
+ : FXFA_PAGEVIEWEVENT_POSTADDED;
+ int count = FXSYS_abs(nNewCount - m_nPageCount);
+ m_nPageCount = nNewCount;
+ m_XFAPageList.SetSize(nNewCount);
+ pEnv->FFI_PageEvent(count, flag);
}
- pPage = GetPage(pPageView);
- if (!pPage)
- return;
- pEnv->FFI_PageEvent(pPage->GetPageIndex(), dwFlags);
- pPage->Release();
}
void CPDFXFA_Document::WidgetEvent(IXFA_Widget* hWidget,
diff --git a/fpdfsdk/fsdk_mgr.cpp b/fpdfsdk/fsdk_mgr.cpp
index 423bb8263a..1ff1ca7ca3 100644
--- a/fpdfsdk/fsdk_mgr.cpp
+++ b/fpdfsdk/fsdk_mgr.cpp
@@ -858,6 +858,13 @@ FX_BOOL CPDFSDK_PageView::DeleteAnnot(CPDFSDK_Annot* pAnnot) {
pPage->GetDocument()->GetDocType() != DOCTYPE_DYNAMIC_XFA))
return FALSE;
+ if (GetFocusAnnot() == pAnnot)
+ KillFocusAnnot();
+ CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
+ CPDFSDK_AnnotHandlerMgr* pAnnotHandler = pEnv->GetAnnotHandlerMgr();
+ if (pAnnotHandler)
+ pAnnotHandler->ReleaseAnnot(pAnnot);
+
auto it = std::find(m_fxAnnotArray.begin(), m_fxAnnotArray.end(), pAnnot);
if (it != m_fxAnnotArray.end())
m_fxAnnotArray.erase(it);
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
index 55310e5615..5186fe51ab 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h
@@ -204,6 +204,13 @@ class CPDFXFA_Document : public IXFA_DocProvider {
void _ClearChangeMark();
private:
+ enum LoadStatus {
+ FXFA_LOADSTATUS_PRELOAD = 0,
+ FXFA_LOADSTATUS_LOADING,
+ FXFA_LOADSTATUS_LOADED,
+ FXFA_LOADSTATUS_CLOSING,
+ FXFA_LOADSTATUS_CLOSED
+ };
void CloseXFADoc(IXFA_DocHandler* pDoc) {
if (pDoc) {
pDoc->CloseDoc(m_pXFADoc);
@@ -221,6 +228,8 @@ class CPDFXFA_Document : public IXFA_DocProvider {
CPDFXFA_App* m_pApp;
IJS_Context* m_pJSContext;
CFX_ArrayTemplate<CPDFXFA_Page*> m_XFAPageList;
+ LoadStatus m_nLoadStatus;
+ int m_nPageCount;
};
#endif // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_DOC_H_
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 88b539f7e7..b80e797f18 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -398,9 +398,9 @@ class CPDFDoc_Environment final {
return L"";
}
- void FFI_PageEvent(int iPageIndex, FX_DWORD dwEventType) const {
+ void FFI_PageEvent(int iPageCount, FX_DWORD dwEventType) const {
if (m_pInfo && m_pInfo->FFI_PageEvent)
- m_pInfo->FFI_PageEvent(m_pInfo, iPageIndex, dwEventType);
+ m_pInfo->FFI_PageEvent(m_pInfo, iPageCount, dwEventType);
}
#endif // PDF_ENABLE_XFA