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

Side by Side Diff: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp

Issue 1713513002: Rename -webkit-text to -internal-quirk-inherit, limiting it to UA style (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase; add new (negative) test Created 4 years, 10 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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 m_implicitShorthand = false; 617 m_implicitShorthand = false;
618 return true; 618 return true;
619 } 619 }
620 620
621 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseColor(const CSSParserVa lue* value, bool acceptQuirkyColors) 621 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseColor(const CSSParserVa lue* value, bool acceptQuirkyColors)
622 { 622 {
623 CSSValueID id = value->id; 623 CSSValueID id = value->id;
624 if (isColorKeyword(id)) { 624 if (isColorKeyword(id)) {
625 if (!isValueAllowedInMode(id, m_context.mode())) 625 if (!isValueAllowedInMode(id, m_context.mode()))
626 return nullptr; 626 return nullptr;
627 if (id == CSSValueWebkitText && m_context.useCounter())
628 m_context.useCounter()->count(UseCounter::WebkitTextInColorProperty) ;
629 return cssValuePool().createIdentifierValue(id); 627 return cssValuePool().createIdentifierValue(id);
630 } 628 }
631 RGBA32 c = Color::transparent; 629 RGBA32 c = Color::transparent;
632 if (!parseColorFromValue(value, c, acceptQuirkyColors)) 630 if (!parseColorFromValue(value, c, acceptQuirkyColors))
633 return nullptr; 631 return nullptr;
634 return cssValuePool().createColorValue(c); 632 return cssValuePool().createColorValue(c);
635 } 633 }
636 634
637 bool CSSPropertyParser::parseFillImage(CSSParserValueList* valueList, RefPtrWill BeRawPtr<CSSValue>& value) 635 bool CSSPropertyParser::parseFillImage(CSSParserValueList* valueList, RefPtrWill BeRawPtr<CSSValue>& value)
638 { 636 {
(...skipping 2519 matching lines...) Expand 10 before | Expand all | Expand 10 after
3158 ASSERT(!m_parsedCalculation); 3156 ASSERT(!m_parsedCalculation);
3159 m_parsedCalculation = CSSCalcValue::create(args, range); 3157 m_parsedCalculation = CSSCalcValue::create(args, range);
3160 3158
3161 if (!m_parsedCalculation) 3159 if (!m_parsedCalculation)
3162 return false; 3160 return false;
3163 3161
3164 return true; 3162 return true;
3165 } 3163 }
3166 3164
3167 } // namespace blink 3165 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | third_party/WebKit/Source/core/css/quirks.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698