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

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

Issue 418163003: Simplify watched selector handling and remove remnants of user stylesheets (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cascade
Patch Set: use includeEmptyRules flag on MatchRequest Created 6 years, 4 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 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 case CSSPropertyWebkitBoxDecorationBreak: 482 case CSSPropertyWebkitBoxDecorationBreak:
483 return valueID == CSSValueClone || valueID == CSSValueSlice; 483 return valueID == CSSValueClone || valueID == CSSValueSlice;
484 case CSSPropertyWebkitBoxDirection: 484 case CSSPropertyWebkitBoxDirection:
485 return valueID == CSSValueNormal || valueID == CSSValueReverse; 485 return valueID == CSSValueNormal || valueID == CSSValueReverse;
486 case CSSPropertyWebkitBoxLines: 486 case CSSPropertyWebkitBoxLines:
487 return valueID == CSSValueSingle || valueID == CSSValueMultiple; 487 return valueID == CSSValueSingle || valueID == CSSValueMultiple;
488 case CSSPropertyWebkitBoxOrient: 488 case CSSPropertyWebkitBoxOrient:
489 return valueID == CSSValueHorizontal || valueID == CSSValueVertical || v alueID == CSSValueInlineAxis || valueID == CSSValueBlockAxis; 489 return valueID == CSSValueHorizontal || valueID == CSSValueVertical || v alueID == CSSValueInlineAxis || valueID == CSSValueBlockAxis;
490 case CSSPropertyWebkitBoxPack: 490 case CSSPropertyWebkitBoxPack:
491 return valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueJustify; 491 return valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueJustify;
492 case CSSPropertyInternalCallback:
493 // This property is only injected programmatically, not parsed from styl esheets.
494 return false;
495 case CSSPropertyColumnFill: 492 case CSSPropertyColumnFill:
496 return RuntimeEnabledFeatures::regionBasedColumnsEnabled() 493 return RuntimeEnabledFeatures::regionBasedColumnsEnabled()
497 && (valueID == CSSValueAuto || valueID == CSSValueBalance); 494 && (valueID == CSSValueAuto || valueID == CSSValueBalance);
498 case CSSPropertyAlignContent: 495 case CSSPropertyAlignContent:
499 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'. 496 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'.
500 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround || valueID == CSSValueStretch; 497 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround || valueID == CSSValueStretch;
501 case CSSPropertyAlignItems: 498 case CSSPropertyAlignItems:
502 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code. 499 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code.
503 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch; 500 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch;
504 case CSSPropertyAlignSelf: 501 case CSSPropertyAlignSelf:
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 case CSSPropertyWebkitBorderBeforeStyle: 610 case CSSPropertyWebkitBorderBeforeStyle:
614 case CSSPropertyWebkitBorderEndStyle: 611 case CSSPropertyWebkitBorderEndStyle:
615 case CSSPropertyWebkitBorderFit: 612 case CSSPropertyWebkitBorderFit:
616 case CSSPropertyWebkitBorderStartStyle: 613 case CSSPropertyWebkitBorderStartStyle:
617 case CSSPropertyWebkitBoxAlign: 614 case CSSPropertyWebkitBoxAlign:
618 case CSSPropertyWebkitBoxDecorationBreak: 615 case CSSPropertyWebkitBoxDecorationBreak:
619 case CSSPropertyWebkitBoxDirection: 616 case CSSPropertyWebkitBoxDirection:
620 case CSSPropertyWebkitBoxLines: 617 case CSSPropertyWebkitBoxLines:
621 case CSSPropertyWebkitBoxOrient: 618 case CSSPropertyWebkitBoxOrient:
622 case CSSPropertyWebkitBoxPack: 619 case CSSPropertyWebkitBoxPack:
623 case CSSPropertyInternalCallback:
624 case CSSPropertyWebkitColumnBreakAfter: 620 case CSSPropertyWebkitColumnBreakAfter:
625 case CSSPropertyWebkitColumnBreakBefore: 621 case CSSPropertyWebkitColumnBreakBefore:
626 case CSSPropertyWebkitColumnBreakInside: 622 case CSSPropertyWebkitColumnBreakInside:
627 case CSSPropertyColumnFill: 623 case CSSPropertyColumnFill:
628 case CSSPropertyWebkitColumnRuleStyle: 624 case CSSPropertyWebkitColumnRuleStyle:
629 case CSSPropertyAlignContent: 625 case CSSPropertyAlignContent:
630 case CSSPropertyFlexDirection: 626 case CSSPropertyFlexDirection:
631 case CSSPropertyFlexWrap: 627 case CSSPropertyFlexWrap:
632 case CSSPropertyJustifyContent: 628 case CSSPropertyJustifyContent:
633 case CSSPropertyFontKerning: 629 case CSSPropertyFontKerning:
(...skipping 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after
2105 rule->setProperties(createStylePropertySet()); 2101 rule->setProperties(createStylePropertySet());
2106 clearProperties(); 2102 clearProperties();
2107 2103
2108 StyleRuleViewport* result = rule.get(); 2104 StyleRuleViewport* result = rule.get();
2109 m_parsedRules.append(rule.release()); 2105 m_parsedRules.append(rule.release());
2110 2106
2111 return result; 2107 return result;
2112 } 2108 }
2113 2109
2114 } 2110 }
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