| 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, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r
ights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r
ights reserved. |
| 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. | 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. |
| 5 * Copyright (C) 2013 Intel Corporation. All rights reserved. | 5 * Copyright (C) 2013 Intel Corporation. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 case CSSPropertyWebkitMaskPositionY: | 196 case CSSPropertyWebkitMaskPositionY: |
| 197 case CSSPropertyWebkitMaskRepeatX: | 197 case CSSPropertyWebkitMaskRepeatX: |
| 198 case CSSPropertyWebkitMaskRepeatY: | 198 case CSSPropertyWebkitMaskRepeatY: |
| 199 case CSSPropertyWebkitMaskImage: | 199 case CSSPropertyWebkitMaskImage: |
| 200 case CSSPropertyWebkitMaskRepeat: | 200 case CSSPropertyWebkitMaskRepeat: |
| 201 case CSSPropertyWebkitMaskPosition: | 201 case CSSPropertyWebkitMaskPosition: |
| 202 case CSSPropertyWebkitMaskClip: | 202 case CSSPropertyWebkitMaskClip: |
| 203 case CSSPropertyWebkitMaskOrigin: | 203 case CSSPropertyWebkitMaskOrigin: |
| 204 shorthandPropertyID = CSSPropertyWebkitMask; | 204 shorthandPropertyID = CSSPropertyWebkitMask; |
| 205 break; | 205 break; |
| 206 case CSSPropertyWebkitTransformOriginX: | |
| 207 case CSSPropertyWebkitTransformOriginY: | |
| 208 case CSSPropertyWebkitTransformOriginZ: | |
| 209 shorthandPropertyID = CSSPropertyWebkitTransformOrigin; | |
| 210 break; | |
| 211 case CSSPropertyWebkitTransitionProperty: | 206 case CSSPropertyWebkitTransitionProperty: |
| 212 case CSSPropertyWebkitTransitionDuration: | 207 case CSSPropertyWebkitTransitionDuration: |
| 213 case CSSPropertyWebkitTransitionTimingFunction: | 208 case CSSPropertyWebkitTransitionTimingFunction: |
| 214 case CSSPropertyWebkitTransitionDelay: | 209 case CSSPropertyWebkitTransitionDelay: |
| 215 shorthandPropertyID = CSSPropertyWebkitTransition; | 210 shorthandPropertyID = CSSPropertyWebkitTransition; |
| 216 break; | 211 break; |
| 217 default: | 212 default: |
| 218 break; | 213 break; |
| 219 } | 214 } |
| 220 | 215 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 case CSSPropertyWebkitMaskPosition: | 306 case CSSPropertyWebkitMaskPosition: |
| 312 return getLayeredShorthandValue(webkitMaskPositionShorthand()); | 307 return getLayeredShorthandValue(webkitMaskPositionShorthand()); |
| 313 case CSSPropertyWebkitMaskRepeat: | 308 case CSSPropertyWebkitMaskRepeat: |
| 314 return getLayeredShorthandValue(webkitMaskRepeatShorthand()); | 309 return getLayeredShorthandValue(webkitMaskRepeatShorthand()); |
| 315 case CSSPropertyWebkitMask: | 310 case CSSPropertyWebkitMask: |
| 316 return getLayeredShorthandValue(webkitMaskShorthand()); | 311 return getLayeredShorthandValue(webkitMaskShorthand()); |
| 317 case CSSPropertyWebkitTextEmphasis: | 312 case CSSPropertyWebkitTextEmphasis: |
| 318 return getShorthandValue(webkitTextEmphasisShorthand()); | 313 return getShorthandValue(webkitTextEmphasisShorthand()); |
| 319 case CSSPropertyWebkitTextStroke: | 314 case CSSPropertyWebkitTextStroke: |
| 320 return getShorthandValue(webkitTextStrokeShorthand()); | 315 return getShorthandValue(webkitTextStrokeShorthand()); |
| 321 case CSSPropertyTransformOrigin: | |
| 322 case CSSPropertyWebkitTransformOrigin: | |
| 323 return getShorthandValue(webkitTransformOriginShorthand()); | |
| 324 case CSSPropertyWebkitTransition: | 316 case CSSPropertyWebkitTransition: |
| 325 return getLayeredShorthandValue(webkitTransitionShorthand(), true); | 317 return getLayeredShorthandValue(webkitTransitionShorthand(), true); |
| 326 case CSSPropertyWebkitAnimation: | 318 case CSSPropertyWebkitAnimation: |
| 327 return getLayeredShorthandValue(webkitAnimationShorthand(), true); | 319 return getLayeredShorthandValue(webkitAnimationShorthand(), true); |
| 328 case CSSPropertyMarker: { | 320 case CSSPropertyMarker: { |
| 329 RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(C
SSPropertyMarkerStart); | 321 RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(C
SSPropertyMarkerStart); |
| 330 if (value) | 322 if (value) |
| 331 return value->cssText(); | 323 return value->cssText(); |
| 332 return String(); | 324 return String(); |
| 333 } | 325 } |
| (...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 875 isInitialValue = false; | 867 isInitialValue = false; |
| 876 if (!value->isInheritedValue()) | 868 if (!value->isInheritedValue()) |
| 877 isInheritedValue = false; | 869 isInheritedValue = false; |
| 878 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) | 870 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) |
| 879 return false; | 871 return false; |
| 880 } | 872 } |
| 881 return isInitialValue || isInheritedValue; | 873 return isInitialValue || isInheritedValue; |
| 882 } | 874 } |
| 883 | 875 |
| 884 } | 876 } |
| OLD | NEW |