summaryrefslogtreecommitdiff
path: root/fpdfsdk/include
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-06-08 06:11:20 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-08 06:11:20 -0700
commitd3be111cac2bb20e1917b3fae2102e742bb7efdb (patch)
treed985aa96a5aaaf356d32f28bbcb0cc6b470d4b05 /fpdfsdk/include
parenta431e238ee42025cce44c3a76dd07c470d7f51ec (diff)
downloadpdfium-d3be111cac2bb20e1917b3fae2102e742bb7efdb.tar.xz
Fix GetPageIndex() for dynamic XFA documents.
BUG=614211 Review-Url: https://codereview.chromium.org/2045013004
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r--fpdfsdk/include/fsdk_mgr.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index bf11a23765..84dea23b72 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -32,10 +32,6 @@ class CPDFSDK_PageView;
class CPDFSDK_Widget;
class IJS_Runtime;
-// NOTE: |bsUTF16LE| must outlive the use of the result. Care must be taken
-// since modifying the result would impact |bsUTF16LE|.
-FPDF_WIDESTRING AsFPDFWideString(CFX_ByteString* bsUTF16LE);
-
class CPDFDoc_Environment final {
public:
CPDFDoc_Environment(UnderlyingDocumentType* pDoc, FPDF_FORMFILLINFO* pFFinfo);
@@ -604,7 +600,7 @@ class CPDFSDK_PageView final : public CPDF_Page::View {
return m_fxAnnotArray;
}
- int GetPageIndex();
+ int GetPageIndex() const;
void LoadFXAnnots();
void ClearFXAnnots();
void SetValid(FX_BOOL bValid) { m_bValid = bValid; }
@@ -616,11 +612,10 @@ class CPDFSDK_PageView final : public CPDF_Page::View {
#endif // PDF_ENABLE_XFA
private:
- void PageView_OnHighlightFormFields(CFX_RenderDevice* pDevice,
- CPDFSDK_Widget* pWidget);
+ int GetPageIndexForStaticPDF() const;
CFX_Matrix m_curMatrix;
- UnderlyingPageType* m_page;
+ UnderlyingPageType* const m_page;
std::unique_ptr<CPDF_AnnotList> m_pAnnotList;
std::vector<CPDFSDK_Annot*> m_fxAnnotArray;
CPDFSDK_Document* m_pSDKDoc;