diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-01-18 12:47:24 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-18 18:06:19 +0000 |
| commit | 19c209de418a10f7d5c157cdda38e9308bfa5503 (patch) | |
| tree | 5c5428d219f74cd02f8d36adc4e33c2e1b97f81a /xfa/fde/css/fde_cssstyleselector.h | |
| parent | be591066c781850caf13d2b7a7070c6da4eda467 (diff) | |
| download | pdfium-19c209de418a10f7d5c157cdda38e9308bfa5503.tar.xz | |
Split CFDE_CSSPrimitiveValue apart
This CL splits the CFDE_CSSPrimitiveValue class into individual classes per
value type. This moves the numeric itypes out of the FDE_CSSPrimitiveType
list and creates a new CFDE_CSSNumberType list.
Change-Id: I6f55e9e3509de7ff1e82dcf018a1f1c472565e54
Reviewed-on: https://pdfium-review.googlesource.com/2250
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fde/css/fde_cssstyleselector.h')
| -rw-r--r-- | xfa/fde/css/fde_cssstyleselector.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h index f9833f7594..f4c811b1e7 100644 --- a/xfa/fde/css/fde_cssstyleselector.h +++ b/xfa/fde/css/fde_cssstyleselector.h @@ -21,6 +21,7 @@ class CFDE_CSSComputedStyle; class CFDE_CSSRule; class CFDE_CSSSelector; class CFDE_CSSStyleSheet; +class CFDE_CSSValueList; class CXFA_CSSTagProvider; class FDE_CSSRuleData { @@ -129,12 +130,9 @@ class CFDE_CSSStyleSelector { CFDE_CSSValue* pValue, CFDE_CSSComputedStyle* pComputedStyle); - FX_FLOAT ApplyNumber(FDE_CSSPrimitiveType eUnit, - FX_FLOAT fValue, - FX_FLOAT fPercentBase); bool SetLengthWithPercent(FDE_CSSLength& width, FDE_CSSPrimitiveType eType, - CFDE_CSSPrimitiveValue* pPrimitive, + CFDE_CSSValue* pValue, FX_FLOAT fFontSize); FX_FLOAT ToFontSize(FDE_CSSPropertyValue eValue, FX_FLOAT fCurFontSize); FDE_CSSDisplay ToDisplay(FDE_CSSPropertyValue eValue); @@ -201,7 +199,7 @@ class CFDE_CSSComputedStyle : public IFX_Retainable { uint32_t Release() override; int32_t CountFontFamilies() const; - const FX_WCHAR* GetFontFamily(int32_t index) const; + const CFX_WideString GetFontFamily(int32_t index) const; uint16_t GetFontWeight() const; FDE_CSSFontVariant GetFontVariant() const; FDE_CSSFontStyle GetFontStyle() const; |