Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: Source/core/css/CSSKeyframesRule.cpp

Issue 177423010: Oilpan: Remove Persistent handles from heap allocated CSSRule objects and fix finalization of CSSKe… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Keep the size assertion turned on. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 , m_keyframesRule(keyframesRule) 91 , m_keyframesRule(keyframesRule)
92 , m_childRuleCSSOMWrappers(keyframesRule->keyframes().size()) 92 , m_childRuleCSSOMWrappers(keyframesRule->keyframes().size())
93 , m_isPrefixed(keyframesRule->isVendorPrefixed()) 93 , m_isPrefixed(keyframesRule->isVendorPrefixed())
94 { 94 {
95 } 95 }
96 96
97 CSSKeyframesRule::~CSSKeyframesRule() 97 CSSKeyframesRule::~CSSKeyframesRule()
98 { 98 {
99 ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size( )); 99 ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size( ));
100 100
101 #if !ENABLE(OILPAN)
101 for (unsigned i = 0; i < m_childRuleCSSOMWrappers.size(); ++i) { 102 for (unsigned i = 0; i < m_childRuleCSSOMWrappers.size(); ++i) {
102 if (m_childRuleCSSOMWrappers[i]) 103 if (m_childRuleCSSOMWrappers[i])
103 m_childRuleCSSOMWrappers[i]->setParentRule(0); 104 m_childRuleCSSOMWrappers[i]->setParentRule(0);
104 } 105 }
106 #endif
105 } 107 }
106 108
107 void CSSKeyframesRule::setName(const String& name) 109 void CSSKeyframesRule::setName(const String& name)
108 { 110 {
109 CSSStyleSheet::RuleMutationScope mutationScope(this); 111 CSSStyleSheet::RuleMutationScope mutationScope(this);
110 112
111 m_keyframesRule->setName(name); 113 m_keyframesRule->setName(name);
112 } 114 }
113 115
114 void CSSKeyframesRule::insertRule(const String& ruleText) 116 void CSSKeyframesRule::insertRule(const String& ruleText)
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 201
200 void CSSKeyframesRule::reattach(StyleRuleBase* rule) 202 void CSSKeyframesRule::reattach(StyleRuleBase* rule)
201 { 203 {
202 ASSERT(rule); 204 ASSERT(rule);
203 m_keyframesRule = toStyleRuleKeyframes(rule); 205 m_keyframesRule = toStyleRuleKeyframes(rule);
204 } 206 }
205 207
206 void CSSKeyframesRule::trace(Visitor* visitor) 208 void CSSKeyframesRule::trace(Visitor* visitor)
207 { 209 {
208 CSSRule::trace(visitor); 210 CSSRule::trace(visitor);
209 #if ENABLE(OILPAN) 211 #if ENABLE(OILPAN)
wibling-chromium 2014/03/03 10:08:40 NIT: Do we still need the if? I thought we could h
210 m_childRuleCSSOMWrappers.trace(visitor); 212 visitor->trace(m_childRuleCSSOMWrappers);
211 #endif 213 #endif
214 visitor->trace(m_keyframesRule);
212 } 215 }
213 216
214 } // namespace WebCore 217 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698