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

Side by Side Diff: Source/core/css/CSSParser.cpp

Issue 14280004: Revert removal of events (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSProperty.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 2650 matching lines...) Expand 10 before | Expand all | Expand 10 after
2661 validPrimitive = true; 2661 validPrimitive = true;
2662 break; 2662 break;
2663 2663
2664 // End Apple-specific properties 2664 // End Apple-specific properties
2665 2665
2666 case CSSPropertyWebkitAppRegion: 2666 case CSSPropertyWebkitAppRegion:
2667 if (id >= CSSValueDrag && id <= CSSValueNoDrag) 2667 if (id >= CSSValueDrag && id <= CSSValueNoDrag)
2668 validPrimitive = true; 2668 validPrimitive = true;
2669 break; 2669 break;
2670 2670
2671 #if ENABLE(TOUCH_EVENTS)
2671 case CSSPropertyWebkitTapHighlightColor: 2672 case CSSPropertyWebkitTapHighlightColor:
2672 if ((id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMe nu 2673 if ((id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMe nu
2673 || (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && inQuirksMode())) { 2674 || (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && inQuirksMode())) {
2674 validPrimitive = true; 2675 validPrimitive = true;
2675 } else { 2676 } else {
2676 parsedValue = parseColor(); 2677 parsedValue = parseColor();
2677 if (parsedValue) 2678 if (parsedValue)
2678 m_valueList->next(); 2679 m_valueList->next();
2679 } 2680 }
2680 break; 2681 break;
2682 #endif
2681 2683
2682 /* shorthand properties */ 2684 /* shorthand properties */
2683 case CSSPropertyBackground: { 2685 case CSSPropertyBackground: {
2684 // Position must come before color in this array because a plain old "0" is a legal color 2686 // Position must come before color in this array because a plain old "0" is a legal color
2685 // in quirks mode but it's usually the X coordinate of a position. 2687 // in quirks mode but it's usually the X coordinate of a position.
2686 const CSSPropertyID properties[] = { CSSPropertyBackgroundImage, CSSProp ertyBackgroundRepeat, 2688 const CSSPropertyID properties[] = { CSSPropertyBackgroundImage, CSSProp ertyBackgroundRepeat,
2687 CSSPropertyBackgroundAttachment, CSSPropertyB ackgroundPosition, CSSPropertyBackgroundOrigin, 2689 CSSPropertyBackgroundAttachment, CSSPropertyB ackgroundPosition, CSSPropertyBackgroundOrigin,
2688 CSSPropertyBackgroundClip, CSSPropertyBackgro undColor, CSSPropertyBackgroundSize }; 2690 CSSPropertyBackgroundClip, CSSPropertyBackgro undColor, CSSPropertyBackgroundSize };
2689 return parseFillShorthand(propId, properties, WTF_ARRAY_LENGTH(propertie s), important); 2691 return parseFillShorthand(propId, properties, WTF_ARRAY_LENGTH(propertie s), important);
2690 } 2692 }
(...skipping 9021 matching lines...) Expand 10 before | Expand all | Expand 10 after
11712 { 11714 {
11713 // The tokenizer checks for the construct of an+b. 11715 // The tokenizer checks for the construct of an+b.
11714 // However, since the {ident} rule precedes the {nth} rule, some of those 11716 // However, since the {ident} rule precedes the {nth} rule, some of those
11715 // tokens are identified as string literal. Furthermore we need to accept 11717 // tokens are identified as string literal. Furthermore we need to accept
11716 // "odd" and "even" which does not match to an+b. 11718 // "odd" and "even" which does not match to an+b.
11717 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11719 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11718 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11720 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11719 } 11721 }
11720 11722
11721 } 11723 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSProperty.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698