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

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

Issue 1314923005: Deprecate 'intrinsic' and 'min-intrinsic' CSS keywords (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "config.h" 5 #include "config.h"
6 #include "core/css/parser/CSSParser.h" 6 #include "core/css/parser/CSSParser.h"
7 7
8 #include "core/css/CSSKeyframeRule.h" 8 #include "core/css/CSSKeyframeRule.h"
9 #include "core/css/StyleColor.h" 9 #include "core/css/StyleColor.h"
10 #include "core/css/StylePropertySet.h" 10 #include "core/css/StylePropertySet.h"
11 #include "core/css/StyleRule.h" 11 #include "core/css/StyleRule.h"
12 #include "core/css/StyleSheetContents.h" 12 #include "core/css/StyleSheetContents.h"
13 #include "core/css/parser/CSSParserFastPaths.h" 13 #include "core/css/parser/CSSParserFastPaths.h"
14 #include "core/css/parser/CSSParserImpl.h" 14 #include "core/css/parser/CSSParserImpl.h"
15 #include "core/css/parser/CSSPropertyParser.h" 15 #include "core/css/parser/CSSPropertyParser.h"
16 #include "core/css/parser/CSSSelectorParser.h" 16 #include "core/css/parser/CSSSelectorParser.h"
17 #include "core/css/parser/CSSSupportsParser.h" 17 #include "core/css/parser/CSSSupportsParser.h"
18 #include "core/css/parser/CSSTokenizer.h" 18 #include "core/css/parser/CSSTokenizer.h"
19 #include "core/frame/LocalFrame.h"
19 #include "core/layout/LayoutTheme.h" 20 #include "core/layout/LayoutTheme.h"
20 21
21 namespace blink { 22 namespace blink {
22 23
23 bool CSSParser::parseDeclarationList(const CSSParserContext& context, MutableSty lePropertySet* propertySet, const String& declaration) 24 bool CSSParser::parseDeclarationList(const CSSParserContext& context, MutableSty lePropertySet* propertySet, const String& declaration)
24 { 25 {
25 return CSSParserImpl::parseDeclarationList(propertySet, declaration, context ); 26 return CSSParserImpl::parseDeclarationList(propertySet, declaration, context );
26 } 27 }
27 28
28 void CSSParser::parseDeclarationListForInspector(const CSSParserContext& context , const String& declaration, CSSParserObserver& observer) 29 void CSSParser::parseDeclarationListForInspector(const CSSParserContext& context , const String& declaration, CSSParserObserver& observer)
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 builder.appendLiteral(" : "); 158 builder.appendLiteral(" : ");
158 builder.append(propertyValue); 159 builder.append(propertyValue);
159 builder.appendLiteral("; }"); 160 builder.appendLiteral("; }");
160 RefPtrWillBeRawPtr<StyleRuleBase> rule = parseRule(context, nullptr, builder .toString()); 161 RefPtrWillBeRawPtr<StyleRuleBase> rule = parseRule(context, nullptr, builder .toString());
161 if (!rule || !rule->isFontFaceRule()) 162 if (!rule || !rule->isFontFaceRule())
162 return nullptr; 163 return nullptr;
163 return toStyleRuleFontFace(rule.get())->properties().getPropertyCSSValue(pro pertyID); 164 return toStyleRuleFontFace(rule.get())->properties().getPropertyCSSValue(pro pertyID);
164 } 165 }
165 166
166 } // namespace blink 167 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698