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

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

Issue 1186833003: Split up CSSPrimitiveValue::isString into isString and isCustomIdent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/core/css/FontFace.cpp ('k') | Source/core/css/resolver/CSSToStyleMap.cpp » ('j') | 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 3206 matching lines...) Expand 10 before | Expand all | Expand 10 after
3217 if (numericValue) 3217 if (numericValue)
3218 values->append(numericValue.release()); 3218 values->append(numericValue.release());
3219 if (gridLineName) 3219 if (gridLineName)
3220 values->append(gridLineName.release()); 3220 values->append(gridLineName.release());
3221 ASSERT(values->length()); 3221 ASSERT(values->length());
3222 return values.release(); 3222 return values.release();
3223 } 3223 }
3224 3224
3225 static PassRefPtrWillBeRawPtr<CSSValue> gridMissingGridPositionValue(CSSValue* v alue) 3225 static PassRefPtrWillBeRawPtr<CSSValue> gridMissingGridPositionValue(CSSValue* v alue)
3226 { 3226 {
3227 if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->isString()) 3227 if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->isCustomIdent() )
3228 return value; 3228 return value;
3229 3229
3230 return cssValuePool().createIdentifierValue(CSSValueAuto); 3230 return cssValuePool().createIdentifierValue(CSSValueAuto);
3231 } 3231 }
3232 3232
3233 bool CSSPropertyParser::parseGridItemPositionShorthand(CSSPropertyID shorthandId , bool important) 3233 bool CSSPropertyParser::parseGridItemPositionShorthand(CSSPropertyID shorthandId , bool important)
3234 { 3234 {
3235 ShorthandScope scope(this, shorthandId); 3235 ShorthandScope scope(this, shorthandId);
3236 const StylePropertyShorthand& shorthand = shorthandForProperty(shorthandId); 3236 const StylePropertyShorthand& shorthand = shorthandForProperty(shorthandId);
3237 ASSERT(shorthand.length() == 2); 3237 ASSERT(shorthand.length() == 2);
(...skipping 4941 matching lines...) Expand 10 before | Expand all | Expand 10 after
8179 } 8179 }
8180 } 8180 }
8181 8181
8182 if (!list->length()) 8182 if (!list->length())
8183 return nullptr; 8183 return nullptr;
8184 8184
8185 return list.release(); 8185 return list.release();
8186 } 8186 }
8187 8187
8188 } // namespace blink 8188 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/FontFace.cpp ('k') | Source/core/css/resolver/CSSToStyleMap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698