diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-26 14:44:19 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-26 14:44:19 -0800 |
| commit | badb41230bae96cba8fc481de47592836e3f43f8 (patch) | |
| tree | 7ff569f1d97c93594a43f78d5a0f622cc0626e0a /core/include/fpdfdoc | |
| parent | 0ec8bb4486ab315283f36d071be2ddc1b80998c3 (diff) | |
| download | pdfium-badb41230bae96cba8fc481de47592836e3f43f8.tar.xz | |
Merge to Master: War on #defines - part 2
Original Review URL: https://codereview.chromium.org/1634123004 .
(cherry picked from commit f10ae634e7b198b18942baaf9f111f07cc8ce818)
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1640473002 .
Diffstat (limited to 'core/include/fpdfdoc')
| -rw-r--r-- | core/include/fpdfdoc/fpdf_ap.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h index 6d0478c23f..510b39cb9b 100644 --- a/core/include/fpdfdoc/fpdf_ap.h +++ b/core/include/fpdfdoc/fpdf_ap.h @@ -16,22 +16,20 @@ class IPVT_FontMap { virtual CPDF_Font* GetPDFFont(int32_t nFontIndex) = 0; virtual CFX_ByteString GetPDFFontAlias(int32_t nFontIndex) = 0; }; + struct CPVT_Dash { CPVT_Dash(int32_t dash, int32_t gap, int32_t phase) : nDash(dash), nGap(gap), nPhase(phase) {} int32_t nDash; - int32_t nGap; - int32_t nPhase; }; -#define CT_TRANSPARENT 0 -#define CT_GRAY 1 -#define CT_RGB 2 -#define CT_CMYK 3 + struct CPVT_Color { - CPVT_Color(int32_t type = 0, + enum Type { kTransparent = 0, kGray, kRGB, kCMYK }; + + CPVT_Color(Type type = kTransparent, FX_FLOAT color1 = 0.0f, FX_FLOAT color2 = 0.0f, FX_FLOAT color3 = 0.0f, @@ -42,12 +40,13 @@ struct CPVT_Color { fColor3(color3), fColor4(color4) {} - int32_t nColorType; + Type nColorType; FX_FLOAT fColor1; FX_FLOAT fColor2; FX_FLOAT fColor3; FX_FLOAT fColor4; }; + class CPVT_Provider : public IPDF_VariableText_Provider { public: CPVT_Provider(IPVT_FontMap* pFontMap); @@ -68,11 +67,7 @@ class CPVT_Provider : public IPDF_VariableText_Provider { private: IPVT_FontMap* m_pFontMap; }; -#define PBS_SOLID 0 -#define PBS_DASH 1 -#define PBS_BEVELED 2 -#define PBS_INSET 3 -#define PBS_UNDERLINED 4 + class CPVT_GenerateAP { public: static FX_BOOL GenerateTextFieldAP(CPDF_Document* pDoc, |