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

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

Powered by Google App Engine
This is Rietveld 408576698