| 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/CSSKeyframeRule.h" | 27 #include "core/css/CSSKeyframeRule.h" |
| 28 | 28 |
| 29 #include "core/css/CSSKeyframesRule.h" | 29 #include "core/css/CSSKeyframesRule.h" |
| 30 #include "core/css/parser/BisonCSSParser.h" |
| 30 #include "core/css/PropertySetCSSStyleDeclaration.h" | 31 #include "core/css/PropertySetCSSStyleDeclaration.h" |
| 31 #include "core/css/StylePropertySet.h" | 32 #include "core/css/StylePropertySet.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 StyleKeyframe::StyleKeyframe() | 38 StyleKeyframe::StyleKeyframe() |
| 39 { | 39 { |
| 40 } | 40 } |
| 41 | 41 |
| 42 StyleKeyframe::~StyleKeyframe() | 42 StyleKeyframe::~StyleKeyframe() |
| (...skipping 27 matching lines...) Expand all Loading... |
| 70 m_keyText = keyText; | 70 m_keyText = keyText; |
| 71 m_keys.clear(); | 71 m_keys.clear(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 const Vector<double>& StyleKeyframe::keys() const | 74 const Vector<double>& StyleKeyframe::keys() const |
| 75 { | 75 { |
| 76 if (!m_keys) { | 76 if (!m_keys) { |
| 77 // Keys can only be cleared by setting the key text from JavaScript | 77 // Keys can only be cleared by setting the key text from JavaScript |
| 78 // and this can never be null. | 78 // and this can never be null. |
| 79 ASSERT(!m_keyText.isNull()); | 79 ASSERT(!m_keyText.isNull()); |
| 80 m_keys = CSSParser::parseKeyframeKeyList(m_keyText); | 80 m_keys = BisonCSSParser(strictCSSParserContext()).parseKeyframeKeyList(m
_keyText); |
| 81 } | 81 } |
| 82 // If an invalid key string was set, m_keys may be empty. | 82 // If an invalid key string was set, m_keys may be empty. |
| 83 ASSERT(m_keys); | 83 ASSERT(m_keys); |
| 84 return *m_keys; | 84 return *m_keys; |
| 85 } | 85 } |
| 86 | 86 |
| 87 void StyleKeyframe::setKeys(PassOwnPtr<Vector<double> > keys) | 87 void StyleKeyframe::setKeys(PassOwnPtr<Vector<double> > keys) |
| 88 { | 88 { |
| 89 ASSERT(keys && !keys->isEmpty()); | 89 ASSERT(keys && !keys->isEmpty()); |
| 90 m_keys = keys; | 90 m_keys = keys; |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 } | 170 } |
| 171 | 171 |
| 172 void CSSKeyframeRule::trace(Visitor* visitor) | 172 void CSSKeyframeRule::trace(Visitor* visitor) |
| 173 { | 173 { |
| 174 visitor->trace(m_keyframe); | 174 visitor->trace(m_keyframe); |
| 175 visitor->trace(m_propertiesCSSOMWrapper); | 175 visitor->trace(m_propertiesCSSOMWrapper); |
| 176 CSSRule::trace(visitor); | 176 CSSRule::trace(visitor); |
| 177 } | 177 } |
| 178 | 178 |
| 179 } // namespace blink | 179 } // namespace blink |
| OLD | NEW |