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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1377203002: Move line-height 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 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 770
771 case CSSPropertyZIndex: // auto | <integer> | inherit 771 case CSSPropertyZIndex: // auto | <integer> | inherit
772 if (id == CSSValueAuto) { 772 if (id == CSSValueAuto) {
773 validPrimitive = true; 773 validPrimitive = true;
774 } else if (validUnit(value, FInteger)) { 774 } else if (validUnit(value, FInteger)) {
775 addProperty(propId, cssValuePool().createValue(value->fValue, CSSPri mitiveValue::UnitType::Integer), important); 775 addProperty(propId, cssValuePool().createValue(value->fValue, CSSPri mitiveValue::UnitType::Integer), important);
776 return true; 776 return true;
777 } 777 }
778 break; 778 break;
779 779
780 case CSSPropertyLineHeight:
781 parsedValue = parseLineHeight();
782 break;
783 case CSSPropertyCounterIncrement: 780 case CSSPropertyCounterIncrement:
784 if (id == CSSValueNone) 781 if (id == CSSValueNone)
785 validPrimitive = true; 782 validPrimitive = true;
786 else 783 else
787 parsedValue = parseCounter(1); 784 parsedValue = parseCounter(1);
788 break; 785 break;
789 case CSSPropertyCounterReset: 786 case CSSPropertyCounterReset:
790 if (id == CSSValueNone) 787 if (id == CSSValueNone)
791 validPrimitive = true; 788 validPrimitive = true;
792 else 789 else
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
1406 case CSSPropertyWebkitHighlight: 1403 case CSSPropertyWebkitHighlight:
1407 case CSSPropertyFontVariantLigatures: 1404 case CSSPropertyFontVariantLigatures:
1408 case CSSPropertyWebkitFontFeatureSettings: 1405 case CSSPropertyWebkitFontFeatureSettings:
1409 case CSSPropertyFontVariant: 1406 case CSSPropertyFontVariant:
1410 case CSSPropertyFontFamily: 1407 case CSSPropertyFontFamily:
1411 case CSSPropertyFontWeight: 1408 case CSSPropertyFontWeight:
1412 case CSSPropertyLetterSpacing: 1409 case CSSPropertyLetterSpacing:
1413 case CSSPropertyWordSpacing: 1410 case CSSPropertyWordSpacing:
1414 case CSSPropertyTabSize: 1411 case CSSPropertyTabSize:
1415 case CSSPropertyFontSize: 1412 case CSSPropertyFontSize:
1413 case CSSPropertyLineHeight:
1416 validPrimitive = false; 1414 validPrimitive = false;
1417 break; 1415 break;
1418 1416
1419 case CSSPropertyScrollSnapPointsX: 1417 case CSSPropertyScrollSnapPointsX:
1420 case CSSPropertyScrollSnapPointsY: 1418 case CSSPropertyScrollSnapPointsY:
1421 parsedValue = parseScrollSnapPoints(); 1419 parsedValue = parseScrollSnapPoints();
1422 break; 1420 break;
1423 case CSSPropertyScrollSnapCoordinate: 1421 case CSSPropertyScrollSnapCoordinate:
1424 parsedValue = parseScrollSnapCoordinate(); 1422 parsedValue = parseScrollSnapCoordinate();
1425 break; 1423 break;
(...skipping 6038 matching lines...) Expand 10 before | Expand all | Expand 10 after
7464 } 7462 }
7465 } 7463 }
7466 7464
7467 if (!list->length()) 7465 if (!list->length())
7468 return nullptr; 7466 return nullptr;
7469 7467
7470 return list.release(); 7468 return list.release();
7471 } 7469 }
7472 7470
7473 } // namespace blink 7471 } // 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