diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebCore/css/CSSMediaRule.cpp | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
| download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebCore/css/CSSMediaRule.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSMediaRule.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebCore/css/CSSMediaRule.cpp b/Source/WebCore/css/CSSMediaRule.cpp index 8c2c973c2..fc8624da0 100644 --- a/Source/WebCore/css/CSSMediaRule.cpp +++ b/Source/WebCore/css/CSSMediaRule.cpp @@ -35,7 +35,7 @@ namespace WebCore { CSSMediaRule::CSSMediaRule(StyleRuleMedia* mediaRule, CSSStyleSheet* parent) - : CSSRule(parent, CSSRule::MEDIA_RULE) + : CSSRule(parent) , m_mediaRule(mediaRule) , m_childRuleCSSOMWrappers(mediaRule->childRules().size()) { @@ -164,10 +164,11 @@ CSSRuleList* CSSMediaRule::cssRules() const return m_ruleListCSSOMWrapper.get(); } -void CSSMediaRule::reattach(StyleRuleMedia* rule) +void CSSMediaRule::reattach(StyleRuleBase* rule) { ASSERT(rule); - m_mediaRule = rule; + ASSERT(rule->isMediaRule()); + m_mediaRule = static_cast<StyleRuleMedia*>(rule); if (m_mediaCSSOMWrapper && m_mediaRule->mediaQueries()) m_mediaCSSOMWrapper->reattach(m_mediaRule->mediaQueries()); for (unsigned i = 0; i < m_childRuleCSSOMWrappers.size(); ++i) { @@ -176,10 +177,10 @@ void CSSMediaRule::reattach(StyleRuleMedia* rule) } } -void CSSMediaRule::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +void CSSMediaRule::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - CSSRule::reportBaseClassMemoryUsage(memoryObjectInfo); + CSSRule::reportMemoryUsage(memoryObjectInfo); info.addMember(m_mediaCSSOMWrapper); info.addMember(m_childRuleCSSOMWrappers); info.addMember(m_ruleListCSSOMWrapper); |