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

Side by Side Diff: sky/engine/core/css/parser/BisonCSSParser-in.cpp

Issue 760583004: Remove webkit-margin-collapse (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years 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) 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 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse; 458 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse;
459 case CSSPropertyJustifyContent: 459 case CSSPropertyJustifyContent:
460 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'. 460 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'.
461 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround; 461 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround;
462 case CSSPropertyFontKerning: 462 case CSSPropertyFontKerning:
463 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone; 463 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone;
464 case CSSPropertyWebkitFontSmoothing: 464 case CSSPropertyWebkitFontSmoothing:
465 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased; 465 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased;
466 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space 466 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space
467 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce; 467 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce;
468 case CSSPropertyWebkitMarginAfterCollapse:
469 case CSSPropertyWebkitMarginBeforeCollapse:
470 case CSSPropertyWebkitMarginBottomCollapse:
471 case CSSPropertyWebkitMarginTopCollapse:
472 return valueID == CSSValueCollapse || valueID == CSSValueSeparate || val ueID == CSSValueDiscard;
473 case CSSPropertyWebkitPrintColorAdjust: 468 case CSSPropertyWebkitPrintColorAdjust:
474 return valueID == CSSValueExact || valueID == CSSValueEconomy; 469 return valueID == CSSValueExact || valueID == CSSValueEconomy;
475 case CSSPropertyWebkitRtlOrdering: 470 case CSSPropertyWebkitRtlOrdering:
476 return valueID == CSSValueLogical || valueID == CSSValueVisual; 471 return valueID == CSSValueLogical || valueID == CSSValueVisual;
477 case CSSPropertyWebkitTextEmphasisPosition: 472 case CSSPropertyWebkitTextEmphasisPosition:
478 return valueID == CSSValueOver || valueID == CSSValueUnder; 473 return valueID == CSSValueOver || valueID == CSSValueUnder;
479 case CSSPropertyTransformStyle: 474 case CSSPropertyTransformStyle:
480 case CSSPropertyWebkitTransformStyle: 475 case CSSPropertyWebkitTransformStyle:
481 return valueID == CSSValueFlat || valueID == CSSValuePreserve3d; 476 return valueID == CSSValueFlat || valueID == CSSValuePreserve3d;
482 case CSSPropertyWebkitUserDrag: // auto | none | element 477 case CSSPropertyWebkitUserDrag: // auto | none | element
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 case CSSPropertyWebkitBorderEndStyle: 541 case CSSPropertyWebkitBorderEndStyle:
547 case CSSPropertyWebkitBorderStartStyle: 542 case CSSPropertyWebkitBorderStartStyle:
548 case CSSPropertyWebkitBoxDecorationBreak: 543 case CSSPropertyWebkitBoxDecorationBreak:
549 case CSSPropertyAlignContent: 544 case CSSPropertyAlignContent:
550 case CSSPropertyFlexDirection: 545 case CSSPropertyFlexDirection:
551 case CSSPropertyFlexWrap: 546 case CSSPropertyFlexWrap:
552 case CSSPropertyJustifyContent: 547 case CSSPropertyJustifyContent:
553 case CSSPropertyFontKerning: 548 case CSSPropertyFontKerning:
554 case CSSPropertyWebkitFontSmoothing: 549 case CSSPropertyWebkitFontSmoothing:
555 case CSSPropertyWebkitLineBreak: 550 case CSSPropertyWebkitLineBreak:
556 case CSSPropertyWebkitMarginAfterCollapse:
557 case CSSPropertyWebkitMarginBeforeCollapse:
558 case CSSPropertyWebkitMarginBottomCollapse:
559 case CSSPropertyWebkitMarginTopCollapse:
560 case CSSPropertyWebkitPrintColorAdjust: 551 case CSSPropertyWebkitPrintColorAdjust:
561 case CSSPropertyWebkitRtlOrdering: 552 case CSSPropertyWebkitRtlOrdering:
562 case CSSPropertyWebkitTextEmphasisPosition: 553 case CSSPropertyWebkitTextEmphasisPosition:
563 case CSSPropertyTransformStyle: 554 case CSSPropertyTransformStyle:
564 case CSSPropertyWebkitTransformStyle: 555 case CSSPropertyWebkitTransformStyle:
565 case CSSPropertyWebkitUserDrag: 556 case CSSPropertyWebkitUserDrag:
566 case CSSPropertyWebkitUserModify: 557 case CSSPropertyWebkitUserModify:
567 case CSSPropertyWebkitUserSelect: 558 case CSSPropertyWebkitUserSelect:
568 case CSSPropertyWhiteSpace: 559 case CSSPropertyWhiteSpace:
569 case CSSPropertyWordBreak: 560 case CSSPropertyWordBreak:
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1833 m_observer->endProperty(isImportantFound, isPropertyParsed, m_tokenizer. safeUserStringTokenOffset(), errorType); 1824 m_observer->endProperty(isImportantFound, isPropertyParsed, m_tokenizer. safeUserStringTokenOffset(), errorType);
1834 } 1825 }
1835 1826
1836 void BisonCSSParser::startEndUnknownRule() 1827 void BisonCSSParser::startEndUnknownRule()
1837 { 1828 {
1838 if (m_observer) 1829 if (m_observer)
1839 m_observer->startEndUnknownRule(); 1830 m_observer->startEndUnknownRule();
1840 } 1831 }
1841 1832
1842 } 1833 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/StylePropertySerializer.cpp ('k') | sky/engine/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698