Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> | 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. | 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. |
| 7 * Copyright (C) 2015 Google Inc. All rights reserved. | 7 * Copyright (C) 2015 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Lesser General Public | 10 * modify it under the terms of the GNU Lesser General Public |
| (...skipping 2712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2723 case CSSPropertyPadding: | 2723 case CSSPropertyPadding: |
| 2724 return valuesForSidesShorthand(paddingShorthand(), style, layoutObject, styledNode, allowVisitedStyle); | 2724 return valuesForSidesShorthand(paddingShorthand(), style, layoutObject, styledNode, allowVisitedStyle); |
| 2725 // Individual properties not part of the spec. | 2725 // Individual properties not part of the spec. |
| 2726 case CSSPropertyBackgroundRepeatX: | 2726 case CSSPropertyBackgroundRepeatX: |
| 2727 case CSSPropertyBackgroundRepeatY: | 2727 case CSSPropertyBackgroundRepeatY: |
| 2728 return nullptr; | 2728 return nullptr; |
| 2729 | 2729 |
| 2730 case CSSPropertyMotion: | 2730 case CSSPropertyMotion: |
| 2731 return valuesForShorthandProperty(motionShorthand(), style, layoutObject , styledNode, allowVisitedStyle); | 2731 return valuesForShorthandProperty(motionShorthand(), style, layoutObject , styledNode, allowVisitedStyle); |
| 2732 | 2732 |
| 2733 case CSSPropertyMotionPath: | 2733 case CSSPropertyOffset: |
| 2734 if (const StylePath* styleMotionPath = style.motionPath()) | 2734 return valuesForShorthandProperty(offsetShorthand(), style, layoutObject , styledNode, allowVisitedStyle); |
| 2735 | |
| 2736 case CSSPropertyOffsetPath: | |
| 2737 if (const StylePath* styleMotionPath = style.offsetPath()) | |
| 2735 return styleMotionPath->computedCSSValue(); | 2738 return styleMotionPath->computedCSSValue(); |
| 2736 return CSSPrimitiveValue::createIdentifier(CSSValueNone); | 2739 return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
| 2737 | 2740 |
| 2738 case CSSPropertyMotionOffset: | 2741 case CSSPropertyOffsetDistance: |
| 2739 return zoomAdjustedPixelValueForLength(style.motionOffset(), style); | 2742 return zoomAdjustedPixelValueForLength(style.offsetDistance(), style); |
| 2740 | 2743 |
| 2741 case CSSPropertyMotionRotation: { | 2744 case CSSPropertyOffsetRotation: { |
| 2742 CSSValueList* list = CSSValueList::createSpaceSeparated(); | 2745 CSSValueList* list = CSSValueList::createSpaceSeparated(); |
| 2743 if (style.motionRotation().type == MotionRotationAuto) | 2746 if (style.offsetRotation().type == OffsetRotationAuto) |
| 2744 list->append(*CSSPrimitiveValue::createIdentifier(CSSValueAuto)); | 2747 list->append(*CSSPrimitiveValue::createIdentifier(CSSValueAuto)); |
| 2745 list->append(*CSSPrimitiveValue::create(style.motionRotation().angle, CS SPrimitiveValue::UnitType::Degrees)); | 2748 list->append(*CSSPrimitiveValue::create(style.offsetRotation().angle, CS SPrimitiveValue::UnitType::Degrees)); |
| 2746 return list; | 2749 return list; |
| 2747 } | 2750 } |
| 2748 | 2751 |
| 2749 // Unimplemented CSS 3 properties (including CSS3 shorthand properties). | 2752 // Unimplemented CSS 3 properties (including CSS3 shorthand properties). |
| 2750 case CSSPropertyWebkitTextEmphasis: | 2753 case CSSPropertyWebkitTextEmphasis: |
| 2751 return nullptr; | 2754 return nullptr; |
| 2752 | 2755 |
| 2753 // Directional properties are resolved by resolveDirectionAwareProperty() be fore the switch. | 2756 // Directional properties are resolved by resolveDirectionAwareProperty() be fore the switch. |
| 2754 case CSSPropertyWebkitBorderEnd: | 2757 case CSSPropertyWebkitBorderEnd: |
| 2755 case CSSPropertyWebkitBorderEndColor: | 2758 case CSSPropertyWebkitBorderEndColor: |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3016 case CSSPropertyAll: | 3019 case CSSPropertyAll: |
| 3017 return nullptr; | 3020 return nullptr; |
| 3018 default: | 3021 default: |
| 3019 break; | 3022 break; |
| 3020 } | 3023 } |
| 3021 ASSERT_NOT_REACHED(); | 3024 ASSERT_NOT_REACHED(); |
| 3022 return nullptr; | 3025 return nullptr; |
| 3023 } | 3026 } |
| 3024 | 3027 |
| 3025 } // namespace blink | 3028 } // namespace blink |
| 3029 | |
|
alancutter (OOO until 2018)
2016/09/19 00:49:54
No need for extra newline.
Eric Willigers
2016/09/19 01:54:40
Done.
| |
| OLD | NEW |