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

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

Issue 1369353002: Move font-size property handling into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 5 years, 2 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
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 case CSSPropertyHeight: 723 case CSSPropertyHeight:
724 unitless = FUnitlessQuirk; 724 unitless = FUnitlessQuirk;
725 // fall through 725 // fall through
726 case CSSPropertyWebkitMinLogicalWidth: 726 case CSSPropertyWebkitMinLogicalWidth:
727 case CSSPropertyWebkitMinLogicalHeight: 727 case CSSPropertyWebkitMinLogicalHeight:
728 case CSSPropertyWebkitLogicalWidth: 728 case CSSPropertyWebkitLogicalWidth:
729 case CSSPropertyWebkitLogicalHeight: 729 case CSSPropertyWebkitLogicalHeight:
730 validPrimitive = (id == CSSValueAuto || validWidthOrHeight(value, unitle ss)); 730 validPrimitive = (id == CSSValueAuto || validWidthOrHeight(value, unitle ss));
731 break; 731 break;
732 732
733 case CSSPropertyFontSize:
734 return parseFontSize(important);
735
736 case CSSPropertyVerticalAlign: 733 case CSSPropertyVerticalAlign:
737 // baseline | sub | super | top | text-top | middle | bottom | text-bott om | 734 // baseline | sub | super | top | text-top | middle | bottom | text-bott om |
738 // <percentage> | <length> | inherit 735 // <percentage> | <length> | inherit
739 736
740 if (id >= CSSValueBaseline && id <= CSSValueWebkitBaselineMiddle) 737 if (id >= CSSValueBaseline && id <= CSSValueWebkitBaselineMiddle)
741 validPrimitive = true; 738 validPrimitive = true;
742 else 739 else
743 validPrimitive = validUnit(value, FLength | FPercent | FUnitlessQuir k); 740 validPrimitive = validUnit(value, FLength | FPercent | FUnitlessQuir k);
744 break; 741 break;
745 742
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 case CSSPropertyQuotes: 1405 case CSSPropertyQuotes:
1409 case CSSPropertyWebkitHighlight: 1406 case CSSPropertyWebkitHighlight:
1410 case CSSPropertyFontVariantLigatures: 1407 case CSSPropertyFontVariantLigatures:
1411 case CSSPropertyWebkitFontFeatureSettings: 1408 case CSSPropertyWebkitFontFeatureSettings:
1412 case CSSPropertyFontVariant: 1409 case CSSPropertyFontVariant:
1413 case CSSPropertyFontFamily: 1410 case CSSPropertyFontFamily:
1414 case CSSPropertyFontWeight: 1411 case CSSPropertyFontWeight:
1415 case CSSPropertyLetterSpacing: 1412 case CSSPropertyLetterSpacing:
1416 case CSSPropertyWordSpacing: 1413 case CSSPropertyWordSpacing:
1417 case CSSPropertyTabSize: 1414 case CSSPropertyTabSize:
1415 case CSSPropertyFontSize:
1418 validPrimitive = false; 1416 validPrimitive = false;
1419 break; 1417 break;
1420 1418
1421 case CSSPropertyScrollSnapPointsX: 1419 case CSSPropertyScrollSnapPointsX:
1422 case CSSPropertyScrollSnapPointsY: 1420 case CSSPropertyScrollSnapPointsY:
1423 parsedValue = parseScrollSnapPoints(); 1421 parsedValue = parseScrollSnapPoints();
1424 break; 1422 break;
1425 case CSSPropertyScrollSnapCoordinate: 1423 case CSSPropertyScrollSnapCoordinate:
1426 parsedValue = parseScrollSnapCoordinate(); 1424 parsedValue = parseScrollSnapCoordinate();
1427 break; 1425 break;
(...skipping 6038 matching lines...) Expand 10 before | Expand all | Expand 10 after
7466 } 7464 }
7467 } 7465 }
7468 7466
7469 if (!list->length()) 7467 if (!list->length())
7470 return nullptr; 7468 return nullptr;
7471 7469
7472 return list.release(); 7470 return list.release();
7473 } 7471 }
7474 7472
7475 } // namespace blink 7473 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698