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/WebKitCSSRegionRule.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/WebKitCSSRegionRule.cpp')
| -rw-r--r-- | Source/WebCore/css/WebKitCSSRegionRule.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/WebCore/css/WebKitCSSRegionRule.cpp b/Source/WebCore/css/WebKitCSSRegionRule.cpp index ce1207cab..68db9641c 100644 --- a/Source/WebCore/css/WebKitCSSRegionRule.cpp +++ b/Source/WebCore/css/WebKitCSSRegionRule.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. + * Copyright (C) 2012 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -41,7 +42,7 @@ namespace WebCore { WebKitCSSRegionRule::WebKitCSSRegionRule(StyleRuleRegion* regionRule, CSSStyleSheet* parent) - : CSSRule(parent, CSSRule::WEBKIT_REGION_RULE) + : CSSRule(parent) , m_regionRule(regionRule) , m_childRuleCSSOMWrappers(regionRule->childRules().size()) { @@ -99,20 +100,21 @@ CSSRuleList* WebKitCSSRegionRule::cssRules() const return m_ruleListCSSOMWrapper.get(); } -void WebKitCSSRegionRule::reattach(StyleRuleRegion* rule) +void WebKitCSSRegionRule::reattach(StyleRuleBase* rule) { ASSERT(rule); - m_regionRule = rule; + ASSERT(rule->isRegionRule()); + m_regionRule = static_cast<StyleRuleRegion*>(rule); for (unsigned i = 0; i < m_childRuleCSSOMWrappers.size(); ++i) { if (m_childRuleCSSOMWrappers[i]) m_childRuleCSSOMWrappers[i]->reattach(m_regionRule->childRules()[i].get()); } } -void WebKitCSSRegionRule::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +void WebKitCSSRegionRule::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - CSSRule::reportBaseClassMemoryUsage(memoryObjectInfo); + CSSRule::reportMemoryUsage(memoryObjectInfo); info.addMember(m_regionRule); info.addMember(m_childRuleCSSOMWrappers); info.addMember(m_ruleListCSSOMWrapper); |