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/WebKitCSSKeyframesRule.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/WebKitCSSKeyframesRule.cpp')
| -rw-r--r-- | Source/WebCore/css/WebKitCSSKeyframesRule.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebCore/css/WebKitCSSKeyframesRule.cpp b/Source/WebCore/css/WebKitCSSKeyframesRule.cpp index 08fbb0a55..1406fef9d 100644 --- a/Source/WebCore/css/WebKitCSSKeyframesRule.cpp +++ b/Source/WebCore/css/WebKitCSSKeyframesRule.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2007, 2008, 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 @@ -31,7 +31,6 @@ #include "CSSStyleSheet.h" #include "StylePropertySet.h" #include "StyleSheet.h" -#include "WebCoreMemoryInstrumentation.h" #include "WebKitCSSKeyframeRule.h" #include <wtf/MemoryInstrumentationVector.h> #include <wtf/text/StringBuilder.h> @@ -96,7 +95,7 @@ void StyleRuleKeyframes::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObj } WebKitCSSKeyframesRule::WebKitCSSKeyframesRule(StyleRuleKeyframes* keyframesRule, CSSStyleSheet* parent) - : CSSRule(parent, CSSRule::WEBKIT_KEYFRAMES_RULE) + : CSSRule(parent) , m_keyframesRule(keyframesRule) , m_childRuleCSSOMWrappers(keyframesRule->keyframes().size()) { @@ -201,16 +200,17 @@ CSSRuleList* WebKitCSSKeyframesRule::cssRules() return m_ruleListCSSOMWrapper.get(); } -void WebKitCSSKeyframesRule::reattach(StyleRuleKeyframes* rule) +void WebKitCSSKeyframesRule::reattach(StyleRuleBase* rule) { ASSERT(rule); - m_keyframesRule = rule; + ASSERT(rule->isKeyframesRule()); + m_keyframesRule = static_cast<StyleRuleKeyframes*>(rule); } -void WebKitCSSKeyframesRule::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +void WebKitCSSKeyframesRule::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - CSSRule::reportBaseClassMemoryUsage(memoryObjectInfo); + CSSRule::reportMemoryUsage(memoryObjectInfo); info.addMember(m_keyframesRule); info.addMember(m_childRuleCSSOMWrappers); info.addMember(m_ruleListCSSOMWrapper); |