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. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. |
4 * All rights reserved. | 4 * All rights reserved. |
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. | 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. |
8 * Copyright (C) 2015 Google Inc. All rights reserved. | 8 * Copyright (C) 2015 Google Inc. All rights reserved. |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 2664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2675 : currentColorOrValidColor(style, style.outlineColor()); | 2675 : currentColorOrValidColor(style, style.outlineColor()); |
2676 case CSSPropertyOutlineOffset: | 2676 case CSSPropertyOutlineOffset: |
2677 return zoomAdjustedPixelValue(style.outlineOffset(), style); | 2677 return zoomAdjustedPixelValue(style.outlineOffset(), style); |
2678 case CSSPropertyOutlineStyle: | 2678 case CSSPropertyOutlineStyle: |
2679 if (style.outlineStyleIsAuto()) | 2679 if (style.outlineStyleIsAuto()) |
2680 return CSSIdentifierValue::create(CSSValueAuto); | 2680 return CSSIdentifierValue::create(CSSValueAuto); |
2681 return CSSIdentifierValue::create(style.outlineStyle()); | 2681 return CSSIdentifierValue::create(style.outlineStyle()); |
2682 case CSSPropertyOutlineWidth: | 2682 case CSSPropertyOutlineWidth: |
2683 return zoomAdjustedPixelValue(style.outlineWidth(), style); | 2683 return zoomAdjustedPixelValue(style.outlineWidth(), style); |
2684 case CSSPropertyOverflow: | 2684 case CSSPropertyOverflow: |
2685 return CSSIdentifierValue::create( | 2685 if (style.overflowX() == style.overflowY()) |
2686 max(style.overflowX(), style.overflowY())); | 2686 return CSSIdentifierValue::create(style.overflowX()); |
| 2687 return nullptr; |
2687 case CSSPropertyOverflowAnchor: | 2688 case CSSPropertyOverflowAnchor: |
2688 return CSSIdentifierValue::create(style.overflowAnchor()); | 2689 return CSSIdentifierValue::create(style.overflowAnchor()); |
2689 case CSSPropertyOverflowWrap: | 2690 case CSSPropertyOverflowWrap: |
2690 return CSSIdentifierValue::create(style.overflowWrap()); | 2691 return CSSIdentifierValue::create(style.overflowWrap()); |
2691 case CSSPropertyOverflowX: | 2692 case CSSPropertyOverflowX: |
2692 return CSSIdentifierValue::create(style.overflowX()); | 2693 return CSSIdentifierValue::create(style.overflowX()); |
2693 case CSSPropertyOverflowY: | 2694 case CSSPropertyOverflowY: |
2694 return CSSIdentifierValue::create(style.overflowY()); | 2695 return CSSIdentifierValue::create(style.overflowY()); |
2695 case CSSPropertyPaddingTop: { | 2696 case CSSPropertyPaddingTop: { |
2696 Length paddingTop = style.paddingTop(); | 2697 Length paddingTop = style.paddingTop(); |
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3691 case CSSPropertyAll: | 3692 case CSSPropertyAll: |
3692 return nullptr; | 3693 return nullptr; |
3693 default: | 3694 default: |
3694 break; | 3695 break; |
3695 } | 3696 } |
3696 ASSERT_NOT_REACHED(); | 3697 ASSERT_NOT_REACHED(); |
3697 return nullptr; | 3698 return nullptr; |
3698 } | 3699 } |
3699 | 3700 |
3700 } // namespace blink | 3701 } // namespace blink |
OLD | NEW |