diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-08 10:05:05 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-09 15:55:20 +0000 |
| commit | 21e954b59fcef1b84fdcdb9ae337e2d4c060b19e (patch) | |
| tree | 2053cd0a8b0d4c1bb6903db3aa6f753a23afedcf /xfa/fde/css/cfde_csscomputedstyle.cpp | |
| parent | 1b08df18300bbc67dabd12fb35ab6ce1732a1024 (diff) | |
| download | pdfium-21e954b59fcef1b84fdcdb9ae337e2d4c060b19e.tar.xz | |
Remove CopyToLocal from CFDE_CSSDeclaration
This CL removes the CopyToLocal method and creates CFX_WideString's directly.
This fixes several memory leaks as the CopyToLocal strings were not cleaned
up correctly.
Change-Id: Ie5ba4cdc4d713cd0b8e3fb85e02f27dc09f38af1
Reviewed-on: https://pdfium-review.googlesource.com/2553
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde/css/cfde_csscomputedstyle.cpp')
| -rw-r--r-- | xfa/fde/css/cfde_csscomputedstyle.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fde/css/cfde_csscomputedstyle.cpp b/xfa/fde/css/cfde_csscomputedstyle.cpp index b563bbf445..50247420be 100644 --- a/xfa/fde/css/cfde_csscomputedstyle.cpp +++ b/xfa/fde/css/cfde_csscomputedstyle.cpp @@ -14,12 +14,12 @@ CFDE_CSSComputedStyle::CFDE_CSSComputedStyle() {} CFDE_CSSComputedStyle::~CFDE_CSSComputedStyle() {} -bool CFDE_CSSComputedStyle::GetCustomStyle(const CFX_WideStringC& wsName, +bool CFDE_CSSComputedStyle::GetCustomStyle(const CFX_WideString& wsName, CFX_WideString& wsValue) const { - for (int32_t i = pdfium::CollectionSize<int32_t>(m_CustomProperties) - 2; - i > -1; i -= 2) { - if (wsName == m_CustomProperties[i]) { - wsValue = m_CustomProperties[i + 1]; + for (auto iter = m_CustomProperties.rbegin(); + iter != m_CustomProperties.rend(); iter++) { + if (wsName == iter->name()) { + wsValue = iter->value(); return true; } } @@ -161,10 +161,10 @@ void CFDE_CSSComputedStyle::SetLetterSpacing( m_InheritedData.m_LetterSpacing = letterSpacing; } -void CFDE_CSSComputedStyle::AddCustomStyle(const CFX_WideString& wsName, - const CFX_WideString& wsValue) { - m_CustomProperties.push_back(wsName); - m_CustomProperties.push_back(wsValue); +void CFDE_CSSComputedStyle::AddCustomStyle(const CFDE_CSSCustomProperty& prop) { + // Force the property to be copied so we aren't dependent on the lifetime + // of whatever currently owns it. + m_CustomProperties.push_back(prop); } CFDE_CSSComputedStyle::InheritedData::InheritedData() |