| OLD | NEW |
| 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/css/CSSKeyframesRule.h" | 27 #include "core/css/CSSKeyframesRule.h" |
| 28 | 28 |
| 29 #include "core/css/CSSKeyframeRule.h" | 29 #include "core/css/CSSKeyframeRule.h" |
| 30 #include "core/css/parser/BisonCSSParser.h" |
| 30 #include "core/css/CSSRuleList.h" | 31 #include "core/css/CSSRuleList.h" |
| 31 #include "core/css/CSSStyleSheet.h" | 32 #include "core/css/CSSStyleSheet.h" |
| 32 #include "core/css/parser/CSSParser.h" | |
| 33 #include "core/frame/UseCounter.h" | 33 #include "core/frame/UseCounter.h" |
| 34 #include "wtf/text/StringBuilder.h" | 34 #include "wtf/text/StringBuilder.h" |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 StyleRuleKeyframes::StyleRuleKeyframes() | 38 StyleRuleKeyframes::StyleRuleKeyframes() |
| 39 : StyleRuleBase(Keyframes) | 39 : StyleRuleBase(Keyframes) |
| 40 { | 40 { |
| 41 } | 41 } |
| 42 | 42 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 | 117 |
| 118 m_keyframesRule->setName(name); | 118 m_keyframesRule->setName(name); |
| 119 } | 119 } |
| 120 | 120 |
| 121 void CSSKeyframesRule::insertRule(const String& ruleText) | 121 void CSSKeyframesRule::insertRule(const String& ruleText) |
| 122 { | 122 { |
| 123 ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size(
)); | 123 ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size(
)); |
| 124 | 124 |
| 125 CSSStyleSheet* styleSheet = parentStyleSheet(); | 125 CSSStyleSheet* styleSheet = parentStyleSheet(); |
| 126 CSSParserContext context(parserContext(), UseCounter::getFrom(styleSheet)); | 126 CSSParserContext context(parserContext(), UseCounter::getFrom(styleSheet)); |
| 127 RefPtrWillBeRawPtr<StyleKeyframe> keyframe = CSSParser::parseKeyframeRule(co
ntext, styleSheet ? styleSheet->contents() : 0, ruleText); | 127 BisonCSSParser parser(context); |
| 128 RefPtrWillBeRawPtr<StyleKeyframe> keyframe = parser.parseKeyframeRule(styleS
heet ? styleSheet->contents() : 0, ruleText); |
| 128 if (!keyframe) | 129 if (!keyframe) |
| 129 return; | 130 return; |
| 130 | 131 |
| 131 CSSStyleSheet::RuleMutationScope mutationScope(this); | 132 CSSStyleSheet::RuleMutationScope mutationScope(this); |
| 132 | 133 |
| 133 m_keyframesRule->wrapperAppendKeyframe(keyframe); | 134 m_keyframesRule->wrapperAppendKeyframe(keyframe); |
| 134 | 135 |
| 135 m_childRuleCSSOMWrappers.grow(length()); | 136 m_childRuleCSSOMWrappers.grow(length()); |
| 136 } | 137 } |
| 137 | 138 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 { | 214 { |
| 214 CSSRule::trace(visitor); | 215 CSSRule::trace(visitor); |
| 215 #if ENABLE(OILPAN) | 216 #if ENABLE(OILPAN) |
| 216 visitor->trace(m_childRuleCSSOMWrappers); | 217 visitor->trace(m_childRuleCSSOMWrappers); |
| 217 #endif | 218 #endif |
| 218 visitor->trace(m_keyframesRule); | 219 visitor->trace(m_keyframesRule); |
| 219 visitor->trace(m_ruleListCSSOMWrapper); | 220 visitor->trace(m_ruleListCSSOMWrapper); |
| 220 } | 221 } |
| 221 | 222 |
| 222 } // namespace blink | 223 } // namespace blink |
| OLD | NEW |