diff options
author | weili <weili@chromium.org> | 2016-06-15 11:21:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-15 11:21:33 -0700 |
commit | 625ad667d0c0c17d5bc11d505f04861d90b45078 (patch) | |
tree | efd014e752072adf726a0e34383555399342dcb2 /fpdfsdk/include/fsdk_baseform.h | |
parent | 29b8ad0b130ec6ed4f72ebd0c0a4f9e6a5b03467 (diff) | |
download | pdfium-625ad667d0c0c17d5bc11d505f04861d90b45078.tar.xz |
Make code compile with clang_use_chrome_plugin (part IV)
This change mainly contains files in fpdfsdk/ directory.
This is part of the efforts to make PDFium code compilable
by Clang chromium style plugins.
The changes are mainly the following:
-- move inline constructor/destructor of complex class/struct out-of-line;
-- add constructor/destructor of complex class/struct if not
explicitly defined;
-- add explicit out-of-line copy constructor when needed;
-- move inline virtual functions out-of-line;
-- Properly mark virtual functions with 'override';
-- some minor cleanups plus removing an unused file and splitting
cxfa_eventparam out from fxfa.h
BUG=pdfium:469
Review-Url: https://codereview.chromium.org/2062313002
Diffstat (limited to 'fpdfsdk/include/fsdk_baseform.h')
-rw-r--r-- | fpdfsdk/include/fsdk_baseform.h | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index c7a7e742d3..f6df689984 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -15,10 +15,6 @@ #include "core/fxge/include/fx_dib.h" #include "fpdfsdk/include/fsdk_baseannot.h" -#ifdef PDF_ENABLE_XFA -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" -#endif // PDF_ENABLE_XFA - #if _FX_OS_ == _FX_ANDROID_ #include "time.h" #else @@ -34,6 +30,8 @@ class CPDF_FormField; struct CPWL_Color; #ifdef PDF_ENABLE_XFA +class CXFA_FFWidgetHandler; + typedef enum _PDFSDK_XFAAActionType { PDFSDK_XFA_Click = 0, PDFSDK_XFA_Full, @@ -43,16 +41,8 @@ typedef enum _PDFSDK_XFAAActionType { #endif // PDF_ENABLE_XFA struct PDFSDK_FieldAction { - PDFSDK_FieldAction() { - bModifier = FALSE; - bShift = FALSE; - nCommitKey = 0; - bKeyDown = FALSE; - nSelEnd = nSelStart = 0; - bWillCommit = FALSE; - bFieldFull = FALSE; - bRC = TRUE; - } + PDFSDK_FieldAction(); + PDFSDK_FieldAction(const PDFSDK_FieldAction& other) = delete; FX_BOOL bModifier; // in FX_BOOL bShift; // in @@ -104,7 +94,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT) override; FX_BOOL IsAppearanceValid() override; - int GetLayoutOrder() const override { return 2; } + int GetLayoutOrder() const override; int GetFieldType() const; @@ -232,9 +222,9 @@ class CPDFSDK_XFAWidget : public CPDFSDK_Annot { ~CPDFSDK_XFAWidget() override {} FX_BOOL IsXFAField() override; - CXFA_FFWidget* GetXFAWidget() const override { return m_hXFAWidget; } + CXFA_FFWidget* GetXFAWidget() const override; CFX_ByteString GetType() const override; - CFX_ByteString GetSubType() const override { return ""; } + CFX_ByteString GetSubType() const override; CFX_FloatRect GetRect() const override; CPDFSDK_InterForm* GetInterForm() { return m_pInterForm; } |