From 470286ecfe79d59df14944e5b5d34630fc739391 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 22 Nov 2012 09:09:45 +0100 Subject: Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485) Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66 Reviewed-by: Simon Hausmann --- Source/WebCore/css/WebKitCSSKeyframeRule.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/css/WebKitCSSKeyframeRule.cpp') diff --git a/Source/WebCore/css/WebKitCSSKeyframeRule.cpp b/Source/WebCore/css/WebKitCSSKeyframeRule.cpp index 8acb54979..36f5c02f4 100644 --- a/Source/WebCore/css/WebKitCSSKeyframeRule.cpp +++ b/Source/WebCore/css/WebKitCSSKeyframeRule.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 @@ -27,8 +27,6 @@ #include "WebKitCSSKeyframeRule.h" #include "PropertySetCSSStyleDeclaration.h" -#include "StylePropertySet.h" -#include "WebCoreMemoryInstrumentation.h" #include "WebKitCSSKeyframesRule.h" #include @@ -97,7 +95,7 @@ void StyleKeyframe::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const } WebKitCSSKeyframeRule::WebKitCSSKeyframeRule(StyleKeyframe* keyframe, WebKitCSSKeyframesRule* parent) - : CSSRule(0, CSSRule::WEBKIT_KEYFRAME_RULE) + : CSSRule(0) , m_keyframe(keyframe) { setParentRule(parent); @@ -116,12 +114,18 @@ CSSStyleDeclaration* WebKitCSSKeyframeRule::style() const return m_propertiesCSSOMWrapper.get(); } -void WebKitCSSKeyframeRule::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +void WebKitCSSKeyframeRule::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - CSSRule::reportBaseClassMemoryUsage(memoryObjectInfo); + CSSRule::reportMemoryUsage(memoryObjectInfo); info.addMember(m_keyframe); info.addMember(m_propertiesCSSOMWrapper); } +void WebKitCSSKeyframeRule::reattach(StyleRuleBase*) +{ + // No need to reattach, the underlying data is shareable on mutation. + ASSERT_NOT_REACHED(); +} + } // namespace WebCore -- cgit v1.2.1