| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. | 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 | 85 |
| 86 void reportMemoryUsage(MemoryObjectInfo*) const; | 86 void reportMemoryUsage(MemoryObjectInfo*) const; |
| 87 | 87 |
| 88 StylePropertyMetadata metadata() const { return m_metadata; } | 88 StylePropertyMetadata metadata() const { return m_metadata; } |
| 89 | 89 |
| 90 private: | 90 private: |
| 91 StylePropertyMetadata m_metadata; | 91 StylePropertyMetadata m_metadata; |
| 92 RefPtr<CSSValue> m_value; | 92 RefPtr<CSSValue> m_value; |
| 93 }; | 93 }; |
| 94 | 94 |
| 95 inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propId) |
| 96 { |
| 97 CSSPropertyID propertyId = CSSPropertyInvalid; |
| 98 switch (propId) { |
| 99 case CSSPropertyTransitionDelay: |
| 100 propertyId = CSSPropertyWebkitTransitionDelay; |
| 101 break; |
| 102 case CSSPropertyTransitionDuration: |
| 103 propertyId = CSSPropertyWebkitTransitionDuration; |
| 104 break; |
| 105 case CSSPropertyTransitionProperty: |
| 106 propertyId = CSSPropertyWebkitTransitionProperty; |
| 107 break; |
| 108 case CSSPropertyTransitionTimingFunction: |
| 109 propertyId = CSSPropertyWebkitTransitionTimingFunction; |
| 110 break; |
| 111 case CSSPropertyTransition: |
| 112 propertyId = CSSPropertyWebkitTransition; |
| 113 break; |
| 114 case CSSPropertyWebkitTransitionDelay: |
| 115 propertyId = CSSPropertyTransitionDelay; |
| 116 break; |
| 117 case CSSPropertyWebkitTransitionDuration: |
| 118 propertyId = CSSPropertyTransitionDuration; |
| 119 break; |
| 120 case CSSPropertyWebkitTransitionProperty: |
| 121 propertyId = CSSPropertyTransitionProperty; |
| 122 break; |
| 123 case CSSPropertyWebkitTransitionTimingFunction: |
| 124 propertyId = CSSPropertyTransitionTimingFunction; |
| 125 break; |
| 126 case CSSPropertyWebkitTransition: |
| 127 propertyId = CSSPropertyTransition; |
| 128 break; |
| 129 default: |
| 130 propertyId = propId; |
| 131 break; |
| 132 } |
| 133 ASSERT(propertyId != CSSPropertyInvalid); |
| 134 return propertyId; |
| 135 } |
| 136 |
| 95 } // namespace WebCore | 137 } // namespace WebCore |
| 96 | 138 |
| 97 namespace WTF { | 139 namespace WTF { |
| 98 template <> struct VectorTraits<WebCore::CSSProperty> : VectorTraitsBase<false,
WebCore::CSSProperty> { | 140 template <> struct VectorTraits<WebCore::CSSProperty> : VectorTraitsBase<false,
WebCore::CSSProperty> { |
| 99 static const bool canInitializeWithMemset = true; | 141 static const bool canInitializeWithMemset = true; |
| 100 static const bool canMoveWithMemcpy = true; | 142 static const bool canMoveWithMemcpy = true; |
| 101 }; | 143 }; |
| 102 } | 144 } |
| 103 | 145 |
| 104 #endif // CSSProperty_h | 146 #endif // CSSProperty_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 12470005:
Merge 144626 (Closed)
Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/