diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-01-16 16:07:41 -0500 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-17 19:00:07 +0000 |
commit | b9fbe6e9af590a91ab030d2523a147e972816b32 (patch) | |
tree | c74b7124a47142da64cc0e84c82fcff743309405 /xfa/fde/css/fde_cssstyleselector.cpp | |
parent | 6b71f22093fc4abb2da39f5a58b29c45c17ff99a (diff) | |
download | pdfium-b9fbe6e9af590a91ab030d2523a147e972816b32.tar.xz |
Rename FDE_CSSRECT and FDE_CSSLENGTH
This Cl converts the names to FDE_CSSRect and FDE_CSSLength to better match
other parts of the code base.
Change-Id: I33367ae3d93d912755671486d6d5317cddbc4f62
Reviewed-on: https://pdfium-review.googlesource.com/2179
Commit-Queue: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fde/css/fde_cssstyleselector.cpp')
-rw-r--r-- | xfa/fde/css/fde_cssstyleselector.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xfa/fde/css/fde_cssstyleselector.cpp b/xfa/fde/css/fde_cssstyleselector.cpp index 838a5042e9..5e981d96eb 100644 --- a/xfa/fde/css/fde_cssstyleselector.cpp +++ b/xfa/fde/css/fde_cssstyleselector.cpp @@ -708,7 +708,7 @@ FDE_CSSFontStyle CFDE_CSSStyleSelector::ToFontStyle( } bool CFDE_CSSStyleSelector::SetLengthWithPercent( - FDE_CSSLENGTH& width, + FDE_CSSLength& width, FDE_CSSPrimitiveType eType, CFDE_CSSPrimitiveValue* pPrimitive, FX_FLOAT fFontSize) { @@ -909,27 +909,27 @@ void CFDE_CSSComputedStyle::SetColor(FX_ARGB dwFontColor) { m_InheritedData.m_dwFontColor = dwFontColor; } -const FDE_CSSRECT* CFDE_CSSComputedStyle::GetBorderWidth() const { +const FDE_CSSRect* CFDE_CSSComputedStyle::GetBorderWidth() const { return m_NonInheritedData.m_bHasBorder ? &(m_NonInheritedData.m_BorderWidth) : nullptr; } -const FDE_CSSRECT* CFDE_CSSComputedStyle::GetMarginWidth() const { +const FDE_CSSRect* CFDE_CSSComputedStyle::GetMarginWidth() const { return m_NonInheritedData.m_bHasMargin ? &(m_NonInheritedData.m_MarginWidth) : nullptr; } -const FDE_CSSRECT* CFDE_CSSComputedStyle::GetPaddingWidth() const { +const FDE_CSSRect* CFDE_CSSComputedStyle::GetPaddingWidth() const { return m_NonInheritedData.m_bHasPadding ? &(m_NonInheritedData.m_PaddingWidth) : nullptr; } -void CFDE_CSSComputedStyle::SetMarginWidth(const FDE_CSSRECT& rect) { +void CFDE_CSSComputedStyle::SetMarginWidth(const FDE_CSSRect& rect) { m_NonInheritedData.m_MarginWidth = rect; m_NonInheritedData.m_bHasMargin = true; } -void CFDE_CSSComputedStyle::SetPaddingWidth(const FDE_CSSRECT& rect) { +void CFDE_CSSComputedStyle::SetPaddingWidth(const FDE_CSSRect& rect) { m_NonInheritedData.m_PaddingWidth = rect; m_NonInheritedData.m_bHasPadding = true; } @@ -942,7 +942,7 @@ FX_FLOAT CFDE_CSSComputedStyle::GetLineHeight() const { return m_InheritedData.m_fLineHeight; } -const FDE_CSSLENGTH& CFDE_CSSComputedStyle::GetTextIndent() const { +const FDE_CSSLength& CFDE_CSSComputedStyle::GetTextIndent() const { return m_InheritedData.m_TextIndent; } @@ -962,7 +962,7 @@ uint32_t CFDE_CSSComputedStyle::GetTextDecoration() const { return m_NonInheritedData.m_dwTextDecoration; } -const FDE_CSSLENGTH& CFDE_CSSComputedStyle::GetLetterSpacing() const { +const FDE_CSSLength& CFDE_CSSComputedStyle::GetLetterSpacing() const { return m_InheritedData.m_LetterSpacing; } @@ -970,7 +970,7 @@ void CFDE_CSSComputedStyle::SetLineHeight(FX_FLOAT fLineHeight) { m_InheritedData.m_fLineHeight = fLineHeight; } -void CFDE_CSSComputedStyle::SetTextIndent(const FDE_CSSLENGTH& textIndent) { +void CFDE_CSSComputedStyle::SetTextIndent(const FDE_CSSLength& textIndent) { m_InheritedData.m_TextIndent = textIndent; } @@ -988,7 +988,7 @@ void CFDE_CSSComputedStyle::SetTextDecoration(uint32_t dwTextDecoration) { } void CFDE_CSSComputedStyle::SetLetterSpacing( - const FDE_CSSLENGTH& letterSpacing) { + const FDE_CSSLength& letterSpacing) { m_InheritedData.m_LetterSpacing = letterSpacing; } |