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: sky/engine/core/css/parser/BisonCSSParser-in.cpp

Issue 700703002: Remove more float machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/css/CSSProperties.in ('k') | sky/engine/core/css/resolver/StyleAdjuster.cpp » ('j') | 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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 case CSSPropertyBorderLeftStyle: 361 case CSSPropertyBorderLeftStyle:
362 case CSSPropertyWebkitBorderAfterStyle: 362 case CSSPropertyWebkitBorderAfterStyle:
363 case CSSPropertyWebkitBorderBeforeStyle: 363 case CSSPropertyWebkitBorderBeforeStyle:
364 case CSSPropertyWebkitBorderEndStyle: 364 case CSSPropertyWebkitBorderEndStyle:
365 case CSSPropertyWebkitBorderStartStyle: 365 case CSSPropertyWebkitBorderStartStyle:
366 return valueID >= CSSValueNone && valueID <= CSSValueDouble; 366 return valueID >= CSSValueNone && valueID <= CSSValueDouble;
367 case CSSPropertyBoxSizing: 367 case CSSPropertyBoxSizing:
368 return valueID == CSSValueBorderBox || valueID == CSSValueContentBox; 368 return valueID == CSSValueBorderBox || valueID == CSSValueContentBox;
369 case CSSPropertyCaptionSide: // top | bottom | left | right 369 case CSSPropertyCaptionSide: // top | bottom | left | right
370 return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueTop || valueID == CSSValueBottom; 370 return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueTop || valueID == CSSValueBottom;
371 case CSSPropertyClear: // none | left | right | both
372 return valueID == CSSValueNone || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueBoth;
373 case CSSPropertyDirection: // ltr | rtl 371 case CSSPropertyDirection: // ltr | rtl
374 return valueID == CSSValueLtr || valueID == CSSValueRtl; 372 return valueID == CSSValueLtr || valueID == CSSValueRtl;
375 case CSSPropertyDisplay: 373 case CSSPropertyDisplay:
376 // inline | block | list-item | inline-block | table | 374 // inline | block | list-item | inline-block | table |
377 // inline-table | table-row-group | table-header-group | table-footer-gr oup | table-row | 375 // inline-table | table-row-group | table-header-group | table-footer-gr oup | table-row |
378 // table-column-group | table-column | table-cell | table-caption | -web kit-box | -webkit-inline-box | none 376 // table-column-group | table-column | table-cell | table-caption | -web kit-box | -webkit-inline-box | none
379 // flex | inline-flex 377 // flex | inline-flex
380 return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || v alueID == CSSValueNone; 378 return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || v alueID == CSSValueNone;
381 case CSSPropertyEmptyCells: // show | hide 379 case CSSPropertyEmptyCells: // show | hide
382 return valueID == CSSValueShow || valueID == CSSValueHide; 380 return valueID == CSSValueShow || valueID == CSSValueHide;
383 case CSSPropertyFloat: // left | right | none | center (for buggy CSS, maps to none)
384 return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueNone || valueID == CSSValueCenter;
385 case CSSPropertyFontStyle: // normal | italic | oblique 381 case CSSPropertyFontStyle: // normal | italic | oblique
386 return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique; 382 return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique;
387 case CSSPropertyFontStretch: // normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra- expanded 383 case CSSPropertyFontStretch: // normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra- expanded
388 return valueID == CSSValueNormal || (valueID >= CSSValueUltraCondensed & & valueID <= CSSValueUltraExpanded); 384 return valueID == CSSValueNormal || (valueID >= CSSValueUltraCondensed & & valueID <= CSSValueUltraExpanded);
389 case CSSPropertyImageRendering: // auto | optimizeContrast | pixelated 385 case CSSPropertyImageRendering: // auto | optimizeContrast | pixelated
390 return valueID == CSSValueAuto || valueID == CSSValueWebkitOptimizeContr ast || (RuntimeEnabledFeatures::imageRenderingPixelatedEnabled() && valueID == C SSValuePixelated); 386 return valueID == CSSValueAuto || valueID == CSSValueWebkitOptimizeContr ast || (RuntimeEnabledFeatures::imageRenderingPixelatedEnabled() && valueID == C SSValuePixelated);
391 case CSSPropertyIsolation: // auto | isolate 387 case CSSPropertyIsolation: // auto | isolate
392 ASSERT(RuntimeEnabledFeatures::cssCompositingEnabled()); 388 ASSERT(RuntimeEnabledFeatures::cssCompositingEnabled());
393 return valueID == CSSValueAuto || valueID == CSSValueIsolate; 389 return valueID == CSSValueAuto || valueID == CSSValueIsolate;
394 case CSSPropertyListStylePosition: // inside | outside 390 case CSSPropertyListStylePosition: // inside | outside
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 case CSSPropertyIsolation: 520 case CSSPropertyIsolation:
525 case CSSPropertyBackgroundRepeatX: 521 case CSSPropertyBackgroundRepeatX:
526 case CSSPropertyBackgroundRepeatY: 522 case CSSPropertyBackgroundRepeatY:
527 case CSSPropertyBorderBottomStyle: 523 case CSSPropertyBorderBottomStyle:
528 case CSSPropertyBorderCollapse: 524 case CSSPropertyBorderCollapse:
529 case CSSPropertyBorderLeftStyle: 525 case CSSPropertyBorderLeftStyle:
530 case CSSPropertyBorderRightStyle: 526 case CSSPropertyBorderRightStyle:
531 case CSSPropertyBorderTopStyle: 527 case CSSPropertyBorderTopStyle:
532 case CSSPropertyBoxSizing: 528 case CSSPropertyBoxSizing:
533 case CSSPropertyCaptionSide: 529 case CSSPropertyCaptionSide:
534 case CSSPropertyClear:
535 case CSSPropertyDirection: 530 case CSSPropertyDirection:
536 case CSSPropertyDisplay: 531 case CSSPropertyDisplay:
537 case CSSPropertyEmptyCells: 532 case CSSPropertyEmptyCells:
538 case CSSPropertyFloat:
539 case CSSPropertyFontStyle: 533 case CSSPropertyFontStyle:
540 case CSSPropertyFontStretch: 534 case CSSPropertyFontStretch:
541 case CSSPropertyImageRendering: 535 case CSSPropertyImageRendering:
542 case CSSPropertyListStylePosition: 536 case CSSPropertyListStylePosition:
543 case CSSPropertyListStyleType: 537 case CSSPropertyListStyleType:
544 case CSSPropertyObjectFit: 538 case CSSPropertyObjectFit:
545 case CSSPropertyOutlineStyle: 539 case CSSPropertyOutlineStyle:
546 case CSSPropertyOverflowWrap: 540 case CSSPropertyOverflowWrap:
547 case CSSPropertyOverflowX: 541 case CSSPropertyOverflowX:
548 case CSSPropertyOverflowY: 542 case CSSPropertyOverflowY:
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 m_observer->endProperty(isImportantFound, isPropertyParsed, m_tokenizer. safeUserStringTokenOffset(), errorType); 1850 m_observer->endProperty(isImportantFound, isPropertyParsed, m_tokenizer. safeUserStringTokenOffset(), errorType);
1857 } 1851 }
1858 1852
1859 void BisonCSSParser::startEndUnknownRule() 1853 void BisonCSSParser::startEndUnknownRule()
1860 { 1854 {
1861 if (m_observer) 1855 if (m_observer)
1862 m_observer->startEndUnknownRule(); 1856 m_observer->startEndUnknownRule();
1863 } 1857 }
1864 1858
1865 } 1859 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSProperties.in ('k') | sky/engine/core/css/resolver/StyleAdjuster.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698