Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 2752623002: Return '' for overflow if overflow-x and overflow-y are different. (Closed)
Patch Set: Address comments Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2648 matching lines...) Expand 10 before | Expand all | Expand 10 after
2659 : currentColorOrValidColor(style, style.outlineColor()); 2659 : currentColorOrValidColor(style, style.outlineColor());
2660 case CSSPropertyOutlineOffset: 2660 case CSSPropertyOutlineOffset:
2661 return zoomAdjustedPixelValue(style.outlineOffset(), style); 2661 return zoomAdjustedPixelValue(style.outlineOffset(), style);
2662 case CSSPropertyOutlineStyle: 2662 case CSSPropertyOutlineStyle:
2663 if (style.outlineStyleIsAuto()) 2663 if (style.outlineStyleIsAuto())
2664 return CSSIdentifierValue::create(CSSValueAuto); 2664 return CSSIdentifierValue::create(CSSValueAuto);
2665 return CSSIdentifierValue::create(style.outlineStyle()); 2665 return CSSIdentifierValue::create(style.outlineStyle());
2666 case CSSPropertyOutlineWidth: 2666 case CSSPropertyOutlineWidth:
2667 return zoomAdjustedPixelValue(style.outlineWidth(), style); 2667 return zoomAdjustedPixelValue(style.outlineWidth(), style);
2668 case CSSPropertyOverflow: 2668 case CSSPropertyOverflow:
2669 return CSSIdentifierValue::create( 2669 if (style.overflowX() == style.overflowY())
2670 max(style.overflowX(), style.overflowY())); 2670 return CSSIdentifierValue::create(style.overflowX());
2671 return nullptr;
2671 case CSSPropertyOverflowAnchor: 2672 case CSSPropertyOverflowAnchor:
2672 return CSSIdentifierValue::create(style.overflowAnchor()); 2673 return CSSIdentifierValue::create(style.overflowAnchor());
2673 case CSSPropertyOverflowWrap: 2674 case CSSPropertyOverflowWrap:
2674 return CSSIdentifierValue::create(style.overflowWrap()); 2675 return CSSIdentifierValue::create(style.overflowWrap());
2675 case CSSPropertyOverflowX: 2676 case CSSPropertyOverflowX:
2676 return CSSIdentifierValue::create(style.overflowX()); 2677 return CSSIdentifierValue::create(style.overflowX());
2677 case CSSPropertyOverflowY: 2678 case CSSPropertyOverflowY:
2678 return CSSIdentifierValue::create(style.overflowY()); 2679 return CSSIdentifierValue::create(style.overflowY());
2679 case CSSPropertyPaddingTop: { 2680 case CSSPropertyPaddingTop: {
2680 Length paddingTop = style.paddingTop(); 2681 Length paddingTop = style.paddingTop();
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
3675 case CSSPropertyAll: 3676 case CSSPropertyAll:
3676 return nullptr; 3677 return nullptr;
3677 default: 3678 default:
3678 break; 3679 break;
3679 } 3680 }
3680 ASSERT_NOT_REACHED(); 3681 ASSERT_NOT_REACHED();
3681 return nullptr; 3682 return nullptr;
3682 } 3683 }
3683 3684
3684 } // namespace blink 3685 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698