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 2636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2647 : currentColorOrValidColor(style, style.outlineColor()); | 2647 : currentColorOrValidColor(style, style.outlineColor()); |
2648 case CSSPropertyOutlineOffset: | 2648 case CSSPropertyOutlineOffset: |
2649 return zoomAdjustedPixelValue(style.outlineOffset(), style); | 2649 return zoomAdjustedPixelValue(style.outlineOffset(), style); |
2650 case CSSPropertyOutlineStyle: | 2650 case CSSPropertyOutlineStyle: |
2651 if (style.outlineStyleIsAuto()) | 2651 if (style.outlineStyleIsAuto()) |
2652 return CSSIdentifierValue::create(CSSValueAuto); | 2652 return CSSIdentifierValue::create(CSSValueAuto); |
2653 return CSSIdentifierValue::create(style.outlineStyle()); | 2653 return CSSIdentifierValue::create(style.outlineStyle()); |
2654 case CSSPropertyOutlineWidth: | 2654 case CSSPropertyOutlineWidth: |
2655 return zoomAdjustedPixelValue(style.outlineWidth(), style); | 2655 return zoomAdjustedPixelValue(style.outlineWidth(), style); |
2656 case CSSPropertyOverflow: | 2656 case CSSPropertyOverflow: |
2657 return CSSIdentifierValue::create( | 2657 if (style.overflowX() == style.overflowY()) |
2658 max(style.overflowX(), style.overflowY())); | 2658 return CSSIdentifierValue::create(style.overflowX()); |
| 2659 return nullptr; |
2659 case CSSPropertyOverflowAnchor: | 2660 case CSSPropertyOverflowAnchor: |
2660 return CSSIdentifierValue::create(style.overflowAnchor()); | 2661 return CSSIdentifierValue::create(style.overflowAnchor()); |
2661 case CSSPropertyOverflowWrap: | 2662 case CSSPropertyOverflowWrap: |
2662 return CSSIdentifierValue::create(style.overflowWrap()); | 2663 return CSSIdentifierValue::create(style.overflowWrap()); |
2663 case CSSPropertyOverflowX: | 2664 case CSSPropertyOverflowX: |
2664 return CSSIdentifierValue::create(style.overflowX()); | 2665 return CSSIdentifierValue::create(style.overflowX()); |
2665 case CSSPropertyOverflowY: | 2666 case CSSPropertyOverflowY: |
2666 return CSSIdentifierValue::create(style.overflowY()); | 2667 return CSSIdentifierValue::create(style.overflowY()); |
2667 case CSSPropertyPaddingTop: { | 2668 case CSSPropertyPaddingTop: { |
2668 Length paddingTop = style.paddingTop(); | 2669 Length paddingTop = style.paddingTop(); |
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3663 case CSSPropertyAll: | 3664 case CSSPropertyAll: |
3664 return nullptr; | 3665 return nullptr; |
3665 default: | 3666 default: |
3666 break; | 3667 break; |
3667 } | 3668 } |
3668 ASSERT_NOT_REACHED(); | 3669 ASSERT_NOT_REACHED(); |
3669 return nullptr; | 3670 return nullptr; |
3670 } | 3671 } |
3671 | 3672 |
3672 } // namespace blink | 3673 } // namespace blink |
OLD | NEW |