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

Side by Side Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/css/parser/CSSPropertyParser.h" 5 #include "core/css/parser/CSSPropertyParser.h"
6 6
7 #include "core/StylePropertyShorthand.h" 7 #include "core/StylePropertyShorthand.h"
8 #include "core/css/CSSBasicShapeValues.h" 8 #include "core/css/CSSBasicShapeValues.h"
9 #include "core/css/CSSBorderImage.h" 9 #include "core/css/CSSBorderImage.h"
10 #include "core/css/CSSCalculationValue.h" 10 #include "core/css/CSSCalculationValue.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // 'ActiveBorder', ..., 'WindowText' 148 // 'ActiveBorder', ..., 'WindowText'
149 // 149 //
150 // WebKit proprietary/internal: 150 // WebKit proprietary/internal:
151 // '-webkit-link' 151 // '-webkit-link'
152 // '-webkit-activelink' 152 // '-webkit-activelink'
153 // '-internal-active-list-box-selection' 153 // '-internal-active-list-box-selection'
154 // '-internal-active-list-box-selection-text' 154 // '-internal-active-list-box-selection-text'
155 // '-internal-inactive-list-box-selection' 155 // '-internal-inactive-list-box-selection'
156 // '-internal-inactive-list-box-selection-text' 156 // '-internal-inactive-list-box-selection-text'
157 // '-webkit-focus-ring-color' 157 // '-webkit-focus-ring-color'
158 // '-webkit-text' 158 // '-internal-quirk-inherit'
159 // 159 //
160 return (id >= CSSValueAqua && id <= CSSValueWebkitText) 160 return (id >= CSSValueAqua && id <= CSSValueInternalQuirkInherit)
161 || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen) 161 || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen)
162 || id == CSSValueMenu; 162 || id == CSSValueMenu;
163 } 163 }
164 164
165 bool CSSPropertyParser::isSystemColor(CSSValueID id) 165 bool CSSPropertyParser::isSystemColor(CSSValueID id)
166 { 166 {
167 return (id >= CSSValueActiveborder && id <= CSSValueWindowtext) || id == CSS ValueMenu; 167 return (id >= CSSValueActiveborder && id <= CSSValueWindowtext) || id == CSS ValueMenu;
168 } 168 }
169 169
170 template <typename CharacterType> 170 template <typename CharacterType>
(...skipping 4340 matching lines...) Expand 10 before | Expand all | Expand 10 after
4511 m_currentShorthand = oldShorthand; 4511 m_currentShorthand = oldShorthand;
4512 CSSParserValueList valueList(m_range); 4512 CSSParserValueList valueList(m_range);
4513 if (!valueList.size()) 4513 if (!valueList.size())
4514 return false; 4514 return false;
4515 m_valueList = &valueList; 4515 m_valueList = &valueList;
4516 return legacyParseShorthand(unresolvedProperty, important); 4516 return legacyParseShorthand(unresolvedProperty, important);
4517 } 4517 }
4518 } 4518 }
4519 4519
4520 } // namespace blink 4520 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698