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

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

Issue 677843004: Remove text-combine. (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/dom/Text.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 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce; 490 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce;
491 case CSSPropertyWebkitMarginAfterCollapse: 491 case CSSPropertyWebkitMarginAfterCollapse:
492 case CSSPropertyWebkitMarginBeforeCollapse: 492 case CSSPropertyWebkitMarginBeforeCollapse:
493 case CSSPropertyWebkitMarginBottomCollapse: 493 case CSSPropertyWebkitMarginBottomCollapse:
494 case CSSPropertyWebkitMarginTopCollapse: 494 case CSSPropertyWebkitMarginTopCollapse:
495 return valueID == CSSValueCollapse || valueID == CSSValueSeparate || val ueID == CSSValueDiscard; 495 return valueID == CSSValueCollapse || valueID == CSSValueSeparate || val ueID == CSSValueDiscard;
496 case CSSPropertyWebkitPrintColorAdjust: 496 case CSSPropertyWebkitPrintColorAdjust:
497 return valueID == CSSValueExact || valueID == CSSValueEconomy; 497 return valueID == CSSValueExact || valueID == CSSValueEconomy;
498 case CSSPropertyWebkitRtlOrdering: 498 case CSSPropertyWebkitRtlOrdering:
499 return valueID == CSSValueLogical || valueID == CSSValueVisual; 499 return valueID == CSSValueLogical || valueID == CSSValueVisual;
500 case CSSPropertyWebkitTextCombine:
501 return valueID == CSSValueNone || valueID == CSSValueHorizontal;
502 case CSSPropertyWebkitTextEmphasisPosition: 500 case CSSPropertyWebkitTextEmphasisPosition:
503 return valueID == CSSValueOver || valueID == CSSValueUnder; 501 return valueID == CSSValueOver || valueID == CSSValueUnder;
504 case CSSPropertyTransformStyle: 502 case CSSPropertyTransformStyle:
505 case CSSPropertyWebkitTransformStyle: 503 case CSSPropertyWebkitTransformStyle:
506 return valueID == CSSValueFlat || valueID == CSSValuePreserve3d; 504 return valueID == CSSValueFlat || valueID == CSSValuePreserve3d;
507 case CSSPropertyWebkitUserDrag: // auto | none | element 505 case CSSPropertyWebkitUserDrag: // auto | none | element
508 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueElement; 506 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueElement;
509 case CSSPropertyWebkitUserModify: // read-only | read-write 507 case CSSPropertyWebkitUserModify: // read-only | read-write
510 return valueID == CSSValueReadOnly || valueID == CSSValueReadWrite || va lueID == CSSValueReadWritePlaintextOnly; 508 return valueID == CSSValueReadOnly || valueID == CSSValueReadWrite || va lueID == CSSValueReadWritePlaintextOnly;
511 case CSSPropertyWebkitUserSelect: // auto | none | text | all 509 case CSSPropertyWebkitUserSelect: // auto | none | text | all
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 case CSSPropertyJustifyContent: 579 case CSSPropertyJustifyContent:
582 case CSSPropertyFontKerning: 580 case CSSPropertyFontKerning:
583 case CSSPropertyWebkitFontSmoothing: 581 case CSSPropertyWebkitFontSmoothing:
584 case CSSPropertyWebkitLineBreak: 582 case CSSPropertyWebkitLineBreak:
585 case CSSPropertyWebkitMarginAfterCollapse: 583 case CSSPropertyWebkitMarginAfterCollapse:
586 case CSSPropertyWebkitMarginBeforeCollapse: 584 case CSSPropertyWebkitMarginBeforeCollapse:
587 case CSSPropertyWebkitMarginBottomCollapse: 585 case CSSPropertyWebkitMarginBottomCollapse:
588 case CSSPropertyWebkitMarginTopCollapse: 586 case CSSPropertyWebkitMarginTopCollapse:
589 case CSSPropertyWebkitPrintColorAdjust: 587 case CSSPropertyWebkitPrintColorAdjust:
590 case CSSPropertyWebkitRtlOrdering: 588 case CSSPropertyWebkitRtlOrdering:
591 case CSSPropertyWebkitTextCombine:
592 case CSSPropertyWebkitTextEmphasisPosition: 589 case CSSPropertyWebkitTextEmphasisPosition:
593 case CSSPropertyTransformStyle: 590 case CSSPropertyTransformStyle:
594 case CSSPropertyWebkitTransformStyle: 591 case CSSPropertyWebkitTransformStyle:
595 case CSSPropertyWebkitUserDrag: 592 case CSSPropertyWebkitUserDrag:
596 case CSSPropertyWebkitUserModify: 593 case CSSPropertyWebkitUserModify:
597 case CSSPropertyWebkitUserSelect: 594 case CSSPropertyWebkitUserSelect:
598 case CSSPropertyWhiteSpace: 595 case CSSPropertyWhiteSpace:
599 case CSSPropertyWordBreak: 596 case CSSPropertyWordBreak:
600 case CSSPropertyWordWrap: 597 case CSSPropertyWordWrap:
601 return true; 598 return true;
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1866 m_observer->endProperty(isImportantFound, isPropertyParsed, m_tokenizer. safeUserStringTokenOffset(), errorType); 1863 m_observer->endProperty(isImportantFound, isPropertyParsed, m_tokenizer. safeUserStringTokenOffset(), errorType);
1867 } 1864 }
1868 1865
1869 void BisonCSSParser::startEndUnknownRule() 1866 void BisonCSSParser::startEndUnknownRule()
1870 { 1867 {
1871 if (m_observer) 1868 if (m_observer)
1872 m_observer->startEndUnknownRule(); 1869 m_observer->startEndUnknownRule();
1873 } 1870 }
1874 1871
1875 } 1872 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSProperties.in ('k') | sky/engine/core/dom/Text.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698