Chromium Code Reviews| 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 306 case CSSPropertyWebkitMaskPosition: | 306 case CSSPropertyWebkitMaskPosition: |
| 307 return getLayeredShorthandValue(webkitMaskPositionShorthand()); | 307 return getLayeredShorthandValue(webkitMaskPositionShorthand()); |
| 308 case CSSPropertyWebkitMaskRepeat: | 308 case CSSPropertyWebkitMaskRepeat: |
| 309 return getLayeredShorthandValue(webkitMaskRepeatShorthand()); | 309 return getLayeredShorthandValue(webkitMaskRepeatShorthand()); |
| 310 case CSSPropertyWebkitMask: | 310 case CSSPropertyWebkitMask: |
| 311 return getLayeredShorthandValue(webkitMaskShorthand()); | 311 return getLayeredShorthandValue(webkitMaskShorthand()); |
| 312 case CSSPropertyWebkitTextEmphasis: | 312 case CSSPropertyWebkitTextEmphasis: |
| 313 return getShorthandValue(webkitTextEmphasisShorthand()); | 313 return getShorthandValue(webkitTextEmphasisShorthand()); |
| 314 case CSSPropertyWebkitTextStroke: | 314 case CSSPropertyWebkitTextStroke: |
| 315 return getShorthandValue(webkitTextStrokeShorthand()); | 315 return getShorthandValue(webkitTextStrokeShorthand()); |
| 316 case CSSPropertyTransformOrigin: | |
|
Julien - ping for review
2014/03/21 03:57:25
Wouldn't that make us return the prefixed property
dstockwell
2014/03/24 21:40:56
I see. I'll look into removing this.
| |
| 316 case CSSPropertyWebkitTransformOrigin: | 317 case CSSPropertyWebkitTransformOrigin: |
| 317 return getShorthandValue(webkitTransformOriginShorthand()); | 318 return getShorthandValue(webkitTransformOriginShorthand()); |
| 318 case CSSPropertyWebkitTransition: | 319 case CSSPropertyWebkitTransition: |
| 319 return getLayeredShorthandValue(webkitTransitionShorthand()); | 320 return getLayeredShorthandValue(webkitTransitionShorthand()); |
| 320 case CSSPropertyWebkitAnimation: | 321 case CSSPropertyWebkitAnimation: |
| 321 return getLayeredShorthandValue(webkitAnimationShorthand()); | 322 return getLayeredShorthandValue(webkitAnimationShorthand()); |
| 322 case CSSPropertyMarker: { | 323 case CSSPropertyMarker: { |
| 323 RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(C SSPropertyMarkerStart); | 324 RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(C SSPropertyMarkerStart); |
| 324 if (value) | 325 if (value) |
| 325 return value->cssText(); | 326 return value->cssText(); |
| (...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 842 isInitialValue = false; | 843 isInitialValue = false; |
| 843 if (!value->isInheritedValue()) | 844 if (!value->isInheritedValue()) |
| 844 isInheritedValue = false; | 845 isInheritedValue = false; |
| 845 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie s()[i])) | 846 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie s()[i])) |
| 846 return false; | 847 return false; |
| 847 } | 848 } |
| 848 return isInitialValue || isInheritedValue; | 849 return isInitialValue || isInheritedValue; |
| 849 } | 850 } |
| 850 | 851 |
| 851 } | 852 } |
| OLD | NEW |