diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
| commit | b1e9e47fa11f608ae16bc07f97a2acf95bf80272 (patch) | |
| tree | c88c45e80c9c44506e7cdf9a3bb39ebf82a8cd5b /Source/WebCore/css/CSSStyleRule.cpp | |
| parent | be01689f43cf6882cf670d33df49ead1f570c53a (diff) | |
| download | qtwebkit-b1e9e47fa11f608ae16bc07f97a2acf95bf80272.tar.gz | |
Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)
Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
Diffstat (limited to 'Source/WebCore/css/CSSStyleRule.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSStyleRule.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebCore/css/CSSStyleRule.cpp b/Source/WebCore/css/CSSStyleRule.cpp index 5a780264a..1eeb32d42 100644 --- a/Source/WebCore/css/CSSStyleRule.cpp +++ b/Source/WebCore/css/CSSStyleRule.cpp @@ -59,8 +59,9 @@ CSSStyleRule::~CSSStyleRule() CSSStyleDeclaration* CSSStyleRule::style() const { - if (!m_propertiesCSSOMWrapper) - m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_styleRule->properties(), const_cast<CSSStyleRule*>(this)); + if (!m_propertiesCSSOMWrapper) { + m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_styleRule->mutableProperties(), const_cast<CSSStyleRule*>(this)); + } return m_propertiesCSSOMWrapper.get(); } @@ -123,7 +124,7 @@ void CSSStyleRule::reattach(StyleRule* rule) { m_styleRule = rule; if (m_propertiesCSSOMWrapper) - m_propertiesCSSOMWrapper->reattach(m_styleRule->properties()); + m_propertiesCSSOMWrapper->reattach(m_styleRule->mutableProperties()); } } // namespace WebCore |