third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp - Issue 1909233002: Spec-compliant parsing and initial values for 'orphans' and 'widows'.

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

Issue 1909233002: Spec-compliant parsing and initial values for 'orphans' and 'widows'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Some unit tests had non-conformant widphans assumptions too. Created 4 years, 8 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

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 1915 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1926 case CSSPropertyObjectFit:	1926 case CSSPropertyObjectFit:

1927 return cssValuePool().createValue(style.getObjectFit());	1927 return cssValuePool().createValue(style.getObjectFit());

1928 case CSSPropertyObjectPosition:	1928 case CSSPropertyObjectPosition:

1929 return CSSValuePair::create(	1929 return CSSValuePair::create(

1930 zoomAdjustedPixelValueForLength(style.objectPosition().x(), style),	1930 zoomAdjustedPixelValueForLength(style.objectPosition().x(), style),

1931 zoomAdjustedPixelValueForLength(style.objectPosition().y(), style),	1931 zoomAdjustedPixelValueForLength(style.objectPosition().y(), style),

1932 CSSValuePair::KeepIdenticalValues);	1932 CSSValuePair::KeepIdenticalValues);

1933 case CSSPropertyOpacity:	1933 case CSSPropertyOpacity:

1934 return cssValuePool().createValue(style.opacity(), CSSPrimitiveValue::Un itType::Number);	1934 return cssValuePool().createValue(style.opacity(), CSSPrimitiveValue::Un itType::Number);

1935 case CSSPropertyOrphans:	1935 case CSSPropertyOrphans:

1936 if (style.hasAutoOrphans())

1937 return cssValuePool().createIdentifierValue(CSSValueAuto);

1938 return cssValuePool().createValue(style.orphans(), CSSPrimitiveValue::Un itType::Number);	1936 return cssValuePool().createValue(style.orphans(), CSSPrimitiveValue::Un itType::Number);

1939 case CSSPropertyOutlineColor:	1937 case CSSPropertyOutlineColor:

1940 return allowVisitedStyle ? cssValuePool().createColorValue(style.visited DependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style, style.outlineColor());	1938 return allowVisitedStyle ? cssValuePool().createColorValue(style.visited DependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style, style.outlineColor());

1941 case CSSPropertyOutlineOffset:	1939 case CSSPropertyOutlineOffset:

1942 return zoomAdjustedPixelValue(style.outlineOffset(), style);	1940 return zoomAdjustedPixelValue(style.outlineOffset(), style);

1943 case CSSPropertyOutlineStyle:	1941 case CSSPropertyOutlineStyle:

1944 if (style.outlineStyleIsAuto())	1942 if (style.outlineStyleIsAuto())

1945 return cssValuePool().createIdentifierValue(CSSValueAuto);	1943 return cssValuePool().createIdentifierValue(CSSValueAuto);

1946 return cssValuePool().createValue(style.outlineStyle());	1944 return cssValuePool().createValue(style.outlineStyle());

1947 case CSSPropertyOutlineWidth:	1945 case CSSPropertyOutlineWidth:

(...skipping 885 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2833 case CSSPropertyAll:	2831 case CSSPropertyAll:

2834 return nullptr;	2832 return nullptr;

2835 default:	2833 default:

2836 break;	2834 break;

2837 }	2835 }

2838 ASSERT_NOT_REACHED();	2836 ASSERT_NOT_REACHED();

2839 return nullptr;	2837 return nullptr;

2840 }	2838 }

2841	2839

2842 } // namespace blink	2840 } // namespace blink

OLD	NEW