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 |
(...skipping 23 matching lines...) Expand all Loading... |
34 namespace WebCore { | 34 namespace WebCore { |
35 | 35 |
36 StyleKeyframe::StyleKeyframe() | 36 StyleKeyframe::StyleKeyframe() |
37 { | 37 { |
38 } | 38 } |
39 | 39 |
40 StyleKeyframe::~StyleKeyframe() | 40 StyleKeyframe::~StyleKeyframe() |
41 { | 41 { |
42 } | 42 } |
43 | 43 |
44 StylePropertySet* StyleKeyframe::mutableProperties() | 44 MutableStylePropertySet* StyleKeyframe::mutableProperties() |
45 { | 45 { |
46 if (!m_properties->isMutable()) | 46 if (!m_properties->isMutable()) |
47 m_properties = m_properties->mutableCopy(); | 47 m_properties = m_properties->mutableCopy(); |
48 return m_properties.get(); | 48 return static_cast<MutableStylePropertySet*>(m_properties.get()); |
49 } | 49 } |
50 | 50 |
51 void StyleKeyframe::setProperties(PassRefPtr<StylePropertySet> properties) | 51 void StyleKeyframe::setProperties(PassRefPtr<StylePropertySet> properties) |
52 { | 52 { |
53 m_properties = properties; | 53 m_properties = properties; |
54 } | 54 } |
55 | 55 |
56 /* static */ | 56 /* static */ |
57 void StyleKeyframe::parseKeyString(const String& s, Vector<float>& keys) | 57 void StyleKeyframe::parseKeyString(const String& s, Vector<float>& keys) |
58 { | 58 { |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 info.addMember(m_propertiesCSSOMWrapper, "propertiesCSSOMWrapper"); | 131 info.addMember(m_propertiesCSSOMWrapper, "propertiesCSSOMWrapper"); |
132 } | 132 } |
133 | 133 |
134 void WebKitCSSKeyframeRule::reattach(StyleRuleBase*) | 134 void WebKitCSSKeyframeRule::reattach(StyleRuleBase*) |
135 { | 135 { |
136 // No need to reattach, the underlying data is shareable on mutation. | 136 // No need to reattach, the underlying data is shareable on mutation. |
137 ASSERT_NOT_REACHED(); | 137 ASSERT_NOT_REACHED(); |
138 } | 138 } |
139 | 139 |
140 } // namespace WebCore | 140 } // namespace WebCore |
OLD | NEW |