diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-30 23:55:35 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-30 23:55:35 -0700 |
| commit | 1b700c3c452429dacde3c163a6edb2706f93d4a7 (patch) | |
| tree | 4efaf4dcec5b28a4d6cac575727dc61356e8a4fe /fpdfsdk/include | |
| parent | de6088db8403e775e2963ce6e0bd55e5356beb73 (diff) | |
| download | pdfium-1b700c3c452429dacde3c163a6edb2706f93d4a7.tar.xz | |
Merge to XFA: Clean up CPDF_AnnotList.
- Remove dead code
- Stop using CFX_PtrArray
- Mark more things const
- Fix style nits
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1425093003 .
(cherry picked from commit c88c42f317c0e94c4c7b98949bfe1a495aef07a9)
Review URL: https://codereview.chromium.org/1430803003 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/fsdk_baseform.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/include/fsdk_define.h | 2 | ||||
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index 14c8fefad2..bcba4c831b 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -155,7 +155,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { CPDF_FormField* GetFormField() const; CPDF_FormControl* GetFormControl() const; static CPDF_FormControl* GetFormControl(CPDF_InterForm* pInterForm, - CPDF_Dictionary* pAnnotDict); + const CPDF_Dictionary* pAnnotDict); void DrawShadow(CFX_RenderDevice* pDevice, CPDFSDK_PageView* pPageView); diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 2faaf01298..f62234af09 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -108,7 +108,7 @@ void FPDF_RenderPage_Retail(CRenderContext* pContext, IFSDK_PAUSE_Adapter* pause); void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code); -void CheckUnSupportAnnot(CPDF_Document* pDoc, CPDF_Annot* pPDFAnnot); +void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot); void ProcessParseError(FX_DWORD err_code); #endif // FPDFSDK_INCLUDE_FSDK_DEFINE_H_ diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index bfbbd63ac0..615b585b51 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -538,9 +538,9 @@ class CPDFSDK_PageView final { CPDF_Matrix* pUser2Device, CPDF_RenderOptions* pOptions, FX_RECT* pClip = NULL); - CPDF_Annot* GetPDFAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY); + const CPDF_Annot* GetPDFAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY); CPDFSDK_Annot* GetFXAnnotAtPoint(FX_FLOAT pageX, FX_FLOAT pageY); - CPDF_Annot* GetPDFWidgetAtPoint(FX_FLOAT pageX, FX_FLOAT pageY); + const CPDF_Annot* GetPDFWidgetAtPoint(FX_FLOAT pageX, FX_FLOAT pageY); CPDFSDK_Annot* GetFXWidgetAtPoint(FX_FLOAT pageX, FX_FLOAT pageY); CPDFSDK_Annot* GetFocusAnnot(); void SetFocusAnnot(CPDFSDK_Annot* pSDKAnnot, FX_UINT nFlag = 0) { @@ -578,7 +578,7 @@ class CPDFSDK_PageView final { double deltaY, const CPDF_Point& point, int nFlag); - FX_BOOL IsValidAnnot(CPDF_Annot* p) const; + bool IsValidAnnot(const CPDF_Annot* p) const; void GetCurrentMatrix(CPDF_Matrix& matrix) { matrix = m_curMatrix; } void UpdateRects(CFX_RectArray& rects); void UpdateView(CPDFSDK_Annot* pAnnot); |