summaryrefslogtreecommitdiff
path: root/fpdfsdk/javascript
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-10-05 12:00:34 -0700
committerCommit bot <commit-bot@chromium.org>2016-10-05 12:00:34 -0700
commit8afe15a019c78a24168ebc42306342c25358ccdf (patch)
tree09012697e63b0a1fa4654f6e6f93b69a04421171 /fpdfsdk/javascript
parent7c1b07fde27dfbbf1d979d9dfd616b1a42591e5f (diff)
downloadpdfium-8afe15a019c78a24168ebc42306342c25358ccdf.tar.xz
Cleanup some CPDFSDK_PageView annotation code.
This Cl cleans up the code regarding CPDFSDK_Annots in CPDFSDK_PageView. This includes: * Makes DeleteAnnot XFA only and wraps at the call site. * Removes unused methods * Replaces use of CountAnnots and GetAnnot with vector iteration * Removes {Set|Kill}FocusAnnot from CPDFSDK_PageView * Renames m_fxAnnotArray to m_SDKAnnotArray Review-Url: https://codereview.chromium.org/2384323005
Diffstat (limited to 'fpdfsdk/javascript')
-rw-r--r--fpdfsdk/javascript/Document.cpp2
-rw-r--r--fpdfsdk/javascript/app.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp
index 233097e42c..c143edd88a 100644
--- a/fpdfsdk/javascript/Document.cpp
+++ b/fpdfsdk/javascript/Document.cpp
@@ -531,7 +531,9 @@ FX_BOOL Document::removeField(IJS_Context* cc,
// and creating a new pageview at this point will cause bad things.
CPDFSDK_PageView* pPageView = m_pDocument->GetPageView(pPage, false);
if (pPageView) {
+#if PDF_ENABLE_XFA
pPageView->DeleteAnnot(pWidget);
+#endif // PDF_ENABLE_XFA
pPageView->UpdateRects(aRefresh);
}
}
diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp
index eba8d4d74f..55f976e522 100644
--- a/fpdfsdk/javascript/app.cpp
+++ b/fpdfsdk/javascript/app.cpp
@@ -433,7 +433,7 @@ FX_BOOL app::alert(IJS_Context* cc,
pRuntime->BeginBlock();
if (CPDFSDK_Document* pDoc = pEnv->GetSDKDocument())
- pDoc->KillFocusAnnot();
+ pDoc->KillFocusAnnot(0);
vRet = CJS_Value(pRuntime, pEnv->JS_appAlert(swMsg.c_str(), swTitle.c_str(),
iType, iIcon));