diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-06-26 14:57:28 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-26 14:57:28 +0000 |
| commit | 75ee53784b5e51583c6c994d6eeadb7d3ce4a1b9 (patch) | |
| tree | ea65039c95c0b83bef8fb20ec24c0be5c42e579e | |
| parent | 76fb29d5ebae4fea2e5d1221f77e218a9b4b309a (diff) | |
| download | pdfium-75ee53784b5e51583c6c994d6eeadb7d3ce4a1b9.tar.xz | |
Fix uninit value in CFX_CSSComputedStyle::InheritedData.
BUG=chromium:856054
Change-Id: Ieacb7be324f290c91623ed1bd97744150fbfa6e7
Reviewed-on: https://pdfium-review.googlesource.com/36090
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
| -rw-r--r-- | core/fxcrt/css/cfx_css.h | 7 | ||||
| -rw-r--r-- | core/fxcrt/css/cfx_csscomputedstyle.cpp | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/fxcrt/css/cfx_css.h b/core/fxcrt/css/cfx_css.h index e9ff722d08..5b70d0b2e1 100644 --- a/core/fxcrt/css/cfx_css.h +++ b/core/fxcrt/css/cfx_css.h @@ -186,8 +186,6 @@ class CFX_CSSLength { public: CFX_CSSLength() {} - explicit CFX_CSSLength(CFX_CSSLengthUnit eUnit) : m_unit(eUnit) {} - CFX_CSSLength(CFX_CSSLengthUnit eUnit, float fValue) : m_unit(eUnit), m_fValue(fValue) {} @@ -237,7 +235,10 @@ class CFX_CSSRect { return *this; } - CFX_CSSLength left, top, right, bottom; + CFX_CSSLength left; + CFX_CSSLength top; + CFX_CSSLength right; + CFX_CSSLength bottom; }; #endif // CORE_FXCRT_CSS_CFX_CSS_H_ diff --git a/core/fxcrt/css/cfx_csscomputedstyle.cpp b/core/fxcrt/css/cfx_csscomputedstyle.cpp index aae88a364a..f06092c7f9 100644 --- a/core/fxcrt/css/cfx_csscomputedstyle.cpp +++ b/core/fxcrt/css/cfx_csscomputedstyle.cpp @@ -168,8 +168,8 @@ void CFX_CSSComputedStyle::AddCustomStyle(const CFX_CSSCustomProperty& prop) { } CFX_CSSComputedStyle::InheritedData::InheritedData() - : m_LetterSpacing(CFX_CSSLengthUnit::Normal), - m_WordSpacing(CFX_CSSLengthUnit::Normal), + : m_LetterSpacing(CFX_CSSLengthUnit::Normal, 0), + m_WordSpacing(CFX_CSSLengthUnit::Normal, 0), m_TextIndent(CFX_CSSLengthUnit::Point, 0), m_pFontFamily(nullptr), m_fFontSize(12.0f), |