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

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

Issue 359023002: Remove CSS Exclusions leftovers (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase against ToT Created 6 years, 5 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 | « Source/core/css/RuntimeCSSEnabled.cpp ('k') | Source/core/css/parser/CSSPropertyParser.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 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 return valueID == CSSValueDisc || valueID == CSSValueCircle || valueID = = CSSValueSquare || valueID == CSSValueNone; 553 return valueID == CSSValueDisc || valueID == CSSValueCircle || valueID = = CSSValueSquare || valueID == CSSValueNone;
554 case CSSPropertyTransformStyle: 554 case CSSPropertyTransformStyle:
555 case CSSPropertyWebkitTransformStyle: 555 case CSSPropertyWebkitTransformStyle:
556 return valueID == CSSValueFlat || valueID == CSSValuePreserve3d; 556 return valueID == CSSValueFlat || valueID == CSSValuePreserve3d;
557 case CSSPropertyWebkitUserDrag: // auto | none | element 557 case CSSPropertyWebkitUserDrag: // auto | none | element
558 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueElement; 558 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueElement;
559 case CSSPropertyWebkitUserModify: // read-only | read-write 559 case CSSPropertyWebkitUserModify: // read-only | read-write
560 return valueID == CSSValueReadOnly || valueID == CSSValueReadWrite || va lueID == CSSValueReadWritePlaintextOnly; 560 return valueID == CSSValueReadOnly || valueID == CSSValueReadWrite || va lueID == CSSValueReadWritePlaintextOnly;
561 case CSSPropertyWebkitUserSelect: // auto | none | text | all 561 case CSSPropertyWebkitUserSelect: // auto | none | text | all
562 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueText || valueID == CSSValueAll; 562 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueText || valueID == CSSValueAll;
563 case CSSPropertyWebkitWrapFlow:
564 return RuntimeEnabledFeatures::cssExclusionsEnabled()
565 && (valueID == CSSValueAuto || valueID == CSSValueBoth || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueMaximum || valueI D == CSSValueClear);
566 case CSSPropertyWebkitWrapThrough:
567 return RuntimeEnabledFeatures::cssExclusionsEnabled()
568 && (valueID == CSSValueWrap || valueID == CSSValueNone);
569 case CSSPropertyWebkitWritingMode: 563 case CSSPropertyWebkitWritingMode:
570 return valueID >= CSSValueHorizontalTb && valueID <= CSSValueHorizontalB t; 564 return valueID >= CSSValueHorizontalTb && valueID <= CSSValueHorizontalB t;
571 case CSSPropertyWhiteSpace: // normal | pre | nowrap 565 case CSSPropertyWhiteSpace: // normal | pre | nowrap
572 return valueID == CSSValueNormal || valueID == CSSValuePre || valueID == CSSValuePreWrap || valueID == CSSValuePreLine || valueID == CSSValueNowrap; 566 return valueID == CSSValueNormal || valueID == CSSValuePre || valueID == CSSValuePreWrap || valueID == CSSValuePreLine || valueID == CSSValueNowrap;
573 case CSSPropertyWordBreak: // normal | break-all | break-word (this is a cus tom extension) 567 case CSSPropertyWordBreak: // normal | break-all | break-word (this is a cus tom extension)
574 return valueID == CSSValueNormal || valueID == CSSValueBreakAll || value ID == CSSValueBreakWord; 568 return valueID == CSSValueNormal || valueID == CSSValueBreakAll || value ID == CSSValueBreakWord;
575 default: 569 default:
576 ASSERT_NOT_REACHED(); 570 ASSERT_NOT_REACHED();
577 return false; 571 return false;
578 } 572 }
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 case CSSPropertyWebkitRtlOrdering: 661 case CSSPropertyWebkitRtlOrdering:
668 case CSSPropertyWebkitRubyPosition: 662 case CSSPropertyWebkitRubyPosition:
669 case CSSPropertyWebkitTextCombine: 663 case CSSPropertyWebkitTextCombine:
670 case CSSPropertyWebkitTextEmphasisPosition: 664 case CSSPropertyWebkitTextEmphasisPosition:
671 case CSSPropertyWebkitTextSecurity: 665 case CSSPropertyWebkitTextSecurity:
672 case CSSPropertyTransformStyle: 666 case CSSPropertyTransformStyle:
673 case CSSPropertyWebkitTransformStyle: 667 case CSSPropertyWebkitTransformStyle:
674 case CSSPropertyWebkitUserDrag: 668 case CSSPropertyWebkitUserDrag:
675 case CSSPropertyWebkitUserModify: 669 case CSSPropertyWebkitUserModify:
676 case CSSPropertyWebkitUserSelect: 670 case CSSPropertyWebkitUserSelect:
677 case CSSPropertyWebkitWrapFlow:
678 case CSSPropertyWebkitWrapThrough:
679 case CSSPropertyWebkitWritingMode: 671 case CSSPropertyWebkitWritingMode:
680 case CSSPropertyWhiteSpace: 672 case CSSPropertyWhiteSpace:
681 case CSSPropertyWordBreak: 673 case CSSPropertyWordBreak:
682 case CSSPropertyWordWrap: 674 case CSSPropertyWordWrap:
683 return true; 675 return true;
684 case CSSPropertyAlignItems: 676 case CSSPropertyAlignItems:
685 case CSSPropertyAlignSelf: 677 case CSSPropertyAlignSelf:
686 return !RuntimeEnabledFeatures::cssGridLayoutEnabled(); 678 return !RuntimeEnabledFeatures::cssGridLayoutEnabled();
687 default: 679 default:
688 return false; 680 return false;
(...skipping 1421 matching lines...) Expand 10 before | Expand all | Expand 10 after
2110 rule->setProperties(createStylePropertySet()); 2102 rule->setProperties(createStylePropertySet());
2111 clearProperties(); 2103 clearProperties();
2112 2104
2113 StyleRuleViewport* result = rule.get(); 2105 StyleRuleViewport* result = rule.get();
2114 m_parsedRules.append(rule.release()); 2106 m_parsedRules.append(rule.release());
2115 2107
2116 return result; 2108 return result;
2117 } 2109 }
2118 2110
2119 } 2111 }
OLDNEW
« no previous file with comments | « Source/core/css/RuntimeCSSEnabled.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698