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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/css/parser/CSSPropertyParser.h

Issue 1190303003: CL for perf tryjob on win (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: CL for perf tryjob on mac 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/parser/CSSParserImpl.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSPropertyParser.h
diff --git a/Source/core/css/parser/CSSPropertyParser.h b/Source/core/css/parser/CSSPropertyParser.h
index c9e16494add599936f3d943bf7109edee00e6b33..aa8d8c6ed1ecfc19c7006f9aaceae7510f1666c3 100644
--- a/Source/core/css/parser/CSSPropertyParser.h
+++ b/Source/core/css/parser/CSSPropertyParser.h
@@ -91,89 +91,89 @@ private:
KURL completeURL(const String& url) const;
- void addProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important, bool implicit = false);
+ void addProperty(CSSPropertyID, CSSValue, bool important, bool implicit = false);
void rollbackLastProperties(int num);
- void addExpandedPropertyForValue(CSSPropertyID propId, PassRefPtrWillBeRawPtr<CSSValue>, bool);
+ void addExpandedPropertyForValue(CSSPropertyID propId, CSSValue, bool);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, CSSParserValue*);
bool parseShorthand(CSSPropertyID, const StylePropertyShorthand&, bool important);
bool parse4Values(CSSPropertyID, const CSSPropertyID* properties, bool important);
PassRefPtrWillBeRawPtr<CSSValueList> parseContent();
- PassRefPtrWillBeRawPtr<CSSValue> parseQuotes();
+ NullableCSSValue parseQuotes();
- PassRefPtrWillBeRawPtr<CSSValue> parseAttr(CSSParserValueList* args);
+ NullableCSSValue parseAttr(CSSParserValueList* args);
- PassRefPtrWillBeRawPtr<CSSValue> parseBackgroundColor();
+ NullableCSSValue parseBackgroundColor();
- bool parseFillImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseFillImage(CSSParserValueList*, NullableCSSValue&);
enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 };
enum FillPositionParsingMode { ResolveValuesAsPercent = 0, ResolveValuesAsKeyword = 1 };
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSParserValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillPositionParsingMode = ResolveValuesAsPercent, Units = FUnknown);
- PassRefPtrWillBeRawPtr<CSSValue> parseFillPositionX(CSSParserValueList*);
- PassRefPtrWillBeRawPtr<CSSValue> parseFillPositionY(CSSParserValueList*);
- void parse2ValuesFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&, Units = FUnknown);
+ NullableCSSValue parseFillPositionX(CSSParserValueList*);
+ NullableCSSValue parseFillPositionY(CSSParserValueList*);
+ void parse2ValuesFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, Units = FUnknown);
bool isPotentialPositionValue(CSSParserValue*);
- void parseFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&, Units = FUnknown);
- void parse3ValuesFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>);
- void parse4ValuesFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>);
+ void parseFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, Units = FUnknown);
+ void parse3ValuesFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>);
+ void parse4ValuesFillPosition(CSSParserValueList*, NullableCSSValue&, NullableCSSValue&, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>, PassRefPtrWillBeRawPtr<CSSPrimitiveValue>);
- void parseFillRepeat(RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&);
- PassRefPtrWillBeRawPtr<CSSValue> parseFillSize(CSSPropertyID);
+ void parseFillRepeat(NullableCSSValue&, NullableCSSValue&);
+ NullableCSSValue parseFillSize(CSSPropertyID);
- bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, NullableCSSValue&, NullableCSSValue&);
bool parseFillShorthand(CSSPropertyID, const CSSPropertyID* properties, int numProperties, bool important);
- void addFillValue(RefPtrWillBeRawPtr<CSSValue>& lval, PassRefPtrWillBeRawPtr<CSSValue> rval);
+ void addFillValue(NullableCSSValue& lval, CSSValue rval);
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationDelay();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationDirection();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationDuration();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationFillMode();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationIterationCount();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationName(bool allowQuotedName);
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationPlayState();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationProperty();
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationTimingFunction();
+ NullableCSSValue parseAnimationDelay();
+ NullableCSSValue parseAnimationDirection();
+ NullableCSSValue parseAnimationDuration();
+ NullableCSSValue parseAnimationFillMode();
+ NullableCSSValue parseAnimationIterationCount();
+ NullableCSSValue parseAnimationName(bool allowQuotedName);
+ NullableCSSValue parseAnimationPlayState();
+ NullableCSSValue parseAnimationProperty();
+ NullableCSSValue parseAnimationTimingFunction();
bool parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, double& result);
// Legacy parsing allows <string>s for animation-name
- PassRefPtrWillBeRawPtr<CSSValue> parseAnimationProperty(CSSPropertyID, bool useLegacyParsing);
+ NullableCSSValue parseAnimationProperty(CSSPropertyID, bool useLegacyParsing);
PassRefPtrWillBeRawPtr<CSSValueList> parseAnimationPropertyList(CSSPropertyID, bool useLegacyParsing);
bool parseAnimationShorthand(bool useLegacyParsing, bool important);
bool parseTransitionShorthand(bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseColumnWidth();
- PassRefPtrWillBeRawPtr<CSSValue> parseColumnCount();
+ NullableCSSValue parseColumnWidth();
+ NullableCSSValue parseColumnCount();
bool parseColumnsShorthand(bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();
+ NullableCSSValue parseGridPosition();
bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimitiveValue>& numericValue, RefPtrWillBeRawPtr<CSSPrimitiveValue>& gridLineName);
bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
- bool parseGridTemplateRowsAndAreas(PassRefPtrWillBeRawPtr<CSSValue>, bool important);
+ bool parseGridTemplateRowsAndAreas(NullableCSSValue, bool important);
bool parseGridTemplateShorthand(bool important);
bool parseGridShorthand(bool important);
bool parseGridAreaShorthand(bool important);
- bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackList();
+ bool parseSingleGridAreaLonghand(NullableCSSValue&);
+ NullableCSSValue parseGridTrackList();
bool parseGridTrackRepeatFunction(CSSValueList&);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList);
+ NullableCSSValue parseGridTrackSize(CSSParserValueList& inputList);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*);
bool parseGridTemplateAreasRow(NamedGridAreaMap&, const size_t, size_t&);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateAreas();
- bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNamesValue* = nullptr);
- PassRefPtrWillBeRawPtr<CSSValue> parseGridAutoFlow(CSSParserValueList&);
+ NullableCSSValue parseGridTemplateAreas();
+ bool parseGridLineNames(CSSParserValueList&, CSSValueList&, NullableCSSValue = nullptr);
+ NullableCSSValue parseGridAutoFlow(CSSParserValueList&);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseClipShape();
bool parseLegacyPosition(CSSPropertyID, bool important);
bool parseItemPositionOverflowPosition(CSSPropertyID, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseContentDistributionOverflowPosition();
+ NullableCSSValue parseContentDistributionOverflowPosition();
- PassRefPtrWillBeRawPtr<CSSValue> parseShapeProperty(CSSPropertyID propId);
- PassRefPtrWillBeRawPtr<CSSValue> parseBasicShapeAndOrBox();
+ NullableCSSValue parseShapeProperty(CSSPropertyID propId);
+ NullableCSSValue parseBasicShapeAndOrBox();
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape();
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);
@@ -186,8 +186,8 @@ private:
void parseSystemFont(bool important);
PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();
- PassRefPtrWillBeRawPtr<CSSValue> parseCounter(int defaultValue);
- PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* args, bool counters);
+ NullableCSSValue parseCounter(int defaultValue);
+ NullableCSSValue parseCounterContent(CSSParserValueList* args, bool counters);
bool parseColorParameters(CSSParserValue*, int* colorValues, bool parseAlpha);
bool parseHSLParameters(CSSParserValue*, double* colorValues, bool parseAlpha);
@@ -202,78 +202,78 @@ private:
PassRefPtrWillBeRawPtr<CSSValueList> parseFontFaceUnicodeRange();
bool parseSVGValue(CSSPropertyID propId, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseSVGStrokeDasharray();
+ NullableCSSValue parseSVGStrokeDasharray();
- PassRefPtrWillBeRawPtr<CSSValue> parsePaintOrder() const;
+ NullableCSSValue parsePaintOrder() const;
// CSS3 Parsing Routines (for properties specific to CSS3)
PassRefPtrWillBeRawPtr<CSSValueList> parseShadow(CSSParserValueList*, CSSPropertyID);
bool parseBorderImageShorthand(CSSPropertyID, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseBorderImage(CSSPropertyID);
- bool parseBorderImageRepeat(RefPtrWillBeRawPtr<CSSValue>&);
+ NullableCSSValue parseBorderImage(CSSPropertyID);
+ bool parseBorderImageRepeat(NullableCSSValue&);
bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageSliceValue>&);
bool parseBorderImageWidth(RefPtrWillBeRawPtr<CSSPrimitiveValue>&);
bool parseBorderImageOutset(RefPtrWillBeRawPtr<CSSPrimitiveValue>&);
bool parseBorderRadius(CSSPropertyID, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseReflect();
+ NullableCSSValue parseReflect();
bool parseFlex(CSSParserValueList* args, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parsePosition(CSSParserValueList*);
- PassRefPtrWillBeRawPtr<CSSValueList> parsePositionList(CSSParserValueList*);
+ NullableCSSValue parsePosition(CSSParserValueList*);
+ NullableCSSValue parsePositionList(CSSParserValueList*);
// Image generators
- bool parseCanvas(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseCanvas(CSSParserValueList*, NullableCSSValue&);
- bool parseDeprecatedGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
- bool parseDeprecatedLinearGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseDeprecatedRadialGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseLinearGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseRadialGradient(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&, CSSGradientRepeat repeating);
+ bool parseDeprecatedGradient(CSSParserValueList*, NullableCSSValue&);
+ bool parseDeprecatedLinearGradient(CSSParserValueList*, NullableCSSValue&, CSSGradientRepeat repeating);
+ bool parseDeprecatedRadialGradient(CSSParserValueList*, NullableCSSValue&, CSSGradientRepeat repeating);
+ bool parseLinearGradient(CSSParserValueList*, NullableCSSValue&, CSSGradientRepeat repeating);
+ bool parseRadialGradient(CSSParserValueList*, NullableCSSValue&, CSSGradientRepeat repeating);
bool parseGradientColorStops(CSSParserValueList*, CSSGradientValue*, bool expectComma);
- bool parseCrossfade(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseCrossfade(CSSParserValueList*, NullableCSSValue&);
- PassRefPtrWillBeRawPtr<CSSValue> parseImageSet(CSSParserValueList*);
+ NullableCSSValue parseImageSet(CSSParserValueList*);
- PassRefPtrWillBeRawPtr<CSSValue> parseWillChange();
+ NullableCSSValue parseWillChange();
PassRefPtrWillBeRawPtr<CSSValueList> parseFilter();
PassRefPtrWillBeRawPtr<CSSFunctionValue> parseBuiltinFilterArguments(CSSParserValueList*, CSSValueID);
PassRefPtrWillBeRawPtr<CSSValueList> parseTransformOrigin();
PassRefPtrWillBeRawPtr<CSSValueList> parseTransform(bool useLegacyParsing);
- PassRefPtrWillBeRawPtr<CSSValue> parseTransformValue(bool useLegacyParsing, CSSParserValue*);
+ NullableCSSValue parseTransformValue(bool useLegacyParsing, CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSValue> parseMotionPath();
- PassRefPtrWillBeRawPtr<CSSValue> parseMotionRotation();
+ NullableCSSValue parseMotionPath();
+ NullableCSSValue parseMotionRotation();
- PassRefPtrWillBeRawPtr<CSSValue> parseTextEmphasisStyle();
+ NullableCSSValue parseTextEmphasisStyle();
- PassRefPtrWillBeRawPtr<CSSValue> parseTouchAction();
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollBlocksOn();
+ NullableCSSValue parseTouchAction();
+ NullableCSSValue parseScrollBlocksOn();
- void addTextDecorationProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important);
+ void addTextDecorationProperty(CSSPropertyID, CSSValue, bool important);
bool parseTextDecoration(CSSPropertyID propId, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseTextIndent();
+ NullableCSSValue parseTextIndent();
PassRefPtrWillBeRawPtr<CSSLineBoxContainValue> parseLineBoxContain();
bool parseCalculation(CSSParserValue*, ValueRange);
bool parseFontFeatureTag(CSSValueList*);
- PassRefPtrWillBeRawPtr<CSSValue> parseFontFeatureSettings();
+ NullableCSSValue parseFontFeatureSettings();
bool parseFontVariantLigatures(bool important);
- bool parseGeneratedImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
+ bool parseGeneratedImage(CSSParserValueList*, NullableCSSValue&);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveCustomIdentValue(CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSValue> createCSSImageValueWithReferrer(const String& rawValue, const KURL&);
+ CSSValue createCSSImageValueWithReferrer(const String& rawValue, const KURL&);
PassRefPtrWillBeRawPtr<CSSBasicShape> parseInsetRoundedCorners(PassRefPtrWillBeRawPtr<CSSBasicShapeInset>, CSSParserValueList*);
@@ -356,12 +356,12 @@ private:
bool parseDeprecatedGradientColorStop(CSSParserValue*, CSSGradientColorStop&);
- void commitBorderImageProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important);
+ void commitBorderImageProperty(CSSPropertyID, NullableCSSValue, bool important);
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapPoints();
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapDestination();
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapCoordinate();
- PassRefPtrWillBeRawPtr<CSSValue> parseScrollSnapPosition();
+ NullableCSSValue parseScrollSnapPoints();
+ NullableCSSValue parseScrollSnapDestination();
+ NullableCSSValue parseScrollSnapCoordinate();
+ NullableCSSValue parseScrollSnapPosition();
private:
// Inputs:
« no previous file with comments | « Source/core/css/parser/CSSParserImpl.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698