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

Side by Side Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 1221093003: Allow 'currentcolor' for -webkit-tap-highlight-color in non-quirks mode (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 2323 matching lines...) Expand 10 before | Expand all | Expand 10 after
2334 return parseColor(value); 2334 return parseColor(value);
2335 } 2335 }
2336 2336
2337 // Used to parse the '-webkit-tap-highlight-color' property. 2337 // Used to parse the '-webkit-tap-highlight-color' property.
2338 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseTapHighlightCo lor(const CSSParserValue* value) 2338 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseTapHighlightCo lor(const CSSParserValue* value)
2339 { 2339 {
2340 CSSValueID id = value->id; 2340 CSSValueID id = value->id;
2341 // Disallow -webkit-text regardless of quirks. 2341 // Disallow -webkit-text regardless of quirks.
2342 if (id == CSSValueWebkitText) 2342 if (id == CSSValueWebkitText)
2343 return nullptr; 2343 return nullptr;
2344 // Allow currentcolor in quirks-mode only.
2345 if (id == CSSValueCurrentcolor) {
2346 if (!inQuirksMode())
2347 return nullptr;
2348 return cssValuePool().createIdentifierValue(id);
2349 }
2350 return parseColor(value); 2344 return parseColor(value);
2351 } 2345 }
2352 2346
2353 // Used to parse <color> for CSS gradients. 2347 // Used to parse <color> for CSS gradients.
2354 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseGradientStopCo lor(const CSSParserValue* value) 2348 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseGradientStopCo lor(const CSSParserValue* value)
2355 { 2349 {
2356 CSSValueID id = value->id; 2350 CSSValueID id = value->id;
2357 // Allow -webkit-text regardless of quirks. 2351 // Allow -webkit-text regardless of quirks.
2358 if (id == CSSValueWebkitText) 2352 if (id == CSSValueWebkitText)
2359 return cssValuePool().createIdentifierValue(id); 2353 return cssValuePool().createIdentifierValue(id);
(...skipping 5906 matching lines...) Expand 10 before | Expand all | Expand 10 after
8266 } 8260 }
8267 } 8261 }
8268 8262
8269 if (!list->length()) 8263 if (!list->length())
8270 return nullptr; 8264 return nullptr;
8271 8265
8272 return list.release(); 8266 return list.release();
8273 } 8267 }
8274 8268
8275 } // namespace blink 8269 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698