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

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

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (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
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 2658 matching lines...) Expand 10 before | Expand all | Expand 10 after
2669 validPrimitive = true; 2669 validPrimitive = true;
2670 break; 2670 break;
2671 2671
2672 // End Apple-specific properties 2672 // End Apple-specific properties
2673 2673
2674 case CSSPropertyWebkitAppRegion: 2674 case CSSPropertyWebkitAppRegion:
2675 if (id >= CSSValueDrag && id <= CSSValueNoDrag) 2675 if (id >= CSSValueDrag && id <= CSSValueNoDrag)
2676 validPrimitive = true; 2676 validPrimitive = true;
2677 break; 2677 break;
2678 2678
2679 #if ENABLE(TOUCH_EVENTS)
2680 case CSSPropertyWebkitTapHighlightColor: 2679 case CSSPropertyWebkitTapHighlightColor:
2681 if ((id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMe nu 2680 if ((id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMe nu
2682 || (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && inQuirksMode())) { 2681 || (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && inQuirksMode())) {
2683 validPrimitive = true; 2682 validPrimitive = true;
2684 } else { 2683 } else {
2685 parsedValue = parseColor(); 2684 parsedValue = parseColor();
2686 if (parsedValue) 2685 if (parsedValue)
2687 m_valueList->next(); 2686 m_valueList->next();
2688 } 2687 }
2689 break; 2688 break;
2690 #endif
2691 2689
2692 /* shorthand properties */ 2690 /* shorthand properties */
2693 case CSSPropertyBackground: { 2691 case CSSPropertyBackground: {
2694 // Position must come before color in this array because a plain old "0" is a legal color 2692 // Position must come before color in this array because a plain old "0" is a legal color
2695 // in quirks mode but it's usually the X coordinate of a position. 2693 // in quirks mode but it's usually the X coordinate of a position.
2696 const CSSPropertyID properties[] = { CSSPropertyBackgroundImage, CSSProp ertyBackgroundRepeat, 2694 const CSSPropertyID properties[] = { CSSPropertyBackgroundImage, CSSProp ertyBackgroundRepeat,
2697 CSSPropertyBackgroundAttachment, CSSPropertyB ackgroundPosition, CSSPropertyBackgroundOrigin, 2695 CSSPropertyBackgroundAttachment, CSSPropertyB ackgroundPosition, CSSPropertyBackgroundOrigin,
2698 CSSPropertyBackgroundClip, CSSPropertyBackgro undColor, CSSPropertyBackgroundSize }; 2696 CSSPropertyBackgroundClip, CSSPropertyBackgro undColor, CSSPropertyBackgroundSize };
2699 return parseFillShorthand(propId, properties, WTF_ARRAY_LENGTH(propertie s), important); 2697 return parseFillShorthand(propId, properties, WTF_ARRAY_LENGTH(propertie s), important);
2700 } 2698 }
(...skipping 9015 matching lines...) Expand 10 before | Expand all | Expand 10 after
11716 { 11714 {
11717 // The tokenizer checks for the construct of an+b. 11715 // The tokenizer checks for the construct of an+b.
11718 // 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
11719 // tokens are identified as string literal. Furthermore we need to accept 11717 // tokens are identified as string literal. Furthermore we need to accept
11720 // "odd" and "even" which does not match to an+b. 11718 // "odd" and "even" which does not match to an+b.
11721 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11719 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11722 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11720 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11723 } 11721 }
11724 11722
11725 } 11723 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698