<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209666] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209666">209666</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-10 10:31:13 -0800 (Sat, 10 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Remove the old CSS Parser
https://bugs.webkit.org/show_bug.cgi?id=165645
Reviewed by Daniel Bates.
Source/WebCore:
Remove the old CSS parser code. In doing so, code that used documentless
CSSParserContexts is now going through the new parser. This resulted in
some additional changes. These include:
(1) Canvas color parsing switched to new parser's code. This resulted in
progressions on canvas tests.
(2) Support for CSSNamespaceRule in the CSS OM, since the Inspector's
creation of CSS OM wrappers made it necessary to add this in. The old parser
did not create style rules for namespaces, but the new one (and other browsers)
did.
(3) <font face="X"> now uses the new parser's font-family parsing code. This
change was made in createFontFaceValue in CSSValuePool.
(4) FontFace now uses a new function on the new parser called
parseFontFaceDescriptor. This function sets things up so that parsing occurs
as though you are inside a @font-face. The old parser let you call parseValue
to parse "properties", but descriptors need to be handled differently in the
new parser.
(5) Illegal CSS rules in mediaControlsApple/ios.css forced me to add a quirk
to handle chained shadow DOM pseudo-elements. This should not be allowed, but
for now it is.
* CMakeLists.txt:
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSCSSRuleCustom.cpp:
(WebCore::toJSNewlyCreated):
* bindings/js/JSCSSStyleDeclarationCustom.cpp:
* css/CSSCalculationValue.cpp:
(WebCore::unitCategory):
(WebCore::hasDoubleValue):
(WebCore::checkDepthAndIndexDeprecated): Deleted.
(WebCore::CSSCalcExpressionNodeParserDeprecated::parseCalc): Deleted.
(WebCore::CSSCalcExpressionNodeParserDeprecated::operatorValue): Deleted.
(WebCore::CSSCalcExpressionNodeParserDeprecated::parseValue): Deleted.
(WebCore::CSSCalcExpressionNodeParserDeprecated::parseValueTerm): Deleted.
(WebCore::CSSCalcExpressionNodeParserDeprecated::parseValueMultiplicativeExpression): Deleted.
(WebCore::CSSCalcExpressionNodeParserDeprecated::parseAdditiveValueExpression): Deleted.
(WebCore::CSSCalcExpressionNodeParserDeprecated::parseValueExpression): Deleted.
* css/CSSCalculationValue.h:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::specifiedValueForGridTrackSize):
* css/CSSCustomPropertyValue.cpp:
(WebCore::CSSCustomPropertyValue::checkVariablesForCycles):
(WebCore::CSSCustomPropertyValue::resolveVariableReferences):
* css/CSSCustomPropertyValue.h:
* css/CSSFunctionValue.cpp:
(WebCore::CSSFunctionValue::CSSFunctionValue):
(WebCore::CSSFunctionValue::customCSSText):
(WebCore::CSSFunctionValue::append):
(WebCore::CSSFunctionValue::buildParserValueSubstitutingVariables): Deleted.
* css/CSSFunctionValue.h:
* css/CSSGrammar.y.in: Removed.
* css/CSSGrammar.y.includes: Removed.
* css/CSSGroupingRule.cpp:
(WebCore::CSSGroupingRule::insertRule):
* css/CSSKeyframeRule.h:
* css/CSSKeyframesRule.cpp:
(WebCore::CSSKeyframesRule::appendRule):
* css/CSSNamespaceRule.cpp: Added.
(WebCore::CSSNamespaceRule::CSSNamespaceRule):
(WebCore::CSSNamespaceRule::~CSSNamespaceRule):
(WebCore::CSSNamespaceRule::namespaceURI):
(WebCore::CSSNamespaceRule::prefix):
(WebCore::CSSNamespaceRule::cssText):
(WebCore::CSSNamespaceRule::reattach):
* css/CSSNamespaceRule.h: Added.
* css/CSSNamespaceRule.idl: Added.
* css/CSSPrimitiveValue.cpp:
(WebCore::isValidCSSUnitTypeForDoubleConversion):
(WebCore::isStringType):
(WebCore::CSSPrimitiveValue::cleanup):
(WebCore::CSSPrimitiveValue::formatNumberForCustomCSSText):
(WebCore::CSSPrimitiveValue::cloneForCSSOM):
(WebCore::CSSPrimitiveValue::equals):
(WebCore::CSSPrimitiveValue::buildParserValue): Deleted.
* css/CSSPrimitiveValue.h:
* css/CSSRule.h:
* css/CSSRule.idl:
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::insertRule):
* css/CSSValue.cpp:
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
* css/CSSValue.h:
(WebCore::CSSValue::isCustomPropertyValue):
(WebCore::CSSValue::hasVariableReferences):
(WebCore::CSSValue::isVariableDependentValue): Deleted.
(WebCore::CSSValue::isVariableValue): Deleted.
* css/CSSValueList.cpp:
(WebCore::CSSValueList::customCSSText):
(WebCore::CSSValueList::containsVariables): Deleted.
(WebCore::CSSValueList::checkVariablesForCycles): Deleted.
(WebCore::CSSValueList::buildParserValueSubstitutingVariables): Deleted.
(WebCore::CSSValueList::buildParserValueListSubstitutingVariables): Deleted.
* css/CSSValueList.h:
(WebCore::CSSValueList::createSlashSeparated):
(WebCore::CSSValueList::createFromParserValueList): Deleted.
* css/CSSValuePool.cpp:
(WebCore::CSSValuePool::createFontFaceValue):
* css/CSSVariableData.cpp:
* css/CSSVariableDependentValue.cpp: Removed.
* css/CSSVariableDependentValue.h: Removed.
* css/CSSVariableValue.cpp: Removed.
* css/CSSVariableValue.h: Removed.
* css/DOMCSSNamespace.cpp:
* css/FontFace.cpp:
(WebCore::FontFace::parseString):
* css/InspectorCSSOMWrappers.cpp:
* css/MediaQueryExp.cpp:
(WebCore::isFeatureValidWithIdentifier): Deleted.
(WebCore::isFeatureValidWithNonNegativeLengthOrNumber): Deleted.
(WebCore::isFeatureValidWithDensity): Deleted.
(WebCore::isFeatureValidWithNonNegativeInteger): Deleted.
(WebCore::isFeatureValidWithNonNegativeNumber): Deleted.
(WebCore::isFeatureValidWithZeroOrOne): Deleted.
(WebCore::isFeatureValidWithNumberWithUnit): Deleted.
(WebCore::isFeatureValidWithNumber): Deleted.
(WebCore::isSlash): Deleted.
(WebCore::isPositiveIntegerValue): Deleted.
* css/MediaQueryExp.h:
* css/PropertySetCSSStyleDeclaration.cpp:
(WebCore::PropertySetCSSStyleDeclaration::setCssText):
(WebCore::PropertySetCSSStyleDeclaration::setProperty):
* css/SelectorPseudoTypeMap.h:
* css/StyleProperties.cpp:
(WebCore::StyleProperties::getPropertyValue):
(WebCore::StyleProperties::getPropertyCSSValue):
(WebCore::MutableStyleProperties::setCustomProperty):
(WebCore::MutableStyleProperties::parseDeclaration):
(WebCore::StyleProperties::asText):
* css/StyleProperties.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
* css/StyleResolver.h:
* css/StyleRule.cpp:
(WebCore::StyleRuleBase::createCSSOMWrapper):
* css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::parseAuthorStyleSheet):
(WebCore::StyleSheetContents::parseString):
(WebCore::StyleSheetContents::completeURL):
(WebCore::StyleSheetContents::parseStringAtPosition): Deleted.
* css/StyleSheetContents.h:
* css/WebKitCSSMatrix.cpp:
* css/makeSelectorPseudoClassAndCompatibilityElementMap.py:
* css/parser/CSSParser.cpp:
(WebCore::CSSParserContext::CSSParserContext):
(WebCore::CSSParser::CSSParser):
(WebCore::CSSParser::parseSheet):
(WebCore::CSSParser::parseRule):
(WebCore::CSSParser::parseKeyframeRule):
(WebCore::CSSParser::parseSupportsCondition):
(WebCore::CSSParser::parseColor):
(WebCore::CSSParser::parseSystemColor):
(WebCore::CSSParser::parseSingleValue):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseCustomPropertyValue):
(WebCore::CSSParser::parseSelector):
(WebCore::CSSParser::parseInlineStyleDeclaration):
(WebCore::CSSParser::parseDeclaration):
(WebCore::CSSParser::parseValueWithVariableReferences):
(WebCore::CSSParser::parseKeyframeKeyList):
(WebCore::CSSParser::parseFontFaceDescriptor):
(WebCore::equalLettersIgnoringASCIICase): Deleted.
(WebCore::hasPrefix): Deleted.
(WebCore::createPrimitiveValuePair): Deleted.
(WebCore::AnimationParseContext::commitFirstAnimation): Deleted.
(WebCore::AnimationParseContext::hasCommittedFirstAnimation): Deleted.
(WebCore::AnimationParseContext::commitAnimationPropertyKeyword): Deleted.
(WebCore::AnimationParseContext::animationPropertyKeywordAllowed): Deleted.
(WebCore::AnimationParseContext::hasSeenAnimationPropertyKeyword): Deleted.
(WebCore::AnimationParseContext::sawAnimationPropertyKeyword): Deleted.
(): Deleted.
(WebCore::convertToASCIILowercaseInPlace): Deleted.
(WebCore::CSSParserString::convertToASCIILowercaseInPlace): Deleted.
(WebCore::CSSParser::setupParser): Deleted.
(WebCore::isColorPropertyID): Deleted.
(WebCore::CSSParser::isValidSystemColorValue): Deleted.
(WebCore::validPrimitiveValueColor): Deleted.
(WebCore::parseColorValue): Deleted.
(WebCore::isSimpleLengthPropertyID): Deleted.
(WebCore::parseSimpleLength): Deleted.
(WebCore::parseSimpleLengthValue): Deleted.
(WebCore::isValidKeywordPropertyAndValue): Deleted.
(WebCore::isUniversalKeyword): Deleted.
(WebCore::isKeywordPropertyID): Deleted.
(WebCore::parseKeywordValue): Deleted.
(WebCore::parseTransformTranslateArguments): Deleted.
(WebCore::parseTranslateTransformValue): Deleted.
(WebCore::CSSParser::parseFontFaceValue): Deleted.
(WebCore::CSSParser::parseColorFromString): Deleted.
(WebCore::CSSParser::parseDeclarationDeprecated): Deleted.
(WebCore::filterProperties): Deleted.
(WebCore::CSSParser::createStyleProperties): Deleted.
(WebCore::CSSParser::addProperty): Deleted.
(WebCore::CSSParser::rollbackLastProperties): Deleted.
(WebCore::CSSParser::clearProperties): Deleted.
(WebCore::CSSParser::completeURL): Deleted.
(WebCore::CSSParser::validateCalculationUnit): Deleted.
(WebCore::CSSParser::shouldAcceptUnitLessValues): Deleted.
(WebCore::CSSParser::validateUnit): Deleted.
(WebCore::CSSParser::createPrimitiveNumericValue): Deleted.
(WebCore::CSSParser::createPrimitiveStringValue): Deleted.
(WebCore::isComma): Deleted.
(WebCore::isForwardSlashOperator): Deleted.
(WebCore::CSSParser::isValidSize): Deleted.
(WebCore::CSSParser::parseValidPrimitive): Deleted.
(WebCore::CSSParser::addExpandedPropertyForValue): Deleted.
(WebCore::isImageSetFunctionValue): Deleted.
(WebCore::CSSParser::addFillValue): Deleted.
(WebCore::isContentDistributionKeyword): Deleted.
(WebCore::isContentPositionKeyword): Deleted.
(WebCore::isBaselinePositionKeyword): Deleted.
(WebCore::isAlignmentOverflowKeyword): Deleted.
(WebCore::isItemPositionKeyword): Deleted.
(WebCore::CSSParser::parseLegacyPosition): Deleted.
(WebCore::CSSParser::parseContentDistributionOverflowPosition): Deleted.
(WebCore::CSSParser::parseItemPositionOverflowPosition): Deleted.
(WebCore::parseBackgroundClip): Deleted.
(WebCore::CSSParser::useLegacyBackgroundSizeShorthandBehavior): Deleted.
(WebCore::CSSParser::parseNonElementSnapPoints): Deleted.
(WebCore::CSSParser::parseScrollSnapPositions): Deleted.
(WebCore::CSSParser::parseScrollSnapDestination): Deleted.
(WebCore::CSSParser::parseScrollSnapCoordinate): Deleted.
(WebCore::CSSParser::parseFillShorthand): Deleted.
(WebCore::CSSParser::addAnimationValue): Deleted.
(WebCore::CSSParser::parseAnimationShorthand): Deleted.
(WebCore::CSSParser::parseColumnWidth): Deleted.
(WebCore::CSSParser::parseColumnCount): Deleted.
(WebCore::CSSParser::parseColumnsShorthand): Deleted.
(WebCore::CSSParser::parseTransitionShorthand): Deleted.
(WebCore::CSSParser::parseShorthand): Deleted.
(WebCore::CSSParser::parse4Values): Deleted.
(WebCore::CSSParser::parsePage): Deleted.
(WebCore::CSSParser::parseSize): Deleted.
(WebCore::CSSParser::parseSizeParameter): Deleted.
(WebCore::CSSParser::parseQuotes): Deleted.
(WebCore::CSSParser::parseAlt): Deleted.
(WebCore::CSSParser::parseCustomPropertyDeclaration): Deleted.
(WebCore::CSSParser::parseContent): Deleted.
(WebCore::CSSParser::parseAttr): Deleted.
(WebCore::CSSParser::parseBackgroundColor): Deleted.
(WebCore::CSSParser::parseFillImage): Deleted.
(WebCore::CSSParser::parsePositionX): Deleted.
(WebCore::CSSParser::parsePositionY): Deleted.
(WebCore::CSSParser::parseFillPositionComponent): Deleted.
(WebCore::isValueConflictingWithCurrentEdge): Deleted.
(WebCore::isFillPositionKeyword): Deleted.
(WebCore::CSSParser::parse4ValuesFillPosition): Deleted.
(WebCore::CSSParser::parse3ValuesFillPosition): Deleted.
(WebCore::CSSParser::isPotentialPositionValue): Deleted.
(WebCore::CSSParser::parseFillPosition): Deleted.
(WebCore::CSSParser::parse2ValuesFillPosition): Deleted.
(WebCore::CSSParser::parseFillRepeat): Deleted.
(WebCore::CSSParser::parseFillSize): Deleted.
(WebCore::CSSParser::parseFillProperty): Deleted.
(WebCore::CSSParser::parseAnimationDelay): Deleted.
(WebCore::CSSParser::parseAnimationDirection): Deleted.
(WebCore::CSSParser::parseAnimationDuration): Deleted.
(WebCore::CSSParser::parseAnimationFillMode): Deleted.
(WebCore::CSSParser::parseAnimationIterationCount): Deleted.
(WebCore::CSSParser::parseAnimationName): Deleted.
(WebCore::CSSParser::parseAnimationPlayState): Deleted.
(WebCore::CSSParser::parseAnimationTrigger): Deleted.
(WebCore::CSSParser::parseAnimationProperty): Deleted.
(WebCore::CSSParser::parseTransformOriginShorthand): Deleted.
(WebCore::CSSParser::isSpringTimingFunctionEnabled): Deleted.
(WebCore::CSSParser::parseCubicBezierTimingFunctionValue): Deleted.
(WebCore::CSSParser::parseSpringTimingFunctionValue): Deleted.
(WebCore::CSSParser::parseAnimationTimingFunction): Deleted.
(WebCore::isValidGridPositionCustomIdent): Deleted.
(WebCore::CSSParser::parseIntegerOrCustomIdentFromGridPosition): Deleted.
(WebCore::CSSParser::parseGridPosition): Deleted.
(WebCore::gridMissingGridPositionValue): Deleted.
(WebCore::CSSParser::parseGridItemPositionShorthand): Deleted.
(WebCore::CSSParser::parseGridGapShorthand): Deleted.
(WebCore::CSSParser::parseGridTemplateColumns): Deleted.
(WebCore::CSSParser::parseGridTemplateRowsAndAreasAndColumns): Deleted.
(WebCore::CSSParser::parseGridTemplateShorthand): Deleted.
(WebCore::parseImplicitAutoFlow): Deleted.
(WebCore::CSSParser::parseGridShorthand): Deleted.
(WebCore::CSSParser::parseGridAreaShorthand): Deleted.
(WebCore::CSSParser::parseSingleGridAreaLonghand): Deleted.
(WebCore::CSSParser::parseGridLineNames): Deleted.
(WebCore::isGridTrackFixedSized): Deleted.
(WebCore::CSSParser::parseGridTrackList): Deleted.
(WebCore::CSSParser::parseGridTrackRepeatFunction): Deleted.
(WebCore::CSSParser::parseGridTrackSize): Deleted.
(WebCore::CSSParser::parseGridBreadth): Deleted.
(WebCore::isValidGridAutoFlowId): Deleted.
(WebCore::CSSParser::parseGridAutoFlow): Deleted.
(WebCore::skipCommaInDashboardRegion): Deleted.
(WebCore::CSSParser::parseDashboardRegions): Deleted.
(WebCore::parseGridTemplateAreasColumnNames): Deleted.
(WebCore::CSSParser::parseGridTemplateAreasRow): Deleted.
(WebCore::CSSParser::parseGridTemplateAreas): Deleted.
(WebCore::CSSParser::parseCounterContent): Deleted.
(WebCore::CSSParser::parseClipShape): Deleted.
(WebCore::completeBorderRadii): Deleted.
(WebCore::CSSParser::parseInsetRoundedCorners): Deleted.
(WebCore::CSSParser::parseBasicShapeInset): Deleted.
(WebCore::CSSParser::parseShapeRadius): Deleted.
(WebCore::CSSParser::parseBasicShapeCircle): Deleted.
(WebCore::CSSParser::parseBasicShapeEllipse): Deleted.
(WebCore::CSSParser::parseBasicShapePolygon): Deleted.
(WebCore::CSSParser::parseBasicShapePath): Deleted.
(WebCore::isBoxValue): Deleted.
(WebCore::CSSParser::parseBasicShapeAndOrBox): Deleted.
(WebCore::CSSParser::parseShapeProperty): Deleted.
(WebCore::CSSParser::parseClipPath): Deleted.
(WebCore::CSSParser::parseBasicShape): Deleted.
(WebCore::CSSParser::parseFont): Deleted.
(WebCore::CSSParser::parseSystemFont): Deleted.
(WebCore::FontFamilyValueBuilder::FontFamilyValueBuilder): Deleted.
(WebCore::FontFamilyValueBuilder::add): Deleted.
(WebCore::FontFamilyValueBuilder::commit): Deleted.
(WebCore::valueIsCSSKeyword): Deleted.
(WebCore::CSSParser::parseFontFamily): Deleted.
(WebCore::CSSParser::parseLineHeight): Deleted.
(WebCore::CSSParser::parseFontSize): Deleted.
(WebCore::createFontWeightValueKeyword): Deleted.
(WebCore::CSSParser::parseFontWeight): Deleted.
(WebCore::CSSParser::parseFontSynthesis): Deleted.
(WebCore::CSSParser::parseFontFaceSrcURI): Deleted.
(WebCore::CSSParser::parseFontFaceSrcLocal): Deleted.
(WebCore::CSSParser::parseFontFaceSrc): Deleted.
(WebCore::CSSParser::parseFontFaceUnicodeRange): Deleted.
(WebCore::checkForValidDouble): Deleted.
(WebCore::parseDouble): Deleted.
(WebCore::parseColorIntOrPercentage): Deleted.
(WebCore::isTenthAlpha): Deleted.
(WebCore::parseAlphaValue): Deleted.
(WebCore::mightBeRGBA): Deleted.
(WebCore::mightBeRGB): Deleted.
(WebCore::fastParseColorInternal): Deleted.
(WebCore::CSSParser::fastParseColor): Deleted.
(WebCore::CSSParser::parsedDouble): Deleted.
(WebCore::CSSParser::isCalculation): Deleted.
(WebCore::isPercent): Deleted.
(WebCore::CSSParser::parseColorInt): Deleted.
(WebCore::CSSParser::parseColorDouble): Deleted.
(WebCore::CSSParser::parseRGBParameters): Deleted.
(WebCore::CSSParser::parseColorFunctionParameters): Deleted.
(WebCore::CSSParser::parseHSLParameters): Deleted.
(WebCore::CSSParser::parseColorFromValue): Deleted.
(WebCore::ShadowParseContext::ShadowParseContext): Deleted.
(WebCore::ShadowParseContext::allowLength): Deleted.
(WebCore::ShadowParseContext::commitValue): Deleted.
(WebCore::ShadowParseContext::commitLength): Deleted.
(WebCore::ShadowParseContext::commitColor): Deleted.
(WebCore::ShadowParseContext::commitStyle): Deleted.
(WebCore::CSSParser::parseShadow): Deleted.
(WebCore::CSSParser::parseReflect): Deleted.
(WebCore::CSSParser::parseFlex): Deleted.
(WebCore::BorderImageParseContext::BorderImageParseContext): Deleted.
(WebCore::BorderImageParseContext::canAdvance): Deleted.
(WebCore::BorderImageParseContext::setCanAdvance): Deleted.
(WebCore::BorderImageParseContext::allowCommit): Deleted.
(WebCore::BorderImageParseContext::allowImage): Deleted.
(WebCore::BorderImageParseContext::allowImageSlice): Deleted.
(WebCore::BorderImageParseContext::allowRepeat): Deleted.
(WebCore::BorderImageParseContext::allowForwardSlashOperator): Deleted.
(WebCore::BorderImageParseContext::requireWidth): Deleted.
(WebCore::BorderImageParseContext::requireOutset): Deleted.
(WebCore::BorderImageParseContext::commitImage): Deleted.
(WebCore::BorderImageParseContext::commitImageSlice): Deleted.
(WebCore::BorderImageParseContext::commitForwardSlashOperator): Deleted.
(WebCore::BorderImageParseContext::commitBorderWidth): Deleted.
(WebCore::BorderImageParseContext::commitBorderOutset): Deleted.
(WebCore::BorderImageParseContext::commitRepeat): Deleted.
(WebCore::BorderImageParseContext::commitWebKitBorderImage): Deleted.
(WebCore::BorderImageParseContext::commitBorderImage): Deleted.
(WebCore::BorderImageParseContext::commitBorderImageProperty): Deleted.
(WebCore::CSSParser::parseBorderImage): Deleted.
(WebCore::isBorderImageRepeatKeyword): Deleted.
(WebCore::CSSParser::parseBorderImageRepeat): Deleted.
(WebCore::BorderImageSliceParseContext::BorderImageSliceParseContext): Deleted.
(WebCore::BorderImageSliceParseContext::allowNumber): Deleted.
(WebCore::BorderImageSliceParseContext::allowFill): Deleted.
(WebCore::BorderImageSliceParseContext::allowFinalCommit): Deleted.
(WebCore::BorderImageSliceParseContext::top): Deleted.
(WebCore::BorderImageSliceParseContext::commitNumber): Deleted.
(WebCore::BorderImageSliceParseContext::commitFill): Deleted.
(WebCore::BorderImageSliceParseContext::commitBorderImageSlice): Deleted.
(WebCore::CSSParser::parseBorderImageSlice): Deleted.
(WebCore::BorderImageQuadParseContext::BorderImageQuadParseContext): Deleted.
(WebCore::BorderImageQuadParseContext::allowNumber): Deleted.
(WebCore::BorderImageQuadParseContext::allowFinalCommit): Deleted.
(WebCore::BorderImageQuadParseContext::top): Deleted.
(WebCore::BorderImageQuadParseContext::commitNumber): Deleted.
(WebCore::BorderImageQuadParseContext::setAllowFinalCommit): Deleted.
(WebCore::BorderImageQuadParseContext::setTop): Deleted.
(WebCore::BorderImageQuadParseContext::commitBorderImageQuad): Deleted.
(WebCore::CSSParser::parseBorderImageQuad): Deleted.
(WebCore::CSSParser::parseBorderImageWidth): Deleted.
(WebCore::CSSParser::parseBorderImageOutset): Deleted.
(WebCore::CSSParser::parseBorderRadius): Deleted.
(WebCore::CSSParser::parseAspectRatio): Deleted.
(WebCore::CSSParser::parseCounter): Deleted.
(WebCore::parseDeprecatedGradientPoint): Deleted.
(WebCore::parseDeprecatedGradientColorStop): Deleted.
(WebCore::CSSParser::parseDeprecatedGradient): Deleted.
(WebCore::valueFromSideKeyword): Deleted.
(WebCore::parseGradientColorOrKeyword): Deleted.
(WebCore::CSSParser::parseDeprecatedLinearGradient): Deleted.
(WebCore::CSSParser::parseDeprecatedRadialGradient): Deleted.
(WebCore::CSSParser::parseLinearGradient): Deleted.
(WebCore::CSSParser::parseRadialGradient): Deleted.
(WebCore::CSSParser::parseGradientColorStops): Deleted.
(WebCore::CSSParser::isGeneratedImageValue): Deleted.
(WebCore::CSSParser::parseGeneratedImage): Deleted.
(WebCore::CSSParser::parseFilterImage): Deleted.
(WebCore::CSSParser::parseCrossfade): Deleted.
(WebCore::CSSParser::parseCanvas): Deleted.
(WebCore::CSSParser::parseNamedImage): Deleted.
(WebCore::CSSParser::parseImageResolution): Deleted.
(WebCore::CSSParser::parseImageSet): Deleted.
(WebCore::TransformOperationInfo::TransformOperationInfo): Deleted.
(WebCore::TransformOperationInfo::type): Deleted.
(WebCore::TransformOperationInfo::argCount): Deleted.
(WebCore::TransformOperationInfo::unit): Deleted.
(WebCore::TransformOperationInfo::unknown): Deleted.
(WebCore::TransformOperationInfo::hasCorrectArgCount): Deleted.
(WebCore::CSSParser::parseTransform): Deleted.
(WebCore::CSSParser::parseTransformValue): Deleted.
(WebCore::CSSParser::isBlendMode): Deleted.
(WebCore::CSSParser::isCompositeOperator): Deleted.
(WebCore::isValidPrimitiveFilterFunction): Deleted.
(WebCore::CSSParser::parseBuiltinFilterArguments): Deleted.
(WebCore::cssValueKeywordIDForFunctionName): Deleted.
(WebCore::CSSParser::parseFilter): Deleted.
(WebCore::validFlowName): Deleted.
(WebCore::CSSParser::isTextAutosizingEnabled): Deleted.
(WebCore::CSSParser::isCSSGridLayoutEnabled): Deleted.
(WebCore::CSSParser::parseFlowThread): Deleted.
(WebCore::CSSParser::parseRegionThread): Deleted.
(WebCore::CSSParser::parseTransformOrigin): Deleted.
(WebCore::CSSParser::parsePerspectiveOrigin): Deleted.
(WebCore::CSSParser::addTextDecorationProperty): Deleted.
(WebCore::CSSParser::parseTextDecoration): Deleted.
(WebCore::CSSParser::parseTextDecorationSkip): Deleted.
(WebCore::CSSParser::parseTextUnderlinePosition): Deleted.
(WebCore::CSSParser::parseTextEmphasisStyle): Deleted.
(WebCore::CSSParser::parseTextEmphasisPosition): Deleted.
(WebCore::CSSParser::parseTextIndent): Deleted.
(WebCore::CSSParser::parseHangingPunctuation): Deleted.
(WebCore::CSSParser::parseLineBoxContain): Deleted.
(WebCore::CSSParser::parseFontFeatureTag): Deleted.
(WebCore::CSSParser::parseFontFeatureSettings): Deleted.
(WebCore::CSSParser::parseFontVariationTag): Deleted.
(WebCore::CSSParser::parseFontVariationSettings): Deleted.
(WebCore::CSSParser::parseFontVariantLigatures): Deleted.
(WebCore::CSSParser::parseFontVariantNumeric): Deleted.
(WebCore::CSSParser::parseFontVariantEastAsian): Deleted.
(WebCore::CSSParser::parseFontVariant): Deleted.
(WebCore::isValidWillChangeAnimatableFeature): Deleted.
(WebCore::CSSParser::parseWillChange): Deleted.
(WebCore::CSSParser::parseCalculation): Deleted.
(WebCore::isCSSLetter): Deleted.
(WebCore::isCSSEscape): Deleted.
(WebCore::isURILetter): Deleted.
(WebCore::isIdentifierStartAfterDash): Deleted.
(WebCore::isCustomPropertyIdentifier): Deleted.
(WebCore::isEqualToCSSIdentifier): Deleted.
(WebCore::isEqualToCSSCaseSensitiveIdentifier): Deleted.
(WebCore::checkAndSkipEscape): Deleted.
(WebCore::skipWhiteSpace): Deleted.
(WebCore::CSSParserString::characters<LChar>): Deleted.
(WebCore::CSSParserString::characters<UChar>): Deleted.
(WebCore::CSSParser::currentCharacter<LChar>): Deleted.
(WebCore::CSSParser::currentCharacter<UChar>): Deleted.
(WebCore::CSSParser::currentCharacter16): Deleted.
(WebCore::CSSParser::tokenStart<LChar>): Deleted.
(WebCore::CSSParser::tokenStart<UChar>): Deleted.
(WebCore::CSSParser::currentLocation): Deleted.
(WebCore::CSSParser::isIdentifierStart): Deleted.
(WebCore::checkAndSkipString): Deleted.
(WebCore::CSSParser::parseEscape): Deleted.
(WebCore::CSSParser::UnicodeToChars<LChar>): Deleted.
(WebCore::CSSParser::UnicodeToChars<UChar>): Deleted.
(WebCore::CSSParser::parseIdentifierInternal): Deleted.
(WebCore::CSSParser::parseIdentifier): Deleted.
(WebCore::CSSParser::parseStringInternal): Deleted.
(WebCore::CSSParser::parseString): Deleted.
(WebCore::CSSParser::findURI): Deleted.
(WebCore::CSSParser::parseURIInternal): Deleted.
(WebCore::CSSParser::parseURI): Deleted.
(WebCore::CSSParser::parseUnicodeRange): Deleted.
(WebCore::CSSParser::parseNthChild): Deleted.
(WebCore::CSSParser::parseNthChildExtra): Deleted.
(WebCore::CSSParser::detectFunctionTypeToken): Deleted.
(WebCore::CSSParser::detectMediaQueryToken): Deleted.
(WebCore::CSSParser::detectNumberToken): Deleted.
(WebCore::CSSParser::detectDashToken): Deleted.
(WebCore::CSSParser::detectAtToken): Deleted.
(WebCore::CSSParser::detectSupportsToken): Deleted.
(WebCore::CSSParser::realLex): Deleted.
(WebCore::CSSParser::createImportRule): Deleted.
(WebCore::CSSParser::createMediaRule): Deleted.
(WebCore::CSSParser::createEmptyMediaRule): Deleted.
(WebCore::CSSParser::createSupportsRule): Deleted.
(WebCore::CSSParser::markSupportsRuleHeaderStart): Deleted.
(WebCore::CSSParser::markSupportsRuleHeaderEnd): Deleted.
(WebCore::CSSParser::popSupportsRuleData): Deleted.
(WebCore::CSSParser::processAndAddNewRuleToSourceTreeIfNeeded): Deleted.
(WebCore::CSSParser::addNewRuleToSourceTree): Deleted.
(WebCore::CSSParser::popRuleData): Deleted.
(WebCore::CSSParser::syntaxError): Deleted.
(WebCore::CSSParser::isLoggingErrors): Deleted.
(WebCore::CSSParser::logError): Deleted.
(WebCore::CSSParser::createKeyframesRule): Deleted.
(WebCore::CSSParser::createStyleRule): Deleted.
(WebCore::CSSParser::createFontFaceRule): Deleted.
(WebCore::CSSParser::addNamespace): Deleted.
(WebCore::CSSParser::determineNameInNamespace): Deleted.
(WebCore::CSSParser::rewriteSpecifiersWithNamespaceIfNeeded): Deleted.
(WebCore::CSSParser::rewriteSpecifiersWithElementName): Deleted.
(WebCore::CSSParser::rewriteSpecifiers): Deleted.
(WebCore::CSSParser::createPageRule): Deleted.
(WebCore::CSSParser::createSelectorVector): Deleted.
(WebCore::CSSParser::recycleSelectorVector): Deleted.
(WebCore::CSSParser::createRegionRule): Deleted.
(WebCore::CSSParser::createMarginAtRule): Deleted.
(WebCore::CSSParser::startDeclarationsForMarginBox): Deleted.
(WebCore::CSSParser::endDeclarationsForMarginBox): Deleted.
(WebCore::CSSParser::createKeyframe): Deleted.
(WebCore::CSSParser::invalidBlockHit): Deleted.
(WebCore::CSSParser::updateLastMediaLine): Deleted.
(WebCore::fixUnparsedProperties): Deleted.
(WebCore::CSSParser::fixUnparsedPropertyRanges): Deleted.
(WebCore::CSSParser::markRuleHeaderStart): Deleted.
(WebCore::CSSParser::setRuleHeaderEnd): Deleted.
(WebCore::CSSParser::markRuleHeaderEnd): Deleted.
(WebCore::CSSParser::markSelectorStart): Deleted.
(WebCore::CSSParser::markSelectorEnd): Deleted.
(WebCore::CSSParser::markRuleBodyStart): Deleted.
(WebCore::CSSParser::markRuleBodyEnd): Deleted.
(WebCore::CSSParser::markPropertyStart): Deleted.
(WebCore::CSSParser::markPropertyEnd): Deleted.
(WebCore::CSSParser::createViewportRule): Deleted.
(WebCore::CSSParser::parseViewportProperty): Deleted.
(WebCore::CSSParser::parseViewportShorthand): Deleted.
(WebCore::isAppleLegacyCSSPropertyKeyword): Deleted.
(WebCore::cssPropertyID): Deleted.
(WebCore::cssPropertyNameIOSAliasing): Deleted.
(WebCore::isAppleLegacyCSSValueKeyword): Deleted.
(WebCore::cssValueKeywordID): Deleted.
(WebCore::isValidNthToken): Deleted.
* css/parser/CSSParser.h:
(): Deleted.
(WebCore::CSSParser::ValueWithCalculation::ValueWithCalculation): Deleted.
(WebCore::CSSParser::ValueWithCalculation::value): Deleted.
(WebCore::CSSParser::ValueWithCalculation::operator CSSParserValue&): Deleted.
(WebCore::CSSParser::ValueWithCalculation::calculation): Deleted.
(WebCore::CSSParser::ValueWithCalculation::setCalculation): Deleted.
(WebCore::CSSParser::hasProperties): Deleted.
(WebCore::CSSParser::startNestedSelectorList): Deleted.
(WebCore::CSSParser::endNestedSelectorList): Deleted.
(WebCore::CSSParser::resetPropertyRange): Deleted.
(WebCore::CSSParser::isExtractingSourceData): Deleted.
(WebCore::CSSParser::lex): Deleted.
(WebCore::CSSParser::token): Deleted.
(WebCore::CSSParser::markViewportRuleBodyStart): Deleted.
(WebCore::CSSParser::markViewportRuleBodyEnd): Deleted.
(WebCore::CSSParser::setCustomPropertyName): Deleted.
(WebCore::CSSParser::is8BitSource): Deleted.
(WebCore::CSSParser::setStyleSheet): Deleted.
(WebCore::CSSParser::inStrictMode): Deleted.
(WebCore::CSSParser::inQuirksMode): Deleted.
(WebCore::CSSParser::setupParser): Deleted.
(WebCore::CSSParser::inShorthand): Deleted.
(WebCore::CSSParser::inViewport): Deleted.
(WebCore::CSSParser::operator|): Deleted.
(WebCore::CSSParser::validateUnit): Deleted.
(WebCore::ShorthandScope::ShorthandScope): Deleted.
(WebCore::ShorthandScope::~ShorthandScope): Deleted.
(WebCore::CSSParser::setTokenStart<LChar>): Deleted.
(WebCore::CSSParser::setTokenStart<UChar>): Deleted.
(WebCore::CSSParser::tokenStartOffset): Deleted.
(WebCore::CSSParser::currentCharacterOffset): Deleted.
(WebCore::CSSParser::tokenStartChar): Deleted.
(WebCore::isCustomPropertyName): Deleted.
(WebCore::cssyylex): Deleted.
* css/parser/CSSParserFastPaths.cpp:
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
* css/parser/CSSParserMode.h:
(WebCore::CSSParserContextHash::hash):
* css/parser/CSSParserValues.cpp:
(WebCore::CSSParserSelector::setSelectorList):
(WebCore::destroy): Deleted.
(WebCore::CSSParserValueList::~CSSParserValueList): Deleted.
(WebCore::CSSParserValueList::addValue): Deleted.
(WebCore::CSSParserValueList::insertValueAt): Deleted.
(WebCore::CSSParserValueList::extend): Deleted.
(WebCore::CSSParserValueList::containsVariables): Deleted.
(WebCore::CSSParserValue::createCSSValue): Deleted.
(WebCore::CSSParserSelector::parsePseudoElementSelector): Deleted.
(WebCore::CSSParserSelector::parsePseudoElementCueFunctionSelector): Deleted.
(WebCore::CSSParserSelector::parsePseudoElementSlottedFunctionSelector): Deleted.
(WebCore::CSSParserSelector::parsePseudoClassHostFunctionSelector): Deleted.
(WebCore::CSSParserSelector::parsePseudoClassAndCompatibilityElementSelector): Deleted.
(WebCore::CSSParserSelector::setPseudoClassValue): Deleted.
* css/parser/CSSParserValues.h:
(WebCore::CSSParserString::init): Deleted.
(WebCore::CSSParserString::clear): Deleted.
(WebCore::CSSParserString::is8Bit): Deleted.
(WebCore::CSSParserString::characters8): Deleted.
(WebCore::CSSParserString::characters16): Deleted.
(WebCore::CSSParserString::length): Deleted.
(WebCore::CSSParserString::setLength): Deleted.
(WebCore::CSSParserString::operator[]): Deleted.
(WebCore::CSSParserString::operator String): Deleted.
(WebCore::CSSParserString::operator AtomicString): Deleted.
(WebCore::CSSParserString::toStringView): Deleted.
(): Deleted.
(WebCore::CSSParserValueList::CSSParserValueList): Deleted.
(WebCore::CSSParserValueList::size): Deleted.
(WebCore::CSSParserValueList::currentIndex): Deleted.
(WebCore::CSSParserValueList::current): Deleted.
(WebCore::CSSParserValueList::next): Deleted.
(WebCore::CSSParserValueList::previous): Deleted.
(WebCore::CSSParserValueList::setCurrentIndex): Deleted.
(WebCore::CSSParserValueList::valueAt): Deleted.
(WebCore::CSSParserValueList::clear): Deleted.
(WebCore::CSSParserValue::setFromValueList): Deleted.
(WebCore::equalLettersIgnoringASCIICase): Deleted.
* css/parser/CSSPropertyParser.cpp:
(WebCore::isCustomPropertyName):
(WebCore::cssPropertyNameIOSAliasing):
* css/parser/CSSPropertyParser.h:
* css/parser/SVGCSSParser.cpp: Removed.
* dom/InlineStyleSheetOwner.cpp:
(WebCore::InlineStyleSheetOwner::createSheet):
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheet::ensureSourceData):
(WebCore::InspectorStyleSheetForInlineStyle::ruleSourceData):
* page/animation/AnimationController.cpp:
* rendering/style/RenderStyle.cpp:
* svg/SVGAnimateElementBase.cpp:
* svg/SVGAnimationElement.cpp:
* svg/SVGElement.cpp:
Source/WebKit/mac:
* DOM/DOMCSS.mm:
(kitClass):
* DOM/DOMCSSRule.h:
Tools:
* TestWebKitAPI/Tests/WebCore/CSSParser.cpp:
(TestWebKitAPI::TEST):
LayoutTests:
* TestExpectations:
Some canvas tests pass now that they use the new parser's color parsing.
* fast/dom/HTMLFontElement/face-attribute-expected.txt:
* fast/dom/HTMLFontElement/face-attribute.html:
Converted font face parsing over to just use the CSS parser's font-family
parsing. This matches other browsers, so removing cases that we used to
accept now that we're more strict.
* platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt:
* platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt:
These tests pass now that canvas uses the new parser's color parsing.
* platform/ios-simulator/svg/custom/fill-SVGPaint-interface-expected.txt: Removed.
* platform/mac/svg/custom/fill-SVGPaint-interface-expected.png: Removed.
* platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt: Removed.
* svg/custom/fill-SVGPaint-interface.svg: Removed.
Remove another test of the SVG CSS OM, since the SVG CSS OM for SVGPaint etc.
is gone now.
* platform/mac/js/dom/global-constructors-attributes-expected.txt:
Rebaselined because of CSSNamespaceRule.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLFontElementfaceattributeexpectedtxt">trunk/LayoutTests/fast/dom/HTMLFontElement/face-attribute-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLFontElementfaceattributehtml">trunk/LayoutTests/fast/dom/HTMLFontElement/face-attribute.html</a></li>
<li><a href="#trunkLayoutTestsplatformmaccanvasphiliptests2dfillStyleparsergbeofexpectedtxt">trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaccanvasphiliptests2dfillStyleparsergbaeofexpectedtxt">trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSRuleCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSAllInOnecpp">trunk/Source/WebCore/css/CSSAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSCalculationValuecpp">trunk/Source/WebCore/css/CSSCalculationValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSCalculationValueh">trunk/Source/WebCore/css/CSSCalculationValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSCustomPropertyValuecpp">trunk/Source/WebCore/css/CSSCustomPropertyValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSCustomPropertyValueh">trunk/Source/WebCore/css/CSSCustomPropertyValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFunctionValuecpp">trunk/Source/WebCore/css/CSSFunctionValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFunctionValueh">trunk/Source/WebCore/css/CSSFunctionValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSGroupingRulecpp">trunk/Source/WebCore/css/CSSGroupingRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframeRuleh">trunk/Source/WebCore/css/CSSKeyframeRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframesRulecpp">trunk/Source/WebCore/css/CSSKeyframesRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSRuleh">trunk/Source/WebCore/css/CSSRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSRuleidl">trunk/Source/WebCore/css/CSSRule.idl</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheetcpp">trunk/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuecpp">trunk/Source/WebCore/css/CSSValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueh">trunk/Source/WebCore/css/CSSValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueListcpp">trunk/Source/WebCore/css/CSSValueList.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueListh">trunk/Source/WebCore/css/CSSValueList.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuePoolcpp">trunk/Source/WebCore/css/CSSValuePool.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSVariableDatacpp">trunk/Source/WebCore/css/CSSVariableData.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDOMCSSNamespacecpp">trunk/Source/WebCore/css/DOMCSSNamespace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontFacecpp">trunk/Source/WebCore/css/FontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssInspectorCSSOMWrapperscpp">trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryExpcpp">trunk/Source/WebCore/css/MediaQueryExp.cpp</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryExph">trunk/Source/WebCore/css/MediaQueryExp.h</a></li>
<li><a href="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorPseudoTypeMaph">trunk/Source/WebCore/css/SelectorPseudoTypeMap.h</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiesh">trunk/Source/WebCore/css/StyleProperties.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleRulecpp">trunk/Source/WebCore/css/StyleRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleSheetContentscpp">trunk/Source/WebCore/css/StyleSheetContents.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleSheetContentsh">trunk/Source/WebCore/css/StyleSheetContents.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSMatrixcpp">trunk/Source/WebCore/css/WebKitCSSMatrix.cpp</a></li>
<li><a href="#trunkSourceWebCorecssmakeSelectorPseudoClassAndCompatibilityElementMappy">trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserh">trunk/Source/WebCore/css/parser/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserFastPathscpp">trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserModeh">trunk/Source/WebCore/css/parser/CSSParserMode.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserValuescpp">trunk/Source/WebCore/css/parser/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserValuesh">trunk/Source/WebCore/css/parser/CSSParserValues.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParserh">trunk/Source/WebCore/css/parser/CSSPropertyParser.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSSelectorParsercpp">trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSSelectorParserh">trunk/Source/WebCore/css/parser/CSSSelectorParser.h</a></li>
<li><a href="#trunkSourceWebCoredomInlineStyleSheetOwnercpp">trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationControllercpp">trunk/Source/WebCore/page/animation/AnimationController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimateElementBasecpp">trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGAnimationElementcpp">trunk/Source/WebCore/svg/SVGAnimationElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCSSmm">trunk/Source/WebKit/mac/DOM/DOMCSS.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMCSSRuleh">trunk/Source/WebKit/mac/DOM/DOMCSSRule.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreCSSParsercpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/CSSParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssCSSNamespaceRulecpp">trunk/Source/WebCore/css/CSSNamespaceRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSNamespaceRuleh">trunk/Source/WebCore/css/CSSNamespaceRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSNamespaceRuleidl">trunk/Source/WebCore/css/CSSNamespaceRule.idl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformiossimulatorsvgcustomfillSVGPaintinterfaceexpectedtxt">trunk/LayoutTests/platform/ios-simulator/svg/custom/fill-SVGPaint-interface-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgcustomfillSVGPaintinterfaceexpectedpng">trunk/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgcustomfillSVGPaintinterfaceexpectedtxt">trunk/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomfillSVGPaintinterfacesvg">trunk/LayoutTests/svg/custom/fill-SVGPaint-interface.svg</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryincludes">trunk/Source/WebCore/css/CSSGrammar.y.includes</a></li>
<li><a href="#trunkSourceWebCorecssCSSVariableDependentValuecpp">trunk/Source/WebCore/css/CSSVariableDependentValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSVariableDependentValueh">trunk/Source/WebCore/css/CSSVariableDependentValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSVariableValuecpp">trunk/Source/WebCore/css/CSSVariableValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSVariableValueh">trunk/Source/WebCore/css/CSSVariableValue.h</a></li>
<li><a href="#trunkSourceWebCorecssparserSVGCSSParsercpp">trunk/Source/WebCore/css/parser/SVGCSSParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/ChangeLog 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-12-09 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Remove the old CSS Parser
+ https://bugs.webkit.org/show_bug.cgi?id=165645
+
+ Reviewed by Daniel Bates.
+
+ * TestExpectations:
+ Some canvas tests pass now that they use the new parser's color parsing.
+
+ * fast/dom/HTMLFontElement/face-attribute-expected.txt:
+ * fast/dom/HTMLFontElement/face-attribute.html:
+ Converted font face parsing over to just use the CSS parser's font-family
+ parsing. This matches other browsers, so removing cases that we used to
+ accept now that we're more strict.
+
+ * platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt:
+ * platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt:
+ These tests pass now that canvas uses the new parser's color parsing.
+
+ * platform/ios-simulator/svg/custom/fill-SVGPaint-interface-expected.txt: Removed.
+ * platform/mac/svg/custom/fill-SVGPaint-interface-expected.png: Removed.
+ * platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt: Removed.
+ * svg/custom/fill-SVGPaint-interface.svg: Removed.
+ Remove another test of the SVG CSS OM, since the SVG CSS OM for SVGPaint etc.
+ is gone now.
+
+ * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+ Rebaselined because of CSSNamespaceRule.
+
</ins><span class="cx"> 2016-12-10 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebCrypto] RSA algorithms should allow importing keys without usages
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/TestExpectations 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -363,7 +363,6 @@
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/security.pattern.cross.html [ Failure ]
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/2d.pattern.image.incomplete.html [ Failure ]
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/2d.drawImage.animated.poster.html [ Failure ]
</span><del>-webkit.org/b/138676 imported/w3c/canvas/2d.fillStyle.parse.rgb-eof.html [ Failure ]
</del><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/2d.imageData.put.null.html [ Failure ]
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/security.pattern.image.strokeStyle.html [ Failure ]
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/2d.imageData.get.nonfinite.html [ Failure ]
</span><span class="lines">@@ -380,7 +379,6 @@
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/2d.drawImage.broken.html [ Failure ]
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/2d.imageData.create1.zero.html [ Failure ]
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/2d.gradient.linear.nonfinite.html [ Failure ]
</span><del>-webkit.org/b/138676 imported/w3c/canvas/2d.fillStyle.parse.rgba-eof.html [ Failure ]
</del><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/security.drawImage.canvas.html [ Failure ]
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/security.pattern.image.fillStyle.html [ Failure ]
</span><span class="cx"> webkit.org/b/138676 imported/w3c/canvas/2d.imageData.put.nonfinite.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLFontElementfaceattributeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLFontElement/face-attribute-expected.txt (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLFontElement/face-attribute-expected.txt 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/fast/dom/HTMLFontElement/face-attribute-expected.txt 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -22,13 +22,6 @@
</span><span class="cx"> PASS fontFaceAttributeEffect(" Serif ") is "serif"
</span><span class="cx"> PASS fontFaceAttributeEffect(",Serif ") is null
</span><span class="cx"> PASS fontFaceAttributeEffect("Inherited") is "Inherited"
</span><del>-PASS fontFaceAttributeEffect("Initial") is "Initial"
-PASS fontFaceAttributeEffect("foo + foo") is "'foo + foo'"
-PASS fontFaceAttributeEffect(" foo + foo") is "'foo + foo'"
-PASS fontFaceAttributeEffect(" foo + foo ") is "'foo + foo'"
-PASS fontFaceAttributeEffect("foo + foo ") is "'foo + foo'"
-PASS fontFaceAttributeEffect("foo + foo,serif") is "'foo + foo', serif"
-PASS fontFaceAttributeEffect("serif,foo + foo,serif") is "serif, 'foo + foo', serif"
</del><span class="cx"> PASS fontFaceAttributeEffect(",foo + foo,serif") is null
</span><span class="cx"> PASS fontFaceAttributeEffect("serif,foo + foo,") is null
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLFontElementfaceattributehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLFontElement/face-attribute.html (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLFontElement/face-attribute.html 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/fast/dom/HTMLFontElement/face-attribute.html 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -45,15 +45,6 @@
</span><span class="cx"> shouldBe('fontFaceAttributeEffect(",Serif ")', 'null');
</span><span class="cx">
</span><span class="cx"> shouldBe('fontFaceAttributeEffect("Inherited")', '"Inherited"');
</span><del>-shouldBe('fontFaceAttributeEffect("Initial")', '"Initial"');
-
-shouldBe('fontFaceAttributeEffect("foo + foo")', '"\'foo + foo\'"');
-shouldBe('fontFaceAttributeEffect(" foo + foo")', '"\'foo + foo\'"');
-shouldBe('fontFaceAttributeEffect(" foo + foo ")', '"\'foo + foo\'"');
-shouldBe('fontFaceAttributeEffect("foo + foo ")', '"\'foo + foo\'"');
-
-shouldBe('fontFaceAttributeEffect("foo + foo,serif")', '"\'foo + foo\', serif"');
-shouldBe('fontFaceAttributeEffect("serif,foo + foo,serif")', '"serif, \'foo + foo\', serif"');
</del><span class="cx"> shouldBe('fontFaceAttributeEffect(",foo + foo,serif")', 'null');
</span><span class="cx"> shouldBe('fontFaceAttributeEffect("serif,foo + foo,")', 'null');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorsvgcustomfillSVGPaintinterfaceexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/ios-simulator/svg/custom/fill-SVGPaint-interface-expected.txt (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/svg/custom/fill-SVGPaint-interface-expected.txt 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/platform/ios-simulator/svg/custom/fill-SVGPaint-interface-expected.txt 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (0,0) size 800x600
- RenderSVGContainer {a} at (0,0) size 0x0
- RenderSVGForeignObject {foreignObject} at (0,0) size 800x600
- RenderBlock {html} at (0,0) size 800x20
- RenderBlock {div} at (0,0) size 800x20
- RenderText {#text} at (0,0) size 569x19
- text run at (0,0) width 569: "This test tests that the type of the fill css attribute is correctly reported as SVGPaint. See "
- RenderInline {a} at (0,0) size 72x19 [color=#0000EE]
- RenderText {#text} at (568,0) size 72x19
- text run at (568,0) width 72: "Bug 14064"
- RenderText {#text} at (639,0) size 5x19
- text run at (639,0) width 5: "."
- RenderSVGRect {rect} at (10,50) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=50.00] [width=100.00] [height=100.00]
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmaccanvasphiliptests2dfillStyleparsergbeofexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgb-eof-expected.txt 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Failed assertion: got pixel [255,0,0,255] at (50,25), expected [0,255,0,255]
</del><ins>+Passed
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmaccanvasphiliptests2dfillStyleparsergbaeofexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.rgba-eof-expected.txt 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Failed assertion: got pixel [255,0,0,255] at (50,25), expected [0,255,0,255]
</del><ins>+Passed
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -168,6 +168,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').value is CSSNamespaceRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSPageRule').value is CSSPageRule
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSPageRule').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSPageRule').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgcustomfillSVGPaintinterfaceexpectedpng"></a>
<div class="binary"><h4>Deleted: trunk/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgcustomfillSVGPaintinterfaceexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (0,0) size 800x600
- RenderSVGContainer {a} at (0,0) size 0x0
- RenderSVGForeignObject {foreignObject} at (0,0) size 800x600
- RenderBlock {html} at (0,0) size 800x18
- RenderBlock {div} at (0,0) size 800x18
- RenderText {#text} at (0,0) size 568x18
- text run at (0,0) width 568: "This test tests that the type of the fill css attribute is correctly reported as SVGPaint. See "
- RenderInline {a} at (0,0) size 72x18 [color=#0000EE]
- RenderText {#text} at (567,0) size 72x18
- text run at (567,0) width 72: "Bug 14064"
- RenderText {#text} at (638,0) size 5x18
- text run at (638,0) width 5: "."
- RenderSVGRect {rect} at (10,50) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=50.00] [width=100.00] [height=100.00]
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -168,6 +168,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').configurable is true
</span><ins>+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').value is CSSNamespaceRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSNamespaceRule').configurable is true
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSPageRule').value is CSSPageRule
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSPageRule').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSPageRule').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomfillSVGPaintinterfacesvg"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/svg/custom/fill-SVGPaint-interface.svg (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/fill-SVGPaint-interface.svg 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/LayoutTests/svg/custom/fill-SVGPaint-interface.svg 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" onload="runTest()">
-
-<script>
-<![CDATA[
- function log(string) {
- var newDiv = document.createElementNS("http://www.w3.org/1999/xhtml", "div");
- newDiv.textContent = string;
- document.getElementById('log').appendChild(newDiv);
- }
- function runTest()
- {
- var rect = document.rootElement.lastChild.previousSibling;
- if (rect.getPresentationAttribute('fill').toString() != "[object SVGPaint]") {
- log("SVGPaint css property is not reported as of type SVGPaint");
- return;
- }
- rect.setAttribute('fill', 'green');
- }
- ]]>
-</script>
-This test tests that the type of the fill css attribute is correctly reported as SVGPaint.
-See <a href="http://bugs.webkit.org/show_bug.cgi?id=14064">Bug 14064</a>.
-<foreignObject width="100%" height="100%">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <div id="log">
-This test tests that the type of the fill css attribute is correctly reported as SVGPaint.
-See <a href="http://bugs.webkit.org/show_bug.cgi?id=14064">Bug 14064</a>.
- </div>
- </html>
-</foreignObject>
-
- <rect x="10" y="50" width="100" height="100" fill="red" style="color:yellow" border-top="10"/>
-</svg>
</del></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -344,6 +344,7 @@
</span><span class="cx"> css/CSSKeyframeRule.idl
</span><span class="cx"> css/CSSKeyframesRule.idl
</span><span class="cx"> css/CSSMediaRule.idl
</span><ins>+ css/CSSNamespaceRule.idl
</ins><span class="cx"> css/CSSPageRule.idl
</span><span class="cx"> css/CSSPrimitiveValue.idl
</span><span class="cx"> css/CSSRule.idl
</span><span class="lines">@@ -1305,6 +1306,7 @@
</span><span class="cx"> css/CSSMarkup.cpp
</span><span class="cx"> css/CSSMediaRule.cpp
</span><span class="cx"> css/CSSNamedImageValue.cpp
</span><ins>+ css/CSSNamespaceRule.cpp
</ins><span class="cx"> css/CSSPageRule.cpp
</span><span class="cx"> css/CSSPendingSubstitutionValue.cpp
</span><span class="cx"> css/CSSPrimitiveValue.cpp
</span><span class="lines">@@ -1330,9 +1332,7 @@
</span><span class="cx"> css/CSSValueList.cpp
</span><span class="cx"> css/CSSValuePool.cpp
</span><span class="cx"> css/CSSVariableData.cpp
</span><del>- css/CSSVariableDependentValue.cpp
</del><span class="cx"> css/CSSVariableReferenceValue.cpp
</span><del>- css/CSSVariableValue.cpp
</del><span class="cx"> css/DOMCSSNamespace.cpp
</span><span class="cx"> css/DocumentRuleSets.cpp
</span><span class="cx"> css/ElementRuleCollector.cpp
</span><span class="lines">@@ -1392,7 +1392,6 @@
</span><span class="cx"> css/parser/MediaQueryParser.cpp
</span><span class="cx"> css/parser/SizesAttributeParser.cpp
</span><span class="cx"> css/parser/SizesCalcParser.cpp
</span><del>- css/parser/SVGCSSParser.cpp
</del><span class="cx">
</span><span class="cx"> cssjit/SelectorCompiler.cpp
</span><span class="cx">
</span><span class="lines">@@ -3602,7 +3601,6 @@
</span><span class="cx"> list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp)
</span><span class="cx"> list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StylePropertyShorthandFunctions.cpp)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
</span><del>-ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSPropertyNames.h)
</del><span class="cx">
</span><span class="cx"> # Generate CSS value keywords
</span><span class="cx"> add_custom_command(
</span><span class="lines">@@ -3616,7 +3614,6 @@
</span><span class="cx"> list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h)
</span><del>-ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSValueKeywords.h)
</del><span class="cx">
</span><span class="cx"> # Generate CSS Selector pseudo type name to value maps.
</span><span class="cx"> add_custom_command(
</span><span class="lines">@@ -3684,9 +3681,6 @@
</span><span class="cx"> list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp PlugInsResourcesData.cpp PlugInsResources.h)
</span><span class="cx">
</span><del>-GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
-list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp)
-
</del><span class="cx"> GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp "")
</span><span class="cx"> list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/ChangeLog 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,3 +1,656 @@
</span><ins>+2016-12-09 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Remove the old CSS Parser
+ https://bugs.webkit.org/show_bug.cgi?id=165645
+
+ Reviewed by Daniel Bates.
+
+ Remove the old CSS parser code. In doing so, code that used documentless
+ CSSParserContexts is now going through the new parser. This resulted in
+ some additional changes. These include:
+
+ (1) Canvas color parsing switched to new parser's code. This resulted in
+ progressions on canvas tests.
+
+ (2) Support for CSSNamespaceRule in the CSS OM, since the Inspector's
+ creation of CSS OM wrappers made it necessary to add this in. The old parser
+ did not create style rules for namespaces, but the new one (and other browsers)
+ did.
+
+ (3) <font face="X"> now uses the new parser's font-family parsing code. This
+ change was made in createFontFaceValue in CSSValuePool.
+
+ (4) FontFace now uses a new function on the new parser called
+ parseFontFaceDescriptor. This function sets things up so that parsing occurs
+ as though you are inside a @font-face. The old parser let you call parseValue
+ to parse "properties", but descriptors need to be handled differently in the
+ new parser.
+
+ (5) Illegal CSS rules in mediaControlsApple/ios.css forced me to add a quirk
+ to handle chained shadow DOM pseudo-elements. This should not be allowed, but
+ for now it is.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSCSSRuleCustom.cpp:
+ (WebCore::toJSNewlyCreated):
+ * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+ * css/CSSCalculationValue.cpp:
+ (WebCore::unitCategory):
+ (WebCore::hasDoubleValue):
+ (WebCore::checkDepthAndIndexDeprecated): Deleted.
+ (WebCore::CSSCalcExpressionNodeParserDeprecated::parseCalc): Deleted.
+ (WebCore::CSSCalcExpressionNodeParserDeprecated::operatorValue): Deleted.
+ (WebCore::CSSCalcExpressionNodeParserDeprecated::parseValue): Deleted.
+ (WebCore::CSSCalcExpressionNodeParserDeprecated::parseValueTerm): Deleted.
+ (WebCore::CSSCalcExpressionNodeParserDeprecated::parseValueMultiplicativeExpression): Deleted.
+ (WebCore::CSSCalcExpressionNodeParserDeprecated::parseAdditiveValueExpression): Deleted.
+ (WebCore::CSSCalcExpressionNodeParserDeprecated::parseValueExpression): Deleted.
+ * css/CSSCalculationValue.h:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::specifiedValueForGridTrackSize):
+ * css/CSSCustomPropertyValue.cpp:
+ (WebCore::CSSCustomPropertyValue::checkVariablesForCycles):
+ (WebCore::CSSCustomPropertyValue::resolveVariableReferences):
+ * css/CSSCustomPropertyValue.h:
+ * css/CSSFunctionValue.cpp:
+ (WebCore::CSSFunctionValue::CSSFunctionValue):
+ (WebCore::CSSFunctionValue::customCSSText):
+ (WebCore::CSSFunctionValue::append):
+ (WebCore::CSSFunctionValue::buildParserValueSubstitutingVariables): Deleted.
+ * css/CSSFunctionValue.h:
+ * css/CSSGrammar.y.in: Removed.
+ * css/CSSGrammar.y.includes: Removed.
+ * css/CSSGroupingRule.cpp:
+ (WebCore::CSSGroupingRule::insertRule):
+ * css/CSSKeyframeRule.h:
+ * css/CSSKeyframesRule.cpp:
+ (WebCore::CSSKeyframesRule::appendRule):
+ * css/CSSNamespaceRule.cpp: Added.
+ (WebCore::CSSNamespaceRule::CSSNamespaceRule):
+ (WebCore::CSSNamespaceRule::~CSSNamespaceRule):
+ (WebCore::CSSNamespaceRule::namespaceURI):
+ (WebCore::CSSNamespaceRule::prefix):
+ (WebCore::CSSNamespaceRule::cssText):
+ (WebCore::CSSNamespaceRule::reattach):
+ * css/CSSNamespaceRule.h: Added.
+ * css/CSSNamespaceRule.idl: Added.
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::isValidCSSUnitTypeForDoubleConversion):
+ (WebCore::isStringType):
+ (WebCore::CSSPrimitiveValue::cleanup):
+ (WebCore::CSSPrimitiveValue::formatNumberForCustomCSSText):
+ (WebCore::CSSPrimitiveValue::cloneForCSSOM):
+ (WebCore::CSSPrimitiveValue::equals):
+ (WebCore::CSSPrimitiveValue::buildParserValue): Deleted.
+ * css/CSSPrimitiveValue.h:
+ * css/CSSRule.h:
+ * css/CSSRule.idl:
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::insertRule):
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::equals):
+ (WebCore::CSSValue::cssText):
+ (WebCore::CSSValue::destroy):
+ * css/CSSValue.h:
+ (WebCore::CSSValue::isCustomPropertyValue):
+ (WebCore::CSSValue::hasVariableReferences):
+ (WebCore::CSSValue::isVariableDependentValue): Deleted.
+ (WebCore::CSSValue::isVariableValue): Deleted.
+ * css/CSSValueList.cpp:
+ (WebCore::CSSValueList::customCSSText):
+ (WebCore::CSSValueList::containsVariables): Deleted.
+ (WebCore::CSSValueList::checkVariablesForCycles): Deleted.
+ (WebCore::CSSValueList::buildParserValueSubstitutingVariables): Deleted.
+ (WebCore::CSSValueList::buildParserValueListSubstitutingVariables): Deleted.
+ * css/CSSValueList.h:
+ (WebCore::CSSValueList::createSlashSeparated):
+ (WebCore::CSSValueList::createFromParserValueList): Deleted.
+ * css/CSSValuePool.cpp:
+ (WebCore::CSSValuePool::createFontFaceValue):
+ * css/CSSVariableData.cpp:
+ * css/CSSVariableDependentValue.cpp: Removed.
+ * css/CSSVariableDependentValue.h: Removed.
+ * css/CSSVariableValue.cpp: Removed.
+ * css/CSSVariableValue.h: Removed.
+ * css/DOMCSSNamespace.cpp:
+ * css/FontFace.cpp:
+ (WebCore::FontFace::parseString):
+ * css/InspectorCSSOMWrappers.cpp:
+ * css/MediaQueryExp.cpp:
+ (WebCore::isFeatureValidWithIdentifier): Deleted.
+ (WebCore::isFeatureValidWithNonNegativeLengthOrNumber): Deleted.
+ (WebCore::isFeatureValidWithDensity): Deleted.
+ (WebCore::isFeatureValidWithNonNegativeInteger): Deleted.
+ (WebCore::isFeatureValidWithNonNegativeNumber): Deleted.
+ (WebCore::isFeatureValidWithZeroOrOne): Deleted.
+ (WebCore::isFeatureValidWithNumberWithUnit): Deleted.
+ (WebCore::isFeatureValidWithNumber): Deleted.
+ (WebCore::isSlash): Deleted.
+ (WebCore::isPositiveIntegerValue): Deleted.
+ * css/MediaQueryExp.h:
+ * css/PropertySetCSSStyleDeclaration.cpp:
+ (WebCore::PropertySetCSSStyleDeclaration::setCssText):
+ (WebCore::PropertySetCSSStyleDeclaration::setProperty):
+ * css/SelectorPseudoTypeMap.h:
+ * css/StyleProperties.cpp:
+ (WebCore::StyleProperties::getPropertyValue):
+ (WebCore::StyleProperties::getPropertyCSSValue):
+ (WebCore::MutableStyleProperties::setCustomProperty):
+ (WebCore::MutableStyleProperties::parseDeclaration):
+ (WebCore::StyleProperties::asText):
+ * css/StyleProperties.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ * css/StyleResolver.h:
+ * css/StyleRule.cpp:
+ (WebCore::StyleRuleBase::createCSSOMWrapper):
+ * css/StyleSheetContents.cpp:
+ (WebCore::StyleSheetContents::parseAuthorStyleSheet):
+ (WebCore::StyleSheetContents::parseString):
+ (WebCore::StyleSheetContents::completeURL):
+ (WebCore::StyleSheetContents::parseStringAtPosition): Deleted.
+ * css/StyleSheetContents.h:
+ * css/WebKitCSSMatrix.cpp:
+ * css/makeSelectorPseudoClassAndCompatibilityElementMap.py:
+ * css/parser/CSSParser.cpp:
+ (WebCore::CSSParserContext::CSSParserContext):
+ (WebCore::CSSParser::CSSParser):
+ (WebCore::CSSParser::parseSheet):
+ (WebCore::CSSParser::parseRule):
+ (WebCore::CSSParser::parseKeyframeRule):
+ (WebCore::CSSParser::parseSupportsCondition):
+ (WebCore::CSSParser::parseColor):
+ (WebCore::CSSParser::parseSystemColor):
+ (WebCore::CSSParser::parseSingleValue):
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseCustomPropertyValue):
+ (WebCore::CSSParser::parseSelector):
+ (WebCore::CSSParser::parseInlineStyleDeclaration):
+ (WebCore::CSSParser::parseDeclaration):
+ (WebCore::CSSParser::parseValueWithVariableReferences):
+ (WebCore::CSSParser::parseKeyframeKeyList):
+ (WebCore::CSSParser::parseFontFaceDescriptor):
+ (WebCore::equalLettersIgnoringASCIICase): Deleted.
+ (WebCore::hasPrefix): Deleted.
+ (WebCore::createPrimitiveValuePair): Deleted.
+ (WebCore::AnimationParseContext::commitFirstAnimation): Deleted.
+ (WebCore::AnimationParseContext::hasCommittedFirstAnimation): Deleted.
+ (WebCore::AnimationParseContext::commitAnimationPropertyKeyword): Deleted.
+ (WebCore::AnimationParseContext::animationPropertyKeywordAllowed): Deleted.
+ (WebCore::AnimationParseContext::hasSeenAnimationPropertyKeyword): Deleted.
+ (WebCore::AnimationParseContext::sawAnimationPropertyKeyword): Deleted.
+ (): Deleted.
+ (WebCore::convertToASCIILowercaseInPlace): Deleted.
+ (WebCore::CSSParserString::convertToASCIILowercaseInPlace): Deleted.
+ (WebCore::CSSParser::setupParser): Deleted.
+ (WebCore::isColorPropertyID): Deleted.
+ (WebCore::CSSParser::isValidSystemColorValue): Deleted.
+ (WebCore::validPrimitiveValueColor): Deleted.
+ (WebCore::parseColorValue): Deleted.
+ (WebCore::isSimpleLengthPropertyID): Deleted.
+ (WebCore::parseSimpleLength): Deleted.
+ (WebCore::parseSimpleLengthValue): Deleted.
+ (WebCore::isValidKeywordPropertyAndValue): Deleted.
+ (WebCore::isUniversalKeyword): Deleted.
+ (WebCore::isKeywordPropertyID): Deleted.
+ (WebCore::parseKeywordValue): Deleted.
+ (WebCore::parseTransformTranslateArguments): Deleted.
+ (WebCore::parseTranslateTransformValue): Deleted.
+ (WebCore::CSSParser::parseFontFaceValue): Deleted.
+ (WebCore::CSSParser::parseColorFromString): Deleted.
+ (WebCore::CSSParser::parseDeclarationDeprecated): Deleted.
+ (WebCore::filterProperties): Deleted.
+ (WebCore::CSSParser::createStyleProperties): Deleted.
+ (WebCore::CSSParser::addProperty): Deleted.
+ (WebCore::CSSParser::rollbackLastProperties): Deleted.
+ (WebCore::CSSParser::clearProperties): Deleted.
+ (WebCore::CSSParser::completeURL): Deleted.
+ (WebCore::CSSParser::validateCalculationUnit): Deleted.
+ (WebCore::CSSParser::shouldAcceptUnitLessValues): Deleted.
+ (WebCore::CSSParser::validateUnit): Deleted.
+ (WebCore::CSSParser::createPrimitiveNumericValue): Deleted.
+ (WebCore::CSSParser::createPrimitiveStringValue): Deleted.
+ (WebCore::isComma): Deleted.
+ (WebCore::isForwardSlashOperator): Deleted.
+ (WebCore::CSSParser::isValidSize): Deleted.
+ (WebCore::CSSParser::parseValidPrimitive): Deleted.
+ (WebCore::CSSParser::addExpandedPropertyForValue): Deleted.
+ (WebCore::isImageSetFunctionValue): Deleted.
+ (WebCore::CSSParser::addFillValue): Deleted.
+ (WebCore::isContentDistributionKeyword): Deleted.
+ (WebCore::isContentPositionKeyword): Deleted.
+ (WebCore::isBaselinePositionKeyword): Deleted.
+ (WebCore::isAlignmentOverflowKeyword): Deleted.
+ (WebCore::isItemPositionKeyword): Deleted.
+ (WebCore::CSSParser::parseLegacyPosition): Deleted.
+ (WebCore::CSSParser::parseContentDistributionOverflowPosition): Deleted.
+ (WebCore::CSSParser::parseItemPositionOverflowPosition): Deleted.
+ (WebCore::parseBackgroundClip): Deleted.
+ (WebCore::CSSParser::useLegacyBackgroundSizeShorthandBehavior): Deleted.
+ (WebCore::CSSParser::parseNonElementSnapPoints): Deleted.
+ (WebCore::CSSParser::parseScrollSnapPositions): Deleted.
+ (WebCore::CSSParser::parseScrollSnapDestination): Deleted.
+ (WebCore::CSSParser::parseScrollSnapCoordinate): Deleted.
+ (WebCore::CSSParser::parseFillShorthand): Deleted.
+ (WebCore::CSSParser::addAnimationValue): Deleted.
+ (WebCore::CSSParser::parseAnimationShorthand): Deleted.
+ (WebCore::CSSParser::parseColumnWidth): Deleted.
+ (WebCore::CSSParser::parseColumnCount): Deleted.
+ (WebCore::CSSParser::parseColumnsShorthand): Deleted.
+ (WebCore::CSSParser::parseTransitionShorthand): Deleted.
+ (WebCore::CSSParser::parseShorthand): Deleted.
+ (WebCore::CSSParser::parse4Values): Deleted.
+ (WebCore::CSSParser::parsePage): Deleted.
+ (WebCore::CSSParser::parseSize): Deleted.
+ (WebCore::CSSParser::parseSizeParameter): Deleted.
+ (WebCore::CSSParser::parseQuotes): Deleted.
+ (WebCore::CSSParser::parseAlt): Deleted.
+ (WebCore::CSSParser::parseCustomPropertyDeclaration): Deleted.
+ (WebCore::CSSParser::parseContent): Deleted.
+ (WebCore::CSSParser::parseAttr): Deleted.
+ (WebCore::CSSParser::parseBackgroundColor): Deleted.
+ (WebCore::CSSParser::parseFillImage): Deleted.
+ (WebCore::CSSParser::parsePositionX): Deleted.
+ (WebCore::CSSParser::parsePositionY): Deleted.
+ (WebCore::CSSParser::parseFillPositionComponent): Deleted.
+ (WebCore::isValueConflictingWithCurrentEdge): Deleted.
+ (WebCore::isFillPositionKeyword): Deleted.
+ (WebCore::CSSParser::parse4ValuesFillPosition): Deleted.
+ (WebCore::CSSParser::parse3ValuesFillPosition): Deleted.
+ (WebCore::CSSParser::isPotentialPositionValue): Deleted.
+ (WebCore::CSSParser::parseFillPosition): Deleted.
+ (WebCore::CSSParser::parse2ValuesFillPosition): Deleted.
+ (WebCore::CSSParser::parseFillRepeat): Deleted.
+ (WebCore::CSSParser::parseFillSize): Deleted.
+ (WebCore::CSSParser::parseFillProperty): Deleted.
+ (WebCore::CSSParser::parseAnimationDelay): Deleted.
+ (WebCore::CSSParser::parseAnimationDirection): Deleted.
+ (WebCore::CSSParser::parseAnimationDuration): Deleted.
+ (WebCore::CSSParser::parseAnimationFillMode): Deleted.
+ (WebCore::CSSParser::parseAnimationIterationCount): Deleted.
+ (WebCore::CSSParser::parseAnimationName): Deleted.
+ (WebCore::CSSParser::parseAnimationPlayState): Deleted.
+ (WebCore::CSSParser::parseAnimationTrigger): Deleted.
+ (WebCore::CSSParser::parseAnimationProperty): Deleted.
+ (WebCore::CSSParser::parseTransformOriginShorthand): Deleted.
+ (WebCore::CSSParser::isSpringTimingFunctionEnabled): Deleted.
+ (WebCore::CSSParser::parseCubicBezierTimingFunctionValue): Deleted.
+ (WebCore::CSSParser::parseSpringTimingFunctionValue): Deleted.
+ (WebCore::CSSParser::parseAnimationTimingFunction): Deleted.
+ (WebCore::isValidGridPositionCustomIdent): Deleted.
+ (WebCore::CSSParser::parseIntegerOrCustomIdentFromGridPosition): Deleted.
+ (WebCore::CSSParser::parseGridPosition): Deleted.
+ (WebCore::gridMissingGridPositionValue): Deleted.
+ (WebCore::CSSParser::parseGridItemPositionShorthand): Deleted.
+ (WebCore::CSSParser::parseGridGapShorthand): Deleted.
+ (WebCore::CSSParser::parseGridTemplateColumns): Deleted.
+ (WebCore::CSSParser::parseGridTemplateRowsAndAreasAndColumns): Deleted.
+ (WebCore::CSSParser::parseGridTemplateShorthand): Deleted.
+ (WebCore::parseImplicitAutoFlow): Deleted.
+ (WebCore::CSSParser::parseGridShorthand): Deleted.
+ (WebCore::CSSParser::parseGridAreaShorthand): Deleted.
+ (WebCore::CSSParser::parseSingleGridAreaLonghand): Deleted.
+ (WebCore::CSSParser::parseGridLineNames): Deleted.
+ (WebCore::isGridTrackFixedSized): Deleted.
+ (WebCore::CSSParser::parseGridTrackList): Deleted.
+ (WebCore::CSSParser::parseGridTrackRepeatFunction): Deleted.
+ (WebCore::CSSParser::parseGridTrackSize): Deleted.
+ (WebCore::CSSParser::parseGridBreadth): Deleted.
+ (WebCore::isValidGridAutoFlowId): Deleted.
+ (WebCore::CSSParser::parseGridAutoFlow): Deleted.
+ (WebCore::skipCommaInDashboardRegion): Deleted.
+ (WebCore::CSSParser::parseDashboardRegions): Deleted.
+ (WebCore::parseGridTemplateAreasColumnNames): Deleted.
+ (WebCore::CSSParser::parseGridTemplateAreasRow): Deleted.
+ (WebCore::CSSParser::parseGridTemplateAreas): Deleted.
+ (WebCore::CSSParser::parseCounterContent): Deleted.
+ (WebCore::CSSParser::parseClipShape): Deleted.
+ (WebCore::completeBorderRadii): Deleted.
+ (WebCore::CSSParser::parseInsetRoundedCorners): Deleted.
+ (WebCore::CSSParser::parseBasicShapeInset): Deleted.
+ (WebCore::CSSParser::parseShapeRadius): Deleted.
+ (WebCore::CSSParser::parseBasicShapeCircle): Deleted.
+ (WebCore::CSSParser::parseBasicShapeEllipse): Deleted.
+ (WebCore::CSSParser::parseBasicShapePolygon): Deleted.
+ (WebCore::CSSParser::parseBasicShapePath): Deleted.
+ (WebCore::isBoxValue): Deleted.
+ (WebCore::CSSParser::parseBasicShapeAndOrBox): Deleted.
+ (WebCore::CSSParser::parseShapeProperty): Deleted.
+ (WebCore::CSSParser::parseClipPath): Deleted.
+ (WebCore::CSSParser::parseBasicShape): Deleted.
+ (WebCore::CSSParser::parseFont): Deleted.
+ (WebCore::CSSParser::parseSystemFont): Deleted.
+ (WebCore::FontFamilyValueBuilder::FontFamilyValueBuilder): Deleted.
+ (WebCore::FontFamilyValueBuilder::add): Deleted.
+ (WebCore::FontFamilyValueBuilder::commit): Deleted.
+ (WebCore::valueIsCSSKeyword): Deleted.
+ (WebCore::CSSParser::parseFontFamily): Deleted.
+ (WebCore::CSSParser::parseLineHeight): Deleted.
+ (WebCore::CSSParser::parseFontSize): Deleted.
+ (WebCore::createFontWeightValueKeyword): Deleted.
+ (WebCore::CSSParser::parseFontWeight): Deleted.
+ (WebCore::CSSParser::parseFontSynthesis): Deleted.
+ (WebCore::CSSParser::parseFontFaceSrcURI): Deleted.
+ (WebCore::CSSParser::parseFontFaceSrcLocal): Deleted.
+ (WebCore::CSSParser::parseFontFaceSrc): Deleted.
+ (WebCore::CSSParser::parseFontFaceUnicodeRange): Deleted.
+ (WebCore::checkForValidDouble): Deleted.
+ (WebCore::parseDouble): Deleted.
+ (WebCore::parseColorIntOrPercentage): Deleted.
+ (WebCore::isTenthAlpha): Deleted.
+ (WebCore::parseAlphaValue): Deleted.
+ (WebCore::mightBeRGBA): Deleted.
+ (WebCore::mightBeRGB): Deleted.
+ (WebCore::fastParseColorInternal): Deleted.
+ (WebCore::CSSParser::fastParseColor): Deleted.
+ (WebCore::CSSParser::parsedDouble): Deleted.
+ (WebCore::CSSParser::isCalculation): Deleted.
+ (WebCore::isPercent): Deleted.
+ (WebCore::CSSParser::parseColorInt): Deleted.
+ (WebCore::CSSParser::parseColorDouble): Deleted.
+ (WebCore::CSSParser::parseRGBParameters): Deleted.
+ (WebCore::CSSParser::parseColorFunctionParameters): Deleted.
+ (WebCore::CSSParser::parseHSLParameters): Deleted.
+ (WebCore::CSSParser::parseColorFromValue): Deleted.
+ (WebCore::ShadowParseContext::ShadowParseContext): Deleted.
+ (WebCore::ShadowParseContext::allowLength): Deleted.
+ (WebCore::ShadowParseContext::commitValue): Deleted.
+ (WebCore::ShadowParseContext::commitLength): Deleted.
+ (WebCore::ShadowParseContext::commitColor): Deleted.
+ (WebCore::ShadowParseContext::commitStyle): Deleted.
+ (WebCore::CSSParser::parseShadow): Deleted.
+ (WebCore::CSSParser::parseReflect): Deleted.
+ (WebCore::CSSParser::parseFlex): Deleted.
+ (WebCore::BorderImageParseContext::BorderImageParseContext): Deleted.
+ (WebCore::BorderImageParseContext::canAdvance): Deleted.
+ (WebCore::BorderImageParseContext::setCanAdvance): Deleted.
+ (WebCore::BorderImageParseContext::allowCommit): Deleted.
+ (WebCore::BorderImageParseContext::allowImage): Deleted.
+ (WebCore::BorderImageParseContext::allowImageSlice): Deleted.
+ (WebCore::BorderImageParseContext::allowRepeat): Deleted.
+ (WebCore::BorderImageParseContext::allowForwardSlashOperator): Deleted.
+ (WebCore::BorderImageParseContext::requireWidth): Deleted.
+ (WebCore::BorderImageParseContext::requireOutset): Deleted.
+ (WebCore::BorderImageParseContext::commitImage): Deleted.
+ (WebCore::BorderImageParseContext::commitImageSlice): Deleted.
+ (WebCore::BorderImageParseContext::commitForwardSlashOperator): Deleted.
+ (WebCore::BorderImageParseContext::commitBorderWidth): Deleted.
+ (WebCore::BorderImageParseContext::commitBorderOutset): Deleted.
+ (WebCore::BorderImageParseContext::commitRepeat): Deleted.
+ (WebCore::BorderImageParseContext::commitWebKitBorderImage): Deleted.
+ (WebCore::BorderImageParseContext::commitBorderImage): Deleted.
+ (WebCore::BorderImageParseContext::commitBorderImageProperty): Deleted.
+ (WebCore::CSSParser::parseBorderImage): Deleted.
+ (WebCore::isBorderImageRepeatKeyword): Deleted.
+ (WebCore::CSSParser::parseBorderImageRepeat): Deleted.
+ (WebCore::BorderImageSliceParseContext::BorderImageSliceParseContext): Deleted.
+ (WebCore::BorderImageSliceParseContext::allowNumber): Deleted.
+ (WebCore::BorderImageSliceParseContext::allowFill): Deleted.
+ (WebCore::BorderImageSliceParseContext::allowFinalCommit): Deleted.
+ (WebCore::BorderImageSliceParseContext::top): Deleted.
+ (WebCore::BorderImageSliceParseContext::commitNumber): Deleted.
+ (WebCore::BorderImageSliceParseContext::commitFill): Deleted.
+ (WebCore::BorderImageSliceParseContext::commitBorderImageSlice): Deleted.
+ (WebCore::CSSParser::parseBorderImageSlice): Deleted.
+ (WebCore::BorderImageQuadParseContext::BorderImageQuadParseContext): Deleted.
+ (WebCore::BorderImageQuadParseContext::allowNumber): Deleted.
+ (WebCore::BorderImageQuadParseContext::allowFinalCommit): Deleted.
+ (WebCore::BorderImageQuadParseContext::top): Deleted.
+ (WebCore::BorderImageQuadParseContext::commitNumber): Deleted.
+ (WebCore::BorderImageQuadParseContext::setAllowFinalCommit): Deleted.
+ (WebCore::BorderImageQuadParseContext::setTop): Deleted.
+ (WebCore::BorderImageQuadParseContext::commitBorderImageQuad): Deleted.
+ (WebCore::CSSParser::parseBorderImageQuad): Deleted.
+ (WebCore::CSSParser::parseBorderImageWidth): Deleted.
+ (WebCore::CSSParser::parseBorderImageOutset): Deleted.
+ (WebCore::CSSParser::parseBorderRadius): Deleted.
+ (WebCore::CSSParser::parseAspectRatio): Deleted.
+ (WebCore::CSSParser::parseCounter): Deleted.
+ (WebCore::parseDeprecatedGradientPoint): Deleted.
+ (WebCore::parseDeprecatedGradientColorStop): Deleted.
+ (WebCore::CSSParser::parseDeprecatedGradient): Deleted.
+ (WebCore::valueFromSideKeyword): Deleted.
+ (WebCore::parseGradientColorOrKeyword): Deleted.
+ (WebCore::CSSParser::parseDeprecatedLinearGradient): Deleted.
+ (WebCore::CSSParser::parseDeprecatedRadialGradient): Deleted.
+ (WebCore::CSSParser::parseLinearGradient): Deleted.
+ (WebCore::CSSParser::parseRadialGradient): Deleted.
+ (WebCore::CSSParser::parseGradientColorStops): Deleted.
+ (WebCore::CSSParser::isGeneratedImageValue): Deleted.
+ (WebCore::CSSParser::parseGeneratedImage): Deleted.
+ (WebCore::CSSParser::parseFilterImage): Deleted.
+ (WebCore::CSSParser::parseCrossfade): Deleted.
+ (WebCore::CSSParser::parseCanvas): Deleted.
+ (WebCore::CSSParser::parseNamedImage): Deleted.
+ (WebCore::CSSParser::parseImageResolution): Deleted.
+ (WebCore::CSSParser::parseImageSet): Deleted.
+ (WebCore::TransformOperationInfo::TransformOperationInfo): Deleted.
+ (WebCore::TransformOperationInfo::type): Deleted.
+ (WebCore::TransformOperationInfo::argCount): Deleted.
+ (WebCore::TransformOperationInfo::unit): Deleted.
+ (WebCore::TransformOperationInfo::unknown): Deleted.
+ (WebCore::TransformOperationInfo::hasCorrectArgCount): Deleted.
+ (WebCore::CSSParser::parseTransform): Deleted.
+ (WebCore::CSSParser::parseTransformValue): Deleted.
+ (WebCore::CSSParser::isBlendMode): Deleted.
+ (WebCore::CSSParser::isCompositeOperator): Deleted.
+ (WebCore::isValidPrimitiveFilterFunction): Deleted.
+ (WebCore::CSSParser::parseBuiltinFilterArguments): Deleted.
+ (WebCore::cssValueKeywordIDForFunctionName): Deleted.
+ (WebCore::CSSParser::parseFilter): Deleted.
+ (WebCore::validFlowName): Deleted.
+ (WebCore::CSSParser::isTextAutosizingEnabled): Deleted.
+ (WebCore::CSSParser::isCSSGridLayoutEnabled): Deleted.
+ (WebCore::CSSParser::parseFlowThread): Deleted.
+ (WebCore::CSSParser::parseRegionThread): Deleted.
+ (WebCore::CSSParser::parseTransformOrigin): Deleted.
+ (WebCore::CSSParser::parsePerspectiveOrigin): Deleted.
+ (WebCore::CSSParser::addTextDecorationProperty): Deleted.
+ (WebCore::CSSParser::parseTextDecoration): Deleted.
+ (WebCore::CSSParser::parseTextDecorationSkip): Deleted.
+ (WebCore::CSSParser::parseTextUnderlinePosition): Deleted.
+ (WebCore::CSSParser::parseTextEmphasisStyle): Deleted.
+ (WebCore::CSSParser::parseTextEmphasisPosition): Deleted.
+ (WebCore::CSSParser::parseTextIndent): Deleted.
+ (WebCore::CSSParser::parseHangingPunctuation): Deleted.
+ (WebCore::CSSParser::parseLineBoxContain): Deleted.
+ (WebCore::CSSParser::parseFontFeatureTag): Deleted.
+ (WebCore::CSSParser::parseFontFeatureSettings): Deleted.
+ (WebCore::CSSParser::parseFontVariationTag): Deleted.
+ (WebCore::CSSParser::parseFontVariationSettings): Deleted.
+ (WebCore::CSSParser::parseFontVariantLigatures): Deleted.
+ (WebCore::CSSParser::parseFontVariantNumeric): Deleted.
+ (WebCore::CSSParser::parseFontVariantEastAsian): Deleted.
+ (WebCore::CSSParser::parseFontVariant): Deleted.
+ (WebCore::isValidWillChangeAnimatableFeature): Deleted.
+ (WebCore::CSSParser::parseWillChange): Deleted.
+ (WebCore::CSSParser::parseCalculation): Deleted.
+ (WebCore::isCSSLetter): Deleted.
+ (WebCore::isCSSEscape): Deleted.
+ (WebCore::isURILetter): Deleted.
+ (WebCore::isIdentifierStartAfterDash): Deleted.
+ (WebCore::isCustomPropertyIdentifier): Deleted.
+ (WebCore::isEqualToCSSIdentifier): Deleted.
+ (WebCore::isEqualToCSSCaseSensitiveIdentifier): Deleted.
+ (WebCore::checkAndSkipEscape): Deleted.
+ (WebCore::skipWhiteSpace): Deleted.
+ (WebCore::CSSParserString::characters<LChar>): Deleted.
+ (WebCore::CSSParserString::characters<UChar>): Deleted.
+ (WebCore::CSSParser::currentCharacter<LChar>): Deleted.
+ (WebCore::CSSParser::currentCharacter<UChar>): Deleted.
+ (WebCore::CSSParser::currentCharacter16): Deleted.
+ (WebCore::CSSParser::tokenStart<LChar>): Deleted.
+ (WebCore::CSSParser::tokenStart<UChar>): Deleted.
+ (WebCore::CSSParser::currentLocation): Deleted.
+ (WebCore::CSSParser::isIdentifierStart): Deleted.
+ (WebCore::checkAndSkipString): Deleted.
+ (WebCore::CSSParser::parseEscape): Deleted.
+ (WebCore::CSSParser::UnicodeToChars<LChar>): Deleted.
+ (WebCore::CSSParser::UnicodeToChars<UChar>): Deleted.
+ (WebCore::CSSParser::parseIdentifierInternal): Deleted.
+ (WebCore::CSSParser::parseIdentifier): Deleted.
+ (WebCore::CSSParser::parseStringInternal): Deleted.
+ (WebCore::CSSParser::parseString): Deleted.
+ (WebCore::CSSParser::findURI): Deleted.
+ (WebCore::CSSParser::parseURIInternal): Deleted.
+ (WebCore::CSSParser::parseURI): Deleted.
+ (WebCore::CSSParser::parseUnicodeRange): Deleted.
+ (WebCore::CSSParser::parseNthChild): Deleted.
+ (WebCore::CSSParser::parseNthChildExtra): Deleted.
+ (WebCore::CSSParser::detectFunctionTypeToken): Deleted.
+ (WebCore::CSSParser::detectMediaQueryToken): Deleted.
+ (WebCore::CSSParser::detectNumberToken): Deleted.
+ (WebCore::CSSParser::detectDashToken): Deleted.
+ (WebCore::CSSParser::detectAtToken): Deleted.
+ (WebCore::CSSParser::detectSupportsToken): Deleted.
+ (WebCore::CSSParser::realLex): Deleted.
+ (WebCore::CSSParser::createImportRule): Deleted.
+ (WebCore::CSSParser::createMediaRule): Deleted.
+ (WebCore::CSSParser::createEmptyMediaRule): Deleted.
+ (WebCore::CSSParser::createSupportsRule): Deleted.
+ (WebCore::CSSParser::markSupportsRuleHeaderStart): Deleted.
+ (WebCore::CSSParser::markSupportsRuleHeaderEnd): Deleted.
+ (WebCore::CSSParser::popSupportsRuleData): Deleted.
+ (WebCore::CSSParser::processAndAddNewRuleToSourceTreeIfNeeded): Deleted.
+ (WebCore::CSSParser::addNewRuleToSourceTree): Deleted.
+ (WebCore::CSSParser::popRuleData): Deleted.
+ (WebCore::CSSParser::syntaxError): Deleted.
+ (WebCore::CSSParser::isLoggingErrors): Deleted.
+ (WebCore::CSSParser::logError): Deleted.
+ (WebCore::CSSParser::createKeyframesRule): Deleted.
+ (WebCore::CSSParser::createStyleRule): Deleted.
+ (WebCore::CSSParser::createFontFaceRule): Deleted.
+ (WebCore::CSSParser::addNamespace): Deleted.
+ (WebCore::CSSParser::determineNameInNamespace): Deleted.
+ (WebCore::CSSParser::rewriteSpecifiersWithNamespaceIfNeeded): Deleted.
+ (WebCore::CSSParser::rewriteSpecifiersWithElementName): Deleted.
+ (WebCore::CSSParser::rewriteSpecifiers): Deleted.
+ (WebCore::CSSParser::createPageRule): Deleted.
+ (WebCore::CSSParser::createSelectorVector): Deleted.
+ (WebCore::CSSParser::recycleSelectorVector): Deleted.
+ (WebCore::CSSParser::createRegionRule): Deleted.
+ (WebCore::CSSParser::createMarginAtRule): Deleted.
+ (WebCore::CSSParser::startDeclarationsForMarginBox): Deleted.
+ (WebCore::CSSParser::endDeclarationsForMarginBox): Deleted.
+ (WebCore::CSSParser::createKeyframe): Deleted.
+ (WebCore::CSSParser::invalidBlockHit): Deleted.
+ (WebCore::CSSParser::updateLastMediaLine): Deleted.
+ (WebCore::fixUnparsedProperties): Deleted.
+ (WebCore::CSSParser::fixUnparsedPropertyRanges): Deleted.
+ (WebCore::CSSParser::markRuleHeaderStart): Deleted.
+ (WebCore::CSSParser::setRuleHeaderEnd): Deleted.
+ (WebCore::CSSParser::markRuleHeaderEnd): Deleted.
+ (WebCore::CSSParser::markSelectorStart): Deleted.
+ (WebCore::CSSParser::markSelectorEnd): Deleted.
+ (WebCore::CSSParser::markRuleBodyStart): Deleted.
+ (WebCore::CSSParser::markRuleBodyEnd): Deleted.
+ (WebCore::CSSParser::markPropertyStart): Deleted.
+ (WebCore::CSSParser::markPropertyEnd): Deleted.
+ (WebCore::CSSParser::createViewportRule): Deleted.
+ (WebCore::CSSParser::parseViewportProperty): Deleted.
+ (WebCore::CSSParser::parseViewportShorthand): Deleted.
+ (WebCore::isAppleLegacyCSSPropertyKeyword): Deleted.
+ (WebCore::cssPropertyID): Deleted.
+ (WebCore::cssPropertyNameIOSAliasing): Deleted.
+ (WebCore::isAppleLegacyCSSValueKeyword): Deleted.
+ (WebCore::cssValueKeywordID): Deleted.
+ (WebCore::isValidNthToken): Deleted.
+ * css/parser/CSSParser.h:
+ (): Deleted.
+ (WebCore::CSSParser::ValueWithCalculation::ValueWithCalculation): Deleted.
+ (WebCore::CSSParser::ValueWithCalculation::value): Deleted.
+ (WebCore::CSSParser::ValueWithCalculation::operator CSSParserValue&): Deleted.
+ (WebCore::CSSParser::ValueWithCalculation::calculation): Deleted.
+ (WebCore::CSSParser::ValueWithCalculation::setCalculation): Deleted.
+ (WebCore::CSSParser::hasProperties): Deleted.
+ (WebCore::CSSParser::startNestedSelectorList): Deleted.
+ (WebCore::CSSParser::endNestedSelectorList): Deleted.
+ (WebCore::CSSParser::resetPropertyRange): Deleted.
+ (WebCore::CSSParser::isExtractingSourceData): Deleted.
+ (WebCore::CSSParser::lex): Deleted.
+ (WebCore::CSSParser::token): Deleted.
+ (WebCore::CSSParser::markViewportRuleBodyStart): Deleted.
+ (WebCore::CSSParser::markViewportRuleBodyEnd): Deleted.
+ (WebCore::CSSParser::setCustomPropertyName): Deleted.
+ (WebCore::CSSParser::is8BitSource): Deleted.
+ (WebCore::CSSParser::setStyleSheet): Deleted.
+ (WebCore::CSSParser::inStrictMode): Deleted.
+ (WebCore::CSSParser::inQuirksMode): Deleted.
+ (WebCore::CSSParser::setupParser): Deleted.
+ (WebCore::CSSParser::inShorthand): Deleted.
+ (WebCore::CSSParser::inViewport): Deleted.
+ (WebCore::CSSParser::operator|): Deleted.
+ (WebCore::CSSParser::validateUnit): Deleted.
+ (WebCore::ShorthandScope::ShorthandScope): Deleted.
+ (WebCore::ShorthandScope::~ShorthandScope): Deleted.
+ (WebCore::CSSParser::setTokenStart<LChar>): Deleted.
+ (WebCore::CSSParser::setTokenStart<UChar>): Deleted.
+ (WebCore::CSSParser::tokenStartOffset): Deleted.
+ (WebCore::CSSParser::currentCharacterOffset): Deleted.
+ (WebCore::CSSParser::tokenStartChar): Deleted.
+ (WebCore::isCustomPropertyName): Deleted.
+ (WebCore::cssyylex): Deleted.
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ * css/parser/CSSParserMode.h:
+ (WebCore::CSSParserContextHash::hash):
+ * css/parser/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::setSelectorList):
+ (WebCore::destroy): Deleted.
+ (WebCore::CSSParserValueList::~CSSParserValueList): Deleted.
+ (WebCore::CSSParserValueList::addValue): Deleted.
+ (WebCore::CSSParserValueList::insertValueAt): Deleted.
+ (WebCore::CSSParserValueList::extend): Deleted.
+ (WebCore::CSSParserValueList::containsVariables): Deleted.
+ (WebCore::CSSParserValue::createCSSValue): Deleted.
+ (WebCore::CSSParserSelector::parsePseudoElementSelector): Deleted.
+ (WebCore::CSSParserSelector::parsePseudoElementCueFunctionSelector): Deleted.
+ (WebCore::CSSParserSelector::parsePseudoElementSlottedFunctionSelector): Deleted.
+ (WebCore::CSSParserSelector::parsePseudoClassHostFunctionSelector): Deleted.
+ (WebCore::CSSParserSelector::parsePseudoClassAndCompatibilityElementSelector): Deleted.
+ (WebCore::CSSParserSelector::setPseudoClassValue): Deleted.
+ * css/parser/CSSParserValues.h:
+ (WebCore::CSSParserString::init): Deleted.
+ (WebCore::CSSParserString::clear): Deleted.
+ (WebCore::CSSParserString::is8Bit): Deleted.
+ (WebCore::CSSParserString::characters8): Deleted.
+ (WebCore::CSSParserString::characters16): Deleted.
+ (WebCore::CSSParserString::length): Deleted.
+ (WebCore::CSSParserString::setLength): Deleted.
+ (WebCore::CSSParserString::operator[]): Deleted.
+ (WebCore::CSSParserString::operator String): Deleted.
+ (WebCore::CSSParserString::operator AtomicString): Deleted.
+ (WebCore::CSSParserString::toStringView): Deleted.
+ (): Deleted.
+ (WebCore::CSSParserValueList::CSSParserValueList): Deleted.
+ (WebCore::CSSParserValueList::size): Deleted.
+ (WebCore::CSSParserValueList::currentIndex): Deleted.
+ (WebCore::CSSParserValueList::current): Deleted.
+ (WebCore::CSSParserValueList::next): Deleted.
+ (WebCore::CSSParserValueList::previous): Deleted.
+ (WebCore::CSSParserValueList::setCurrentIndex): Deleted.
+ (WebCore::CSSParserValueList::valueAt): Deleted.
+ (WebCore::CSSParserValueList::clear): Deleted.
+ (WebCore::CSSParserValue::setFromValueList): Deleted.
+ (WebCore::equalLettersIgnoringASCIICase): Deleted.
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::isCustomPropertyName):
+ (WebCore::cssPropertyNameIOSAliasing):
+ * css/parser/CSSPropertyParser.h:
+ * css/parser/SVGCSSParser.cpp: Removed.
+ * dom/InlineStyleSheetOwner.cpp:
+ (WebCore::InlineStyleSheetOwner::createSheet):
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::ensureSourceData):
+ (WebCore::InspectorStyleSheetForInlineStyle::ruleSourceData):
+ * page/animation/AnimationController.cpp:
+ * rendering/style/RenderStyle.cpp:
+ * svg/SVGAnimateElementBase.cpp:
+ * svg/SVGAnimationElement.cpp:
+ * svg/SVGElement.cpp:
+
</ins><span class="cx"> 2016-12-10 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/DerivedSources.make 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -269,6 +269,7 @@
</span><span class="cx"> $(WebCore)/css/CSSKeyframeRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSKeyframesRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSMediaRule.idl \
</span><ins>+ $(WebCore)/css/CSSNamespaceRule.idl \
</ins><span class="cx"> $(WebCore)/css/CSSPageRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSPrimitiveValue.idl \
</span><span class="cx"> $(WebCore)/css/CSSRule.idl \
</span><span class="lines">@@ -865,7 +866,6 @@
</span><span class="cx"> $(JS_DOM_HEADERS) \
</span><span class="cx"> $(WEB_DOM_HEADERS) \
</span><span class="cx"> \
</span><del>- CSSGrammar.cpp \
</del><span class="cx"> CSSPropertyNames.cpp \
</span><span class="cx"> CSSPropertyNames.h \
</span><span class="cx"> CSSValueKeywords.cpp \
</span><span class="lines">@@ -1033,12 +1033,6 @@
</span><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span><del>-# CSS grammar
-CSSGrammar.cpp : css/CSSGrammar.y.in $(PLATFORM_FEATURE_DEFINES)
- $(PERL) $(WebCore)/css/makegrammar.pl --extraDefines "$(FEATURE_DEFINES)" --outputDir . --bison "$(BISON)" --symbolsPrefix cssyy $<
-
-# --------
-
</del><span class="cx"> # XPath grammar
</span><span class="cx"> XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE)
</span><span class="cx"> $(PERL) $(WebCore)/css/makegrammar.pl --outputDir . --bison "$(BISON)" --symbolsPrefix xpathyy $<
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -2547,8 +2547,6 @@
</span><span class="cx"> 63189AE30E83A33300012E41 /* NodeRareData.h in Headers */ = {isa = PBXBuildFile; fileRef = 63189AE20E83A33300012E41 /* NodeRareData.h */; settings = {ATTRIBUTES = (); }; };
</span><span class="cx"> 63D7B32D0E78CD3F00F7617C /* NodeRenderStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 63D7B32C0E78CD3F00F7617C /* NodeRenderStyle.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 63F5D4F70E8C4B7100C0BD04 /* ElementRareData.h in Headers */ = {isa = PBXBuildFile; fileRef = 637B7ADE0E8767B800E32194 /* ElementRareData.h */; };
</span><del>- 650F53DC09D15DDA00C9B0C8 /* CSSGrammar.h in Headers */ = {isa = PBXBuildFile; fileRef = 650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */; };
- 650F53DD09D15DDF00C9B0C8 /* CSSGrammar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6565814409D13043000E61D7 /* CSSGrammar.cpp */; settings = {COMPILER_FLAGS = "-Wno-unreachable-code"; }; };
</del><span class="cx"> 650FBF2A0D9AF047008FC292 /* SVGHKernElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 650FBF270D9AF046008FC292 /* SVGHKernElement.cpp */; };
</span><span class="cx"> 650FBF2B0D9AF047008FC292 /* SVGHKernElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 650FBF280D9AF047008FC292 /* SVGHKernElement.h */; };
</span><span class="cx"> 6515EC910D9723FF0063D49A /* JSSVGAltGlyphElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6515EC8F0D9723FF0063D49A /* JSSVGAltGlyphElement.cpp */; };
</span><span class="lines">@@ -3520,7 +3518,6 @@
</span><span class="cx"> 946D372F1D6CB2940077084F /* CSSParserMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 946D372A1D6CB28B0077084F /* CSSParserMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 946D37301D6CB2940077084F /* CSSParserValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 946D372B1D6CB28B0077084F /* CSSParserValues.cpp */; };
</span><span class="cx"> 946D37311D6CB2940077084F /* CSSParserValues.h in Headers */ = {isa = PBXBuildFile; fileRef = 946D372C1D6CB28B0077084F /* CSSParserValues.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 946D37331D6CC42B0077084F /* SVGCSSParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 946D37321D6CC3720077084F /* SVGCSSParser.cpp */; };
</del><span class="cx"> 946D37391D6CDFC00077084F /* CSSTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 946D37341D6CDF980077084F /* CSSTokenizer.cpp */; };
</span><span class="cx"> 946D373A1D6CDFC00077084F /* CSSTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 946D37371D6CDF980077084F /* CSSTokenizer.h */; };
</span><span class="cx"> 946D373B1D6CDFC00077084F /* CSSTokenizerInputStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 946D37351D6CDF980077084F /* CSSTokenizerInputStream.cpp */; };
</span><span class="lines">@@ -3555,6 +3552,10 @@
</span><span class="cx"> 94DE5C921D83011D00164F2A /* CSSSupportsParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 94DE5C901D8300CB00164F2A /* CSSSupportsParser.h */; };
</span><span class="cx"> 94DE5C951D8301BD00164F2A /* CSSParserImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94DE5C931D8301B000164F2A /* CSSParserImpl.cpp */; };
</span><span class="cx"> 94DE5C961D8301BD00164F2A /* CSSParserImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 94DE5C941D8301B000164F2A /* CSSParserImpl.h */; };
</span><ins>+ 94E839511DFB2A0E007BC6A7 /* CSSNamespaceRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 94E8394F1DFB2700007BC6A7 /* CSSNamespaceRule.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 94E839521DFB2A12007BC6A7 /* CSSNamespaceRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94E8394E1DFB2700007BC6A7 /* CSSNamespaceRule.cpp */; };
+ 94E839551DFB2BC4007BC6A7 /* JSCSSNamespaceRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94E839531DFB2BA6007BC6A7 /* JSCSSNamespaceRule.cpp */; };
+ 94E839561DFB2BC4007BC6A7 /* JSCSSNamespaceRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 94E839541DFB2BA6007BC6A7 /* JSCSSNamespaceRule.h */; };
</ins><span class="cx"> 96ABA42314BCB80E00D56204 /* GraphicsContext3DOpenGLCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 96ABA42214BCB80E00D56204 /* GraphicsContext3DOpenGLCommon.cpp */; };
</span><span class="cx"> 9703E1BF15DC4E37001F24C8 /* JSVoidCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97E9EC8B15DC492F004F2E71 /* JSVoidCallback.cpp */; };
</span><span class="cx"> 97059977107D975200A50A7C /* PolicyCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97059973107D975200A50A7C /* PolicyCallback.cpp */; };
</span><span class="lines">@@ -5177,10 +5178,6 @@
</span><span class="cx"> BC128B01137C8D4600CAC845 /* RenderGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC128B00137C8D4600CAC845 /* RenderGrid.cpp */; };
</span><span class="cx"> BC14028A0E83680800319717 /* ScrollbarThemeComposite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1402880E83680800319717 /* ScrollbarThemeComposite.cpp */; };
</span><span class="cx"> BC14028B0E83680800319717 /* ScrollbarThemeComposite.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1402890E83680800319717 /* ScrollbarThemeComposite.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BC1790BB1BB5AB3F0006D13E /* CSSVariableDependentValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1790BA1BB5AB3F0006D13E /* CSSVariableDependentValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC1790BD1BBB36A80006D13E /* CSSVariableDependentValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1790BC1BBB36A80006D13E /* CSSVariableDependentValue.cpp */; };
- BC1790C01BBF2C430006D13E /* CSSVariableValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1790BE1BBF2C430006D13E /* CSSVariableValue.cpp */; };
- BC1790C11BBF2C430006D13E /* CSSVariableValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1790BF1BBF2C430006D13E /* CSSVariableValue.h */; };
</del><span class="cx"> BC17F9660B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC17F9650B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp */; };
</span><span class="cx"> BC1A7D9718FCB5B000421879 /* RenderMultiColumnSpannerPlaceholder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1A7D9518FCB5B000421879 /* RenderMultiColumnSpannerPlaceholder.cpp */; };
</span><span class="cx"> BC1A7D9818FCB5B000421879 /* RenderMultiColumnSpannerPlaceholder.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A7D9618FCB5B000421879 /* RenderMultiColumnSpannerPlaceholder.h */; };
</span><span class="lines">@@ -9830,7 +9827,6 @@
</span><span class="cx"> 637B7ADE0E8767B800E32194 /* ElementRareData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementRareData.h; sourceTree = "<group>"; };
</span><span class="cx"> 63D7B32C0E78CD3F00F7617C /* NodeRenderStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeRenderStyle.h; sourceTree = "<group>"; };
</span><span class="cx"> 65086DA719AC1719009AF46B /* CFLocaleSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFLocaleSPI.h; sourceTree = "<group>"; };
</span><del>- 650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSGrammar.h; sourceTree = "<group>"; };
</del><span class="cx"> 650FBF270D9AF046008FC292 /* SVGHKernElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGHKernElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 650FBF280D9AF047008FC292 /* SVGHKernElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGHKernElement.h; sourceTree = "<group>"; };
</span><span class="cx"> 650FBF290D9AF047008FC292 /* SVGHKernElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGHKernElement.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -9852,7 +9848,6 @@
</span><span class="cx"> 65653F2C0D9727D200CA9723 /* SVGAltGlyphElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGAltGlyphElement.idl; sourceTree = "<group>"; };
</span><span class="cx"> 656580EE09D12B20000E61D7 /* CSSPropertyNames.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSPropertyNames.gperf; sourceTree = "<group>"; };
</span><span class="cx"> 656580EF09D12B20000E61D7 /* CSSPropertyNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSPropertyNames.h; sourceTree = "<group>"; };
</span><del>- 6565814409D13043000E61D7 /* CSSGrammar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGrammar.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 6565814709D13043000E61D7 /* CSSValueKeywords.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSValueKeywords.gperf; sourceTree = "<group>"; };
</span><span class="cx"> 6565814809D13043000E61D7 /* CSSValueKeywords.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSValueKeywords.h; sourceTree = "<group>"; };
</span><span class="cx"> 656581AC09D14EE6000E61D7 /* CharsetData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CharsetData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -11097,7 +11092,6 @@
</span><span class="cx"> 946D372A1D6CB28B0077084F /* CSSParserMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSParserMode.h; path = parser/CSSParserMode.h; sourceTree = "<group>"; };
</span><span class="cx"> 946D372B1D6CB28B0077084F /* CSSParserValues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CSSParserValues.cpp; path = parser/CSSParserValues.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 946D372C1D6CB28B0077084F /* CSSParserValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSParserValues.h; path = parser/CSSParserValues.h; sourceTree = "<group>"; };
</span><del>- 946D37321D6CC3720077084F /* SVGCSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SVGCSSParser.cpp; path = parser/SVGCSSParser.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 946D37341D6CDF980077084F /* CSSTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CSSTokenizer.cpp; path = parser/CSSTokenizer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 946D37351D6CDF980077084F /* CSSTokenizerInputStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CSSTokenizerInputStream.cpp; path = parser/CSSTokenizerInputStream.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 946D37371D6CDF980077084F /* CSSTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSTokenizer.h; path = parser/CSSTokenizer.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -11132,6 +11126,11 @@
</span><span class="cx"> 94DE5C901D8300CB00164F2A /* CSSSupportsParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSSupportsParser.h; path = parser/CSSSupportsParser.h; sourceTree = "<group>"; };
</span><span class="cx"> 94DE5C931D8301B000164F2A /* CSSParserImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CSSParserImpl.cpp; path = parser/CSSParserImpl.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 94DE5C941D8301B000164F2A /* CSSParserImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSSParserImpl.h; path = parser/CSSParserImpl.h; sourceTree = "<group>"; };
</span><ins>+ 94E8394E1DFB2700007BC6A7 /* CSSNamespaceRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSNamespaceRule.cpp; sourceTree = "<group>"; };
+ 94E8394F1DFB2700007BC6A7 /* CSSNamespaceRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSNamespaceRule.h; sourceTree = "<group>"; };
+ 94E839501DFB29A4007BC6A7 /* CSSNamespaceRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSNamespaceRule.idl; sourceTree = "<group>"; };
+ 94E839531DFB2BA6007BC6A7 /* JSCSSNamespaceRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSNamespaceRule.cpp; sourceTree = "<group>"; };
+ 94E839541DFB2BA6007BC6A7 /* JSCSSNamespaceRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSNamespaceRule.h; sourceTree = "<group>"; };
</ins><span class="cx"> 950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGraphicsElement.h; sourceTree = "<group>"; };
</span><span class="cx"> 96ABA42214BCB80E00D56204 /* GraphicsContext3DOpenGLCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContext3DOpenGLCommon.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 97059973107D975200A50A7C /* PolicyCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PolicyCallback.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -13044,10 +13043,6 @@
</span><span class="cx"> BC128B00137C8D4600CAC845 /* RenderGrid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderGrid.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC1402880E83680800319717 /* ScrollbarThemeComposite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollbarThemeComposite.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC1402890E83680800319717 /* ScrollbarThemeComposite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarThemeComposite.h; sourceTree = "<group>"; };
</span><del>- BC1790BA1BB5AB3F0006D13E /* CSSVariableDependentValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariableDependentValue.h; sourceTree = "<group>"; };
- BC1790BC1BBB36A80006D13E /* CSSVariableDependentValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSVariableDependentValue.cpp; sourceTree = "<group>"; };
- BC1790BE1BBF2C430006D13E /* CSSVariableValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSVariableValue.cpp; sourceTree = "<group>"; };
- BC1790BF1BBF2C430006D13E /* CSSVariableValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariableValue.h; sourceTree = "<group>"; };
</del><span class="cx"> BC17F9650B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLSelectElementCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC1A7D9518FCB5B000421879 /* RenderMultiColumnSpannerPlaceholder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMultiColumnSpannerPlaceholder.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC1A7D9618FCB5B000421879 /* RenderMultiColumnSpannerPlaceholder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMultiColumnSpannerPlaceholder.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14640,8 +14635,6 @@
</span><span class="cx"> FC9A0F72164094CF003D6B8D /* DOMCSSNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSNamespace.h; sourceTree = "<group>"; };
</span><span class="cx"> FC9A0F73164094CF003D6B8D /* DOMCSSNamespace.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMCSSNamespace.idl; sourceTree = "<group>"; };
</span><span class="cx"> FC9E0E4B16419C1E00392BE3 /* JSDOMCSSNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMCSSNamespace.h; sourceTree = "<group>"; };
</span><del>- FCEBCD711623A7910029965E /* CSSGrammar.y.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; path = CSSGrammar.y.in; sourceTree = "<group>"; };
- FCEBCD721623A7910029965E /* CSSGrammar.y.includes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; path = CSSGrammar.y.includes; sourceTree = "<group>"; };
</del><span class="cx"> FD00D7A214A3F61900734011 /* SincResampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SincResampler.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FD00D7A314A3F61900734011 /* SincResampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SincResampler.h; sourceTree = "<group>"; };
</span><span class="cx"> FD06DFA3134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DefaultAudioDestinationNode.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -17481,8 +17474,6 @@
</span><span class="cx"> E406F3FB1198307D009D59D6 /* ColorData.cpp */,
</span><span class="cx"> 9908B0F61BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.cpp */,
</span><span class="cx"> 9908B0F71BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.h */,
</span><del>- 6565814409D13043000E61D7 /* CSSGrammar.cpp */,
- 650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */,
</del><span class="cx"> E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */,
</span><span class="cx"> 656580EE09D12B20000E61D7 /* CSSPropertyNames.gperf */,
</span><span class="cx"> 656580EF09D12B20000E61D7 /* CSSPropertyNames.h */,
</span><span class="lines">@@ -19081,7 +19072,6 @@
</span><span class="cx"> 9444CBD11D860C740073A074 /* SizesAttributeParser.h */,
</span><span class="cx"> 9444CBD01D860C740073A074 /* SizesCalcParser.cpp */,
</span><span class="cx"> 9444CBCF1D860C740073A074 /* SizesCalcParser.h */,
</span><del>- 946D37321D6CC3720077084F /* SVGCSSParser.cpp */,
</del><span class="cx"> );
</span><span class="cx"> name = parser;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -20359,6 +20349,8 @@
</span><span class="cx"> 316FE0700E6CCBEE00BF6088 /* JSCSSKeyframesRule.h */,
</span><span class="cx"> BC46C1F60C0DDC8F0020CFC3 /* JSCSSMediaRule.cpp */,
</span><span class="cx"> BC46C1F70C0DDC8F0020CFC3 /* JSCSSMediaRule.h */,
</span><ins>+ 94E839531DFB2BA6007BC6A7 /* JSCSSNamespaceRule.cpp */,
+ 94E839541DFB2BA6007BC6A7 /* JSCSSNamespaceRule.h */,
</ins><span class="cx"> BC46C1F80C0DDC8F0020CFC3 /* JSCSSPageRule.cpp */,
</span><span class="cx"> BC46C1F90C0DDC8F0020CFC3 /* JSCSSPageRule.h */,
</span><span class="cx"> 930705E809E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp */,
</span><span class="lines">@@ -23384,8 +23376,6 @@
</span><span class="cx"> BC02A63B0E09A9CF004B6D2B /* CSSFunctionValue.h */,
</span><span class="cx"> BC23E4E00DAACE0F009FDC91 /* CSSGradientValue.cpp */,
</span><span class="cx"> BC53C6910DA591140021EB5D /* CSSGradientValue.h */,
</span><del>- FCEBCD711623A7910029965E /* CSSGrammar.y.in */,
- FCEBCD721623A7910029965E /* CSSGrammar.y.includes */,
</del><span class="cx"> E110032E1C9AC3DE00412DD0 /* CSSGridAutoRepeatValue.cpp */,
</span><span class="cx"> E110032F1C9AC3DE00412DD0 /* CSSGridAutoRepeatValue.h */,
</span><span class="cx"> CD7DBB2618CA11FF00C11066 /* CSSGridLineNamesValue.cpp */,
</span><span class="lines">@@ -23423,6 +23413,9 @@
</span><span class="cx"> 85C56CA20AA89C1000D95755 /* CSSMediaRule.idl */,
</span><span class="cx"> 314BE3A21B30F6D100141982 /* CSSNamedImageValue.cpp */,
</span><span class="cx"> 314BE3A01B30F6B700141982 /* CSSNamedImageValue.h */,
</span><ins>+ 94E8394E1DFB2700007BC6A7 /* CSSNamespaceRule.cpp */,
+ 94E8394F1DFB2700007BC6A7 /* CSSNamespaceRule.h */,
+ 94E839501DFB29A4007BC6A7 /* CSSNamespaceRule.idl */,
</ins><span class="cx"> A80E6CCB0A1989CA007FB8C5 /* CSSPageRule.cpp */,
</span><span class="cx"> A80E6CD60A1989CA007FB8C5 /* CSSPageRule.h */,
</span><span class="cx"> 85C56CA60AA89D5F00D95755 /* CSSPageRule.idl */,
</span><span class="lines">@@ -23490,12 +23483,8 @@
</span><span class="cx"> E49BD9F9131FD2ED003C56F0 /* CSSValuePool.h */,
</span><span class="cx"> 9444CBDE1D8861580073A074 /* CSSVariableData.cpp */,
</span><span class="cx"> 9444CBDD1D8861580073A074 /* CSSVariableData.h */,
</span><del>- BC1790BC1BBB36A80006D13E /* CSSVariableDependentValue.cpp */,
- BC1790BA1BB5AB3F0006D13E /* CSSVariableDependentValue.h */,
</del><span class="cx"> 9444CBDC1D8861580073A074 /* CSSVariableReferenceValue.cpp */,
</span><span class="cx"> 9444CBDB1D8861580073A074 /* CSSVariableReferenceValue.h */,
</span><del>- BC1790BE1BBF2C430006D13E /* CSSVariableValue.cpp */,
- BC1790BF1BBF2C430006D13E /* CSSVariableValue.h */,
</del><span class="cx"> A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */,
</span><span class="cx"> 4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */,
</span><span class="cx"> 4A4F48A816B0DFC000EDBB29 /* DocumentRuleSets.h */,
</span><span class="lines">@@ -25220,7 +25209,6 @@
</span><span class="cx"> C21DF2EA1D9E4E9900F5B24C /* CSSFontVariationValue.h in Headers */,
</span><span class="cx"> BC02A63C0E09A9CF004B6D2B /* CSSFunctionValue.h in Headers */,
</span><span class="cx"> BC53C6920DA591140021EB5D /* CSSGradientValue.h in Headers */,
</span><del>- 650F53DC09D15DDA00C9B0C8 /* CSSGrammar.h in Headers */,
</del><span class="cx"> E11003311C9AC3DE00412DD0 /* CSSGridAutoRepeatValue.h in Headers */,
</span><span class="cx"> CD7DBB2918CA19C600C11066 /* CSSGridLineNamesValue.h in Headers */,
</span><span class="cx"> 996E59DF1DF0128D006612B9 /* NavigatorWebDriver.h in Headers */,
</span><span class="lines">@@ -25286,12 +25274,11 @@
</span><span class="cx"> A80E6CEE0A1989CA007FB8C5 /* CSSValue.h in Headers */,
</span><span class="cx"> 6565815109D13043000E61D7 /* CSSValueKeywords.h in Headers */,
</span><span class="cx"> A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
</span><ins>+ 94E839511DFB2A0E007BC6A7 /* CSSNamespaceRule.h in Headers */,
</ins><span class="cx"> E49BD9FA131FD2ED003C56F0 /* CSSValuePool.h in Headers */,
</span><span class="cx"> 9444CBE81D8861C20073A074 /* CSSVariableData.h in Headers */,
</span><del>- BC1790BB1BB5AB3F0006D13E /* CSSVariableDependentValue.h in Headers */,
</del><span class="cx"> 9444CBDA1D88483A0073A074 /* CSSVariableParser.h in Headers */,
</span><span class="cx"> 9444CBEA1D8861CA0073A074 /* CSSVariableReferenceValue.h in Headers */,
</span><del>- BC1790C11BBF2C430006D13E /* CSSVariableValue.h in Headers */,
</del><span class="cx"> 93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
</span><span class="cx"> BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */,
</span><span class="cx"> BC2272AD0E82E8F300E7F975 /* CursorList.h in Headers */,
</span><span class="lines">@@ -25778,6 +25765,7 @@
</span><span class="cx"> A81369DC097374F600D74463 /* HTMLOptionElement.h in Headers */,
</span><span class="cx"> A81369DA097374F600D74463 /* HTMLOptionsCollection.h in Headers */,
</span><span class="cx"> 4AD01009127E642A0015035F /* HTMLOutputElement.h in Headers */,
</span><ins>+ 94E839561DFB2BC4007BC6A7 /* JSCSSNamespaceRule.h in Headers */,
</ins><span class="cx"> A8EA7CB50A192B9C00A8EF5F /* HTMLParagraphElement.h in Headers */,
</span><span class="cx"> A871D4580A127CBC00B12A68 /* HTMLParamElement.h in Headers */,
</span><span class="cx"> 93E2A307123E9DC0009FE12A /* HTMLParserIdioms.h in Headers */,
</span><span class="lines">@@ -29036,7 +29024,6 @@
</span><span class="cx"> C21DF2E91D9E4E9900F5B24C /* CSSFontVariationValue.cpp in Sources */,
</span><span class="cx"> BC02A6460E09AAE9004B6D2B /* CSSFunctionValue.cpp in Sources */,
</span><span class="cx"> BC23E4E10DAACE0F009FDC91 /* CSSGradientValue.cpp in Sources */,
</span><del>- 650F53DD09D15DDF00C9B0C8 /* CSSGrammar.cpp in Sources */,
</del><span class="cx"> E11003301C9AC3DE00412DD0 /* CSSGridAutoRepeatValue.cpp in Sources */,
</span><span class="cx"> CD7DBB2818CA19A400C11066 /* CSSGridLineNamesValue.cpp in Sources */,
</span><span class="cx"> CD3E252318046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp in Sources */,
</span><span class="lines">@@ -29097,11 +29084,9 @@
</span><span class="cx"> A80E6CE40A1989CA007FB8C5 /* CSSValueList.cpp in Sources */,
</span><span class="cx"> E49BDA0B131FD3E5003C56F0 /* CSSValuePool.cpp in Sources */,
</span><span class="cx"> 9444CBE71D8861C20073A074 /* CSSVariableData.cpp in Sources */,
</span><del>- BC1790BD1BBB36A80006D13E /* CSSVariableDependentValue.cpp in Sources */,
</del><span class="cx"> 9444CBD91D88483A0073A074 /* CSSVariableParser.cpp in Sources */,
</span><span class="cx"> 9444CBE91D8861CA0073A074 /* CSSVariableReferenceValue.cpp in Sources */,
</span><span class="cx"> E307DECF1D81E4C300141CAF /* CachedModuleScriptLoader.cpp in Sources */,
</span><del>- BC1790C01BBF2C430006D13E /* CSSVariableValue.cpp in Sources */,
</del><span class="cx"> E11AF15111B9A1A300805103 /* Cursor.cpp in Sources */,
</span><span class="cx"> 265541521489B233000DFC5D /* CursorIOS.cpp in Sources */,
</span><span class="cx"> 93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
</span><span class="lines">@@ -29666,6 +29651,7 @@
</span><span class="cx"> 37E3524B12450C5200BAF5D9 /* InputType.cpp in Sources */,
</span><span class="cx"> C348612315FDE21E007A1CC9 /* InputTypeNames.cpp in Sources */,
</span><span class="cx"> 93309DE9099E64920056E581 /* InsertIntoTextNodeCommand.cpp in Sources */,
</span><ins>+ 94E839521DFB2A12007BC6A7 /* CSSNamespaceRule.cpp in Sources */,
</ins><span class="cx"> 93309DEB099E64920056E581 /* InsertLineBreakCommand.cpp in Sources */,
</span><span class="cx"> D07DEAB90A36554A00CA30F8 /* InsertListCommand.cpp in Sources */,
</span><span class="cx"> 93309DED099E64920056E581 /* InsertNodeBeforeCommand.cpp in Sources */,
</span><span class="lines">@@ -31130,6 +31116,7 @@
</span><span class="cx"> 93C4A4161629DF5A00C3EB6E /* ScrollingTreeFrameScrollingNodeMac.mm in Sources */,
</span><span class="cx"> 0FC4E40F187F82E10045882C /* ScrollingTreeIOS.cpp in Sources */,
</span><span class="cx"> 0FE5806319327A6200DE32EB /* ScrollingTreeMac.cpp in Sources */,
</span><ins>+ 94E839551DFB2BC4007BC6A7 /* JSCSSNamespaceRule.cpp in Sources */,
</ins><span class="cx"> 1AAADDE314DC8C8F00AF64B3 /* ScrollingTreeNode.cpp in Sources */,
</span><span class="cx"> 0FEA3E7F191B3169000F1B55 /* ScrollingTreeOverflowScrollingNode.cpp in Sources */,
</span><span class="cx"> 9391A99C1629D70000297330 /* ScrollingTreeScrollingNode.cpp in Sources */,
</span><span class="lines">@@ -31344,7 +31331,6 @@
</span><span class="cx"> B22279A10D00BF220071B782 /* SVGColor.cpp in Sources */,
</span><span class="cx"> B22279A40D00BF220071B782 /* SVGComponentTransferFunctionElement.cpp in Sources */,
</span><span class="cx"> B2227B050D00BFF10071B782 /* SVGCSSComputedStyleDeclaration.cpp in Sources */,
</span><del>- 946D37331D6CC42B0077084F /* SVGCSSParser.cpp in Sources */,
</del><span class="cx"> B22279A70D00BF220071B782 /* SVGCursorElement.cpp in Sources */,
</span><span class="cx"> B22279AD0D00BF220071B782 /* SVGDefsElement.cpp in Sources */,
</span><span class="cx"> B22279B00D00BF220071B782 /* SVGDescElement.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSRuleCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "CSSKeyframeRule.h"
</span><span class="cx"> #include "CSSKeyframesRule.h"
</span><span class="cx"> #include "CSSMediaRule.h"
</span><ins>+#include "CSSNamespaceRule.h"
</ins><span class="cx"> #include "CSSPageRule.h"
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="cx"> #include "CSSSupportsRule.h"
</span><span class="lines">@@ -39,6 +40,7 @@
</span><span class="cx"> #include "JSCSSKeyframeRule.h"
</span><span class="cx"> #include "JSCSSKeyframesRule.h"
</span><span class="cx"> #include "JSCSSMediaRule.h"
</span><ins>+#include "JSCSSNamespaceRule.h"
</ins><span class="cx"> #include "JSCSSPageRule.h"
</span><span class="cx"> #include "JSCSSStyleRule.h"
</span><span class="cx"> #include "JSCSSSupportsRule.h"
</span><span class="lines">@@ -71,6 +73,8 @@
</span><span class="cx"> return createWrapper<CSSPageRule>(globalObject, WTFMove(rule));
</span><span class="cx"> case CSSRule::IMPORT_RULE:
</span><span class="cx"> return createWrapper<CSSImportRule>(globalObject, WTFMove(rule));
</span><ins>+ case CSSRule::NAMESPACE_RULE:
+ return createWrapper<CSSNamespaceRule>(globalObject, WTFMove(rule));
</ins><span class="cx"> case CSSRule::KEYFRAME_RULE:
</span><span class="cx"> return createWrapper<CSSKeyframeRule>(globalObject, WTFMove(rule));
</span><span class="cx"> case CSSRule::KEYFRAMES_RULE:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSCSSStyleDeclarationCustom.h"
</span><span class="cx">
</span><del>-#include "CSSParser.h"
</del><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><ins>+#include "CSSPropertyParser.h"
</ins><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "CSSStyleDeclaration.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSAllInOne.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSAllInOne.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSAllInOne.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -89,8 +89,6 @@
</span><span class="cx"> #include "CSSValue.cpp"
</span><span class="cx"> #include "CSSValueList.cpp"
</span><span class="cx"> #include "CSSValuePool.cpp"
</span><del>-#include "CSSVariableDependentValue.cpp"
-#include "CSSVariableValue.cpp"
</del><span class="cx"> #include "DOMCSSNamespace.cpp"
</span><span class="cx"> #include "DocumentRuleSets.cpp"
</span><span class="cx"> #include "ElementRuleCollector.cpp"
</span><span class="lines">@@ -110,7 +108,6 @@
</span><span class="cx"> #include "RuleFeature.cpp"
</span><span class="cx"> #include "RuleSet.cpp"
</span><span class="cx"> #include "SVGCSSComputedStyleDeclaration.cpp"
</span><del>-#include "SVGCSSParser.cpp"
</del><span class="cx"> #include "SelectorChecker.cpp"
</span><span class="cx"> #include "SelectorFilter.cpp"
</span><span class="cx"> #include "StyleInvalidationAnalysis.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSCalculationValue.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case CSSPrimitiveValue::CSS_NUMBER:
</span><del>- case CSSPrimitiveValue::CSS_PARSER_INTEGER:
</del><span class="cx"> return CalcNumber;
</span><span class="cx"> case CSSPrimitiveValue::CSS_EMS:
</span><span class="cx"> case CSSPrimitiveValue::CSS_EXS:
</span><span class="lines">@@ -96,7 +95,6 @@
</span><span class="cx"> switch (type) {
</span><span class="cx"> case CSSPrimitiveValue::CSS_FR:
</span><span class="cx"> case CSSPrimitiveValue::CSS_NUMBER:
</span><del>- case CSSPrimitiveValue::CSS_PARSER_INTEGER:
</del><span class="cx"> case CSSPrimitiveValue::CSS_PERCENTAGE:
</span><span class="cx"> case CSSPrimitiveValue::CSS_EMS:
</span><span class="cx"> case CSSPrimitiveValue::CSS_EXS:
</span><span class="lines">@@ -136,10 +134,6 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_RGBCOLOR:
</span><span class="cx"> case CSSPrimitiveValue::CSS_PAIR:
</span><span class="cx"> case CSSPrimitiveValue::CSS_UNICODE_RANGE:
</span><del>- case CSSPrimitiveValue::CSS_PARSER_OPERATOR:
- case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR:
- case CSSPrimitiveValue::CSS_PARSER_IDENTIFIER:
- case CSSPrimitiveValue::CSS_PARSER_WHITESPACE:
</del><span class="cx"> case CSSPrimitiveValue::CSS_COUNTER_NAME:
</span><span class="cx"> case CSSPrimitiveValue::CSS_SHAPE:
</span><span class="cx"> case CSSPrimitiveValue::CSS_QUAD:
</span><span class="lines">@@ -374,7 +368,7 @@
</span><span class="cx">
</span><span class="cx"> // Simplify numbers.
</span><span class="cx"> if (leftCategory == CalcNumber && rightCategory == CalcNumber) {
</span><del>- CSSPrimitiveValue::UnitTypes evaluationType = isInteger ? CSSPrimitiveValue::CSS_PARSER_INTEGER : CSSPrimitiveValue::CSS_NUMBER;
</del><ins>+ CSSPrimitiveValue::UnitTypes evaluationType = CSSPrimitiveValue::CSS_NUMBER;
</ins><span class="cx"> return CSSCalcPrimitiveValue::create(evaluateOperator(op, leftSide->doubleValue(), rightSide->doubleValue()), evaluationType, isInteger);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -487,8 +481,6 @@
</span><span class="cx"> switch (category()) {
</span><span class="cx"> case CalcNumber:
</span><span class="cx"> ASSERT(m_leftSide->category() == CalcNumber && m_rightSide->category() == CalcNumber);
</span><del>- if (isInteger())
- return CSSPrimitiveValue::CSS_PARSER_INTEGER;
</del><span class="cx"> return CSSPrimitiveValue::CSS_NUMBER;
</span><span class="cx"> case CalcLength:
</span><span class="cx"> case CalcPercent: {
</span><span class="lines">@@ -688,141 +680,7 @@
</span><span class="cx"> return parseAdditiveValueExpression(tokens, depth, result);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-static ParseState checkDepthAndIndexDeprecated(int* depth, unsigned index, CSSParserValueList* tokens)
-{
- (*depth)++;
- if (*depth > maxExpressionDepth)
- return TooDeep;
- if (index >= tokens->size())
- return NoMoreTokens;
- return OK;
-}
</del><span class="cx">
</span><del>-class CSSCalcExpressionNodeParserDeprecated {
-public:
- RefPtr<CSSCalcExpressionNode> parseCalc(CSSParserValueList* tokens)
- {
- unsigned index = 0;
- Value result;
- bool ok = parseValueExpression(tokens, 0, &index, &result);
- ASSERT_WITH_SECURITY_IMPLICATION(index <= tokens->size());
- if (!ok || index != tokens->size())
- return nullptr;
- return result.value;
- }
-
-private:
- struct Value {
- RefPtr<CSSCalcExpressionNode> value;
- };
-
- char operatorValue(CSSParserValueList* tokens, unsigned index)
- {
- if (index >= tokens->size())
- return 0;
- CSSParserValue* value = tokens->valueAt(index);
- if (value->unit != CSSParserValue::Operator)
- return 0;
-
- return value->iValue;
- }
-
- bool parseValue(CSSParserValueList* tokens, unsigned* index, Value* result)
- {
- CSSParserValue* parserValue = tokens->valueAt(*index);
- if (parserValue->unit == CSSParserValue::Operator || parserValue->unit == CSSParserValue::Function)
- return false;
-
- RefPtr<CSSValue> value = parserValue->createCSSValue();
- if (!is<CSSPrimitiveValue>(value.get()))
- return false;
-
- result->value = CSSCalcPrimitiveValue::create(Ref<CSSPrimitiveValue>(downcast<CSSPrimitiveValue>(*value)), parserValue->isInt);
-
- ++*index;
- return true;
- }
-
- bool parseValueTerm(CSSParserValueList* tokens, int depth, unsigned* index, Value* result)
- {
- if (checkDepthAndIndexDeprecated(&depth, *index, tokens) != OK)
- return false;
-
- if (operatorValue(tokens, *index) == '(') {
- unsigned currentIndex = *index + 1;
- if (!parseValueExpression(tokens, depth, &currentIndex, result))
- return false;
-
- if (operatorValue(tokens, currentIndex) != ')')
- return false;
- *index = currentIndex + 1;
- return true;
- }
-
- return parseValue(tokens, index, result);
- }
-
- bool parseValueMultiplicativeExpression(CSSParserValueList* tokens, int depth, unsigned* index, Value* result)
- {
- if (checkDepthAndIndexDeprecated(&depth, *index, tokens) != OK)
- return false;
-
- if (!parseValueTerm(tokens, depth, index, result))
- return false;
-
- while (*index < tokens->size() - 1) {
- char operatorCharacter = operatorValue(tokens, *index);
- if (operatorCharacter != CalcMultiply && operatorCharacter != CalcDivide)
- break;
- ++*index;
-
- Value rhs;
- if (!parseValueTerm(tokens, depth, index, &rhs))
- return false;
-
- result->value = CSSCalcBinaryOperation::createSimplified(static_cast<CalcOperator>(operatorCharacter), result->value, rhs.value);
- if (!result->value)
- return false;
- }
-
- ASSERT_WITH_SECURITY_IMPLICATION(*index <= tokens->size());
- return true;
- }
-
- bool parseAdditiveValueExpression(CSSParserValueList* tokens, int depth, unsigned* index, Value* result)
- {
- if (checkDepthAndIndexDeprecated(&depth, *index, tokens) != OK)
- return false;
-
- if (!parseValueMultiplicativeExpression(tokens, depth, index, result))
- return false;
-
- while (*index < tokens->size() - 1) {
- char operatorCharacter = operatorValue(tokens, *index);
- if (operatorCharacter != CalcAdd && operatorCharacter != CalcSubtract)
- break;
- ++*index;
-
- Value rhs;
- if (!parseValueMultiplicativeExpression(tokens, depth, index, &rhs))
- return false;
-
- result->value = CSSCalcBinaryOperation::createSimplified(static_cast<CalcOperator>(operatorCharacter), result->value, rhs.value);
- if (!result->value)
- return false;
- }
-
- ASSERT_WITH_SECURITY_IMPLICATION(*index <= tokens->size());
- return true;
- }
-
- bool parseValueExpression(CSSParserValueList* tokens, int depth, unsigned* index, Value* result)
- {
- return parseAdditiveValueExpression(tokens, depth, index, result);
- }
-};
-
</del><span class="cx"> static inline RefPtr<CSSCalcBinaryOperation> createBlendHalf(const Length& length, const RenderStyle& style, float progress)
</span><span class="cx"> {
</span><span class="cx"> return CSSCalcBinaryOperation::create(CalcMultiply, createCSS(length, style),
</span><span class="lines">@@ -880,17 +738,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSCalcValue> CSSCalcValue::create(CSSParserString name, CSSParserValueList& parserValueList, ValueRange range)
-{
- CSSCalcExpressionNodeParserDeprecated parser;
- RefPtr<CSSCalcExpressionNode> expression;
-
- if (equalLettersIgnoringASCIICase(name, "calc(") || equalLettersIgnoringASCIICase(name, "-webkit-calc("))
- expression = parser.parseCalc(&parserValueList);
-
- return expression ? adoptRef(new CSSCalcValue(expression.releaseNonNull(), range != ValueRangeAll)) : nullptr;
-}
-
</del><span class="cx"> RefPtr<CSSCalcValue> CSSCalcValue::create(const CSSParserTokenRange& tokens, ValueRange range)
</span><span class="cx"> {
</span><span class="cx"> CSSCalcExpressionNodeParser parser;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSCalculationValue.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -36,12 +36,9 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSParserTokenRange;
</span><del>-class CSSParserValueList;
</del><span class="cx"> class CSSToLengthConversionData;
</span><span class="cx"> class RenderStyle;
</span><span class="cx">
</span><del>-struct CSSParserString;
-
</del><span class="cx"> enum CalculationCategory {
</span><span class="cx"> CalcNumber = 0,
</span><span class="cx"> CalcLength,
</span><span class="lines">@@ -88,8 +85,6 @@
</span><span class="cx">
</span><span class="cx"> class CSSCalcValue final : public CSSValue {
</span><span class="cx"> public:
</span><del>- // FIXME-NEWPARSER: Remove the CSSParserString create when old parser goes away.
- static RefPtr<CSSCalcValue> create(CSSParserString name, CSSParserValueList& arguments, ValueRange);
</del><span class="cx"> static RefPtr<CSSCalcValue> create(const CSSParserTokenRange&, ValueRange);
</span><span class="cx">
</span><span class="cx"> static RefPtr<CSSCalcValue> create(const CalculationValue&, const RenderStyle&);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -39,10 +39,10 @@
</span><span class="cx"> #include "CSSFontVariationValue.h"
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><span class="cx"> #include "CSSLineBoxContainValue.h"
</span><del>-#include "CSSParser.h"
</del><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CSSPrimitiveValueMappings.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><ins>+#include "CSSPropertyParser.h"
</ins><span class="cx"> #include "CSSReflectValue.h"
</span><span class="cx"> #include "CSSSelector.h"
</span><span class="cx"> #include "CSSShadowValue.h"
</span><span class="lines">@@ -1008,7 +1008,7 @@
</span><span class="cx"> case FitContentTrackSizing: {
</span><span class="cx"> auto fitContentTrackSize = CSSValueList::createCommaSeparated();
</span><span class="cx"> fitContentTrackSize->append(zoomAdjustedPixelValueForLength(trackSize.fitContentTrackBreadth().length(), style));
</span><del>- return CSSFunctionValue::create("fit-content(", WTFMove(fitContentTrackSize));
</del><ins>+ return CSSFunctionValue::create(CSSValueFitContent, WTFMove(fitContentTrackSize));
</ins><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> ASSERT(trackSize.type() == MinMaxTrackSizing);
</span><span class="lines">@@ -1018,7 +1018,7 @@
</span><span class="cx"> auto minMaxTrackBreadths = CSSValueList::createCommaSeparated();
</span><span class="cx"> minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.minTrackBreadth(), style));
</span><span class="cx"> minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.maxTrackBreadth(), style));
</span><del>- return CSSFunctionValue::create("minmax(", WTFMove(minMaxTrackBreadths));
</del><ins>+ return CSSFunctionValue::create(CSSValueMinmax, WTFMove(minMaxTrackBreadths));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCustomPropertyValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCustomPropertyValue.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCustomPropertyValue.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSCustomPropertyValue.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> bool CSSCustomPropertyValue::checkVariablesForCycles(const AtomicString& name, CustomPropertyValueMap& customProperties, HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(containsVariables());
</span><del>- if (m_deprecatedValue && m_deprecatedValue->isVariableDependentValue())
- return downcast<CSSVariableDependentValue>(*m_deprecatedValue).checkVariablesForCycles(name, customProperties, seenProperties, invalidProperties);
</del><span class="cx"> if (m_value)
</span><span class="cx"> return m_value->checkVariablesForCycles(name, customProperties, seenProperties, invalidProperties);
</span><span class="cx"> return true;
</span><span class="lines">@@ -43,15 +41,6 @@
</span><span class="cx"> void CSSCustomPropertyValue::resolveVariableReferences(const CustomPropertyValueMap& customProperties, Vector<Ref<CSSCustomPropertyValue>>& resolvedValues) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(containsVariables());
</span><del>- if (m_deprecatedValue && m_deprecatedValue->isVariableDependentValue()) {
- CSSParserValueList parserList;
- if (!downcast<CSSVariableDependentValue>(*m_deprecatedValue).valueList().buildParserValueListSubstitutingVariables(&parserList, customProperties))
- resolvedValues.append(CSSCustomPropertyValue::create(m_name, CSSCustomPropertyValue::createInvalid()));
- else
- resolvedValues.append(CSSCustomPropertyValue::create(m_name, CSSValueList::createFromParserValueList(parserList)));
- return;
- }
-
</del><span class="cx"> if (!m_value)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -60,7 +49,7 @@
</span><span class="cx"> if (resolvedData)
</span><span class="cx"> resolvedValues.append(CSSCustomPropertyValue::createWithVariableData(m_name, resolvedData.releaseNonNull()));
</span><span class="cx"> else
</span><del>- resolvedValues.append(CSSCustomPropertyValue::create(m_name, CSSCustomPropertyValue::createInvalid()));
</del><ins>+ resolvedValues.append(CSSCustomPropertyValue::createWithID(m_name, CSSValueInvalid));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCustomPropertyValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCustomPropertyValue.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCustomPropertyValue.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSCustomPropertyValue.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSValue.h"
</span><span class="cx"> #include "CSSVariableData.h"
</span><del>-#include "CSSVariableDependentValue.h"
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -35,11 +34,6 @@
</span><span class="cx">
</span><span class="cx"> class CSSCustomPropertyValue final : public CSSValue {
</span><span class="cx"> public:
</span><del>- static Ref<CSSCustomPropertyValue> create(const AtomicString& name, Ref<CSSValue>&& value)
- {
- return adoptRef(*new CSSCustomPropertyValue(name, WTFMove(value)));
- }
-
</del><span class="cx"> static Ref<CSSCustomPropertyValue> createWithVariableData(const AtomicString& name, Ref<CSSVariableData>&& value)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new CSSCustomPropertyValue(name, WTFMove(value)));
</span><span class="lines">@@ -59,9 +53,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_serialized) {
</span><span class="cx"> m_serialized = true;
</span><del>- if (m_deprecatedValue)
- m_stringValue = m_deprecatedValue->cssText();
- else if (m_value)
</del><ins>+ if (m_value)
</ins><span class="cx"> m_stringValue = m_value->tokenRange().serialize();
</span><span class="cx"> else if (m_valueId != CSSValueInvalid)
</span><span class="cx"> m_stringValue = getValueName(m_valueId);
</span><span class="lines">@@ -73,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> const AtomicString& name() const { return m_name; }
</span><span class="cx">
</span><del>- bool equals(const CSSCustomPropertyValue& other) const { return m_name == other.m_name && m_deprecatedValue == other.m_deprecatedValue && m_value == other.m_value && m_valueId == other.m_valueId; }
</del><ins>+ bool equals(const CSSCustomPropertyValue& other) const { return m_name == other.m_name && m_value == other.m_value && m_valueId == other.m_valueId; }
</ins><span class="cx">
</span><span class="cx"> bool containsVariables() const { return m_containsVariables; }
</span><span class="cx"> bool checkVariablesForCycles(const AtomicString& name, CustomPropertyValueMap&, HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties) const;
</span><span class="lines">@@ -80,20 +72,10 @@
</span><span class="cx">
</span><span class="cx"> void resolveVariableReferences(const CustomPropertyValueMap&, Vector<Ref<CSSCustomPropertyValue>>&) const;
</span><span class="cx">
</span><del>- const RefPtr<CSSValue> deprecatedValue() const { return m_deprecatedValue.get(); }
-
</del><span class="cx"> CSSValueID valueID() const { return m_valueId; }
</span><span class="cx"> CSSVariableData* value() const { return m_value.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSCustomPropertyValue(const AtomicString& name, Ref<CSSValue>&& value)
- : CSSValue(CustomPropertyClass)
- , m_name(name)
- , m_deprecatedValue(WTFMove(value))
- , m_containsVariables(m_deprecatedValue->isVariableDependentValue())
- {
- }
-
</del><span class="cx"> CSSCustomPropertyValue(const AtomicString& name, const String& serializedValue)
</span><span class="cx"> : CSSValue(CustomPropertyClass)
</span><span class="cx"> , m_name(name)
</span><span class="lines">@@ -107,7 +89,7 @@
</span><span class="cx"> , m_name(name)
</span><span class="cx"> , m_valueId(id)
</span><span class="cx"> {
</span><del>- ASSERT(id == CSSValueInherit || id == CSSValueInitial || id == CSSValueUnset || id == CSSValueRevert);
</del><ins>+ ASSERT(id == CSSValueInherit || id == CSSValueInitial || id == CSSValueUnset || id == CSSValueRevert || id == CSSValueInvalid);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSCustomPropertyValue(const AtomicString& name, Ref<CSSVariableData>&& value)
</span><span class="lines">@@ -121,9 +103,8 @@
</span><span class="cx">
</span><span class="cx"> const AtomicString m_name;
</span><span class="cx">
</span><del>- RefPtr<CSSValue> m_deprecatedValue; // Used by old parser
- RefPtr<CSSVariableData> m_value; // Used by new parser.
- CSSValueID m_valueId { CSSValueInvalid }; // Used by new parser.
</del><ins>+ RefPtr<CSSVariableData> m_value;
+ CSSValueID m_valueId { CSSValueInvalid };
</ins><span class="cx">
</span><span class="cx"> mutable String m_stringValue;
</span><span class="cx"> bool m_containsVariables { false };
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFunctionValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFunctionValue.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFunctionValue.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSFunctionValue.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -26,29 +26,21 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><span class="cx">
</span><del>-#include "CSSParserValues.h"
</del><span class="cx"> #include "CSSValueList.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSFunctionValue::CSSFunctionValue(CSSParserFunction* function)
</del><ins>+CSSFunctionValue::CSSFunctionValue(CSSValueID name, Ref<CSSValueList>&& args)
</ins><span class="cx"> : CSSValue(FunctionClass)
</span><del>- , m_nameDeprecated(function->name)
- , m_args(function->args ? RefPtr<CSSValueList>(CSSValueList::createFromParserValueList(*function->args)) : nullptr)
-{
-}
-
-CSSFunctionValue::CSSFunctionValue(const String& name, Ref<CSSValueList>&& args)
- : CSSValue(FunctionClass)
- , m_nameDeprecated(name)
</del><ins>+ , m_name(name)
</ins><span class="cx"> , m_args(WTFMove(args))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSFunctionValue::CSSFunctionValue(CSSValueID keyword)
</del><ins>+CSSFunctionValue::CSSFunctionValue(CSSValueID name)
</ins><span class="cx"> : CSSValue(FunctionClass)
</span><del>- , m_name(keyword)
</del><ins>+ , m_name(name)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -58,8 +50,7 @@
</span><span class="cx"> if (m_name != CSSValueInvalid) {
</span><span class="cx"> result.append(getValueName(m_name));
</span><span class="cx"> result.append('(');
</span><del>- } else
- result.append(m_nameDeprecated); // Includes the '('
</del><ins>+ }
</ins><span class="cx"> if (m_args)
</span><span class="cx"> result.append(m_args->cssText());
</span><span class="cx"> result.append(')');
</span><span class="lines">@@ -77,20 +68,5 @@
</span><span class="cx"> m_args = CSSValueList::createCommaSeparated();
</span><span class="cx"> m_args->append(WTFMove(value));
</span><span class="cx"> }
</span><del>-
-bool CSSFunctionValue::buildParserValueSubstitutingVariables(CSSParserValue* result, const CustomPropertyValueMap& customProperties) const
-{
- result->id = CSSValueInvalid;
- result->unit = CSSParserValue::Function;
- result->function = new CSSParserFunction;
- result->function->name.init(m_nameDeprecated);
- bool success = true;
- if (m_args) {
- CSSParserValueList* argList = new CSSParserValueList;
- success = m_args->buildParserValueListSubstitutingVariables(argList, customProperties);
- result->function->args.reset(argList);
- }
- return success;
-}
</del><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFunctionValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFunctionValue.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFunctionValue.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSFunctionValue.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -31,25 +31,18 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSValueList;
</span><del>-struct CSSParserFunction;
-struct CSSParserValue;
</del><span class="cx">
</span><span class="cx"> // FIXME-NEWPARSER: This can just *be* a CSSValueList subclass.
</span><span class="cx"> class CSSFunctionValue final : public CSSValue {
</span><span class="cx"> public:
</span><del>- static Ref<CSSFunctionValue> create(CSSParserFunction* function)
</del><ins>+ static Ref<CSSFunctionValue> create(CSSValueID name, Ref<CSSValueList>&& args)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new CSSFunctionValue(function));
- }
-
- static Ref<CSSFunctionValue> create(const String& name, Ref<CSSValueList>&& args)
- {
</del><span class="cx"> return adoptRef(*new CSSFunctionValue(name, WTFMove(args)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<CSSFunctionValue> create(CSSValueID keyword)
</del><ins>+ static Ref<CSSFunctionValue> create(CSSValueID name)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new CSSFunctionValue(keyword));
</del><ins>+ return adoptRef(*new CSSFunctionValue(name));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String customCSSText() const;
</span><span class="lines">@@ -57,22 +50,15 @@
</span><span class="cx"> bool equals(const CSSFunctionValue&) const;
</span><span class="cx">
</span><span class="cx"> CSSValueID name() const { return m_name; }
</span><del>-
</del><span class="cx"> CSSValueList* arguments() const { return m_args.get(); }
</span><span class="cx">
</span><del>- bool buildParserValueSubstitutingVariables(CSSParserValue*, const CustomPropertyValueMap& customProperties) const;
-
</del><span class="cx"> void append(Ref<CSSValue>&&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit CSSFunctionValue(CSSParserFunction*);
- CSSFunctionValue(const String&, Ref<CSSValueList>&&);
</del><ins>+ CSSFunctionValue(CSSValueID, Ref<CSSValueList>&&);
</ins><span class="cx"> CSSFunctionValue(CSSValueID);
</span><span class="cx">
</span><span class="cx"> CSSValueID m_name { CSSValueInvalid };
</span><del>-
- // FIXME-NEWPARSER: Remove these.
- String m_nameDeprecated;
</del><span class="cx"> RefPtr<CSSValueList> m_args;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSGrammar.y.in (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,1990 +0,0 @@
</span><del>-/*
- * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004-2015 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
- * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-%pure-parser
-
-%parse-param { CSSParser* parser }
-%lex-param { CSSParser* parser }
-
-%union {
- double number;
- CSSParserString string;
- CSSSelector::MarginBoxType marginBox;
- CSSParserValue value;
- CSSParserSelectorCombinator relation;
- StyleRuleBase* rule;
- Vector<RefPtr<StyleRuleBase>>* ruleList;
- MediaQuerySet* mediaList;
- MediaQuery* mediaQuery;
- MediaQuery::Restrictor mediaQueryRestrictor;
- MediaQueryExpression* mediaQueryExpression;
- Vector<MediaQueryExpression>* mediaQueryExpressionList;
- StyleKeyframe* keyframe;
- Vector<RefPtr<StyleKeyframe>>* keyframeRuleList;
- CSSPropertyID id;
- CSSParserSelector* selector;
- Vector<std::unique_ptr<CSSParserSelector>>* selectorList;
- bool boolean;
- CSSSelector::Match match;
- int integer;
- char character;
- CSSParserValueList* valueList;
- Vector<CSSParserString>* stringList;
- CSSParser::Location location;
-}
-
-%{
-
-static inline int cssyyerror(void*, const char*)
-{
- return 1;
-}
-
-#if YYDEBUG > 0
-
-static inline bool isCSSTokenAString(int yytype)
-{
- switch (yytype) {
- case IDENT:
- case STRING:
- case NTH:
- case HEX:
- case IDSEL:
- case DIMEN:
- case INVALIDDIMEN:
- case URI:
- case FUNCTION:
- case ANYFUNCTION:
- case NOTFUNCTION:
- case CALCFUNCTION:
- case MATCHESFUNCTION:
- case MAXFUNCTION:
- case MINFUNCTION:
- case NTHCHILDFUNCTIONS:
- case NTHCHILDSELECTORSEPARATOR:
- case LANGFUNCTION:
- case VARFUNCTION:
-#if ENABLE_CSS_SELECTORS_LEVEL4
- case DIRFUNCTION:
- case ROLEFUNCTION:
-#endif
- case CUSTOM_PROPERTY:
- case UNICODERANGE:
- return true;
- default:
- return false;
- }
-}
-
-#endif
-
-static inline CSSParserValue makeIdentValue(CSSParserString string)
-{
- CSSParserValue v;
- v.id = cssValueKeywordID(string);
- v.unit = CSSPrimitiveValue::CSS_IDENT;
- v.string = string;
- return v;
-}
-
-static bool selectorListDoesNotMatchAnyPseudoElement(const Vector<std::unique_ptr<CSSParserSelector>>* selectorVector)
-{
- if (!selectorVector)
- return true;
-
- for (unsigned i = 0; i < selectorVector->size(); ++i) {
- for (const CSSParserSelector* selector = selectorVector->at(i).get(); selector; selector = selector->tagHistory()) {
- if (selector->matchesPseudoElement())
- return false;
- }
- }
- return true;
-}
-
-%}
-
-#if ENABLE_CSS_GRID_LAYOUT
-%expect 39
-#else
-%expect 38
-#endif
-
-%nonassoc LOWEST_PREC
-
-%left UNIMPORTANT_TOK
-
-%token WHITESPACE SGML_CD
-%token TOKEN_EOF 0
-
-%token INCLUDES
-%token DASHMATCH
-%token BEGINSWITH
-%token ENDSWITH
-%token CONTAINS
-
-%token <string> STRING
-%right <string> IDENT
-%token <string> NTH
-%token <string> NTHCHILDSELECTORSEPARATOR
-
-%nonassoc <string> HEX
-%nonassoc <string> IDSEL
-%nonassoc ':'
-%nonassoc '.'
-%nonassoc '['
-%nonassoc <string> '*'
-%nonassoc error
-%left '|'
-
-%token IMPORT_SYM
-%token PAGE_SYM
-%token MEDIA_SYM
-%token FONT_FACE_SYM
-%token CHARSET_SYM
-%token KEYFRAME_RULE_SYM
-%token KEYFRAMES_SYM
-%token NAMESPACE_SYM
-%token WEBKIT_RULE_SYM
-%token WEBKIT_DECLS_SYM
-%token WEBKIT_VALUE_SYM
-%token WEBKIT_MEDIAQUERY_SYM
-%token WEBKIT_SIZESATTR_SYM
-%token WEBKIT_SELECTOR_SYM
-%token WEBKIT_REGION_RULE_SYM
-%token WEBKIT_VIEWPORT_RULE_SYM
-%token <marginBox> TOPLEFTCORNER_SYM
-%token <marginBox> TOPLEFT_SYM
-%token <marginBox> TOPCENTER_SYM
-%token <marginBox> TOPRIGHT_SYM
-%token <marginBox> TOPRIGHTCORNER_SYM
-%token <marginBox> BOTTOMLEFTCORNER_SYM
-%token <marginBox> BOTTOMLEFT_SYM
-%token <marginBox> BOTTOMCENTER_SYM
-%token <marginBox> BOTTOMRIGHT_SYM
-%token <marginBox> BOTTOMRIGHTCORNER_SYM
-%token <marginBox> LEFTTOP_SYM
-%token <marginBox> LEFTMIDDLE_SYM
-%token <marginBox> LEFTBOTTOM_SYM
-%token <marginBox> RIGHTTOP_SYM
-%token <marginBox> RIGHTMIDDLE_SYM
-%token <marginBox> RIGHTBOTTOM_SYM
-
-%token ATKEYWORD
-
-%token IMPORTANT_SYM
-%token MEDIA_ONLY
-%token MEDIA_NOT
-%token MEDIA_AND
-
-%token <number> REMS
-%token <number> CHS
-%token <number> QEMS
-%token <number> EMS
-%token <number> EXS
-%token <number> PXS
-%token <number> CMS
-%token <number> MMS
-%token <number> INS
-%token <number> PTS
-%token <number> PCS
-%token <number> DEGS
-%token <number> RADS
-%token <number> GRADS
-%token <number> TURNS
-%token <number> MSECS
-%token <number> SECS
-%token <number> HERTZ
-%token <number> KHERTZ
-%token <string> DIMEN
-%token <string> INVALIDDIMEN
-%token <number> PERCENTAGE
-%token <number> FLOATTOKEN
-%token <number> INTEGER
-%token <number> VW
-%token <number> VH
-%token <number> VMIN
-%token <number> VMAX
-%token <number> DPPX
-%token <number> DPI
-%token <number> DPCM
-%token <number> FR
-
-%token <string> URI
-%token <string> FUNCTION
-%token <string> ANYFUNCTION
-%token <string> NOTFUNCTION
-%token <string> CALCFUNCTION
-%token <string> MATCHESFUNCTION
-%token <string> MAXFUNCTION
-%token <string> MINFUNCTION
-%token <string> NTHCHILDFUNCTIONS
-%token <string> LANGFUNCTION
-%token <string> VARFUNCTION
-
-#if ENABLE_CSS_SELECTORS_LEVEL4
-%token <string> DIRFUNCTION
-%token <string> ROLEFUNCTION
-#endif
-
-%token <string> CUSTOM_PROPERTY
-
-%token <string> UNICODERANGE
-
-%type <relation> combinator
-
-%type <rule> block_rule block_valid_rule font_face import keyframes media page region rule ruleset valid_rule
-%destructor { if ($$) $$->deref(); } block_rule block_valid_rule font_face import keyframes media page region rule ruleset valid_rule
-
-%type <ruleList> block_rule_list block_valid_rule_list
-%destructor { delete $$; } block_rule_list block_valid_rule_list
-
-%type <string> ident_or_string maybe_ns_prefix namespace_selector string_or_uri
-
-%type <marginBox> margin_sym
-
-%type <mediaList> media_list maybe_media_list
-%destructor { if ($$) $$->deref(); } media_list maybe_media_list
-
-%type <mediaQuery> media_query
-%destructor { delete $$; } media_query
-
-%type <mediaQueryRestrictor> maybe_media_restrictor
-
-%type <mediaQueryExpression> media_query_expression base_media_query_expression
-%destructor { delete $$; } media_query_expression base_media_query_expression
-
-%type <mediaQueryExpressionList> media_query_expression_list maybe_and_media_query_expression_list
-%destructor { delete $$; } media_query_expression_list maybe_and_media_query_expression_list
-
-%type <string> keyframe_name
-
-%type <keyframe> keyframe_rule
-%destructor { if ($$) $$->deref(); } keyframe_rule
-
-%type <keyframeRuleList> keyframes_rule
-%destructor { delete $$; } keyframes_rule
-
-// These parser values never need to be destroyed because they are never functions, value lists, or variables.
-%type <value> key unary_term
-
-// These parser values need to be destroyed because they might be functions, value lists, or variables.
-%type <value> calc_func_term calc_function function min_or_max_function term variable_function
-%destructor { destroy($$); } calc_func_term calc_function function min_or_max_function term variable_function
-
-%type <id> property
-
-%type <selector> attrib class page_selector pseudo pseudo_page complex_selector complex_selector_with_trailing_whitespace compound_selector specifier specifier_list
-%destructor { delete $$; } attrib class page_selector pseudo pseudo_page complex_selector complex_selector_with_trailing_whitespace compound_selector specifier specifier_list
-
-%type <selectorList> selector_list nested_selector_list simple_selector_list nth_selector_ending
-%destructor { delete $$; } selector_list nested_selector_list simple_selector_list
-%destructor { delete $$; } nth_selector_ending
-
-%type <boolean> attrib_flags declaration declaration_list decl_list priority
-
-%type <match> match
-
-%type <integer> unary_operator maybe_unary_operator
-
-%type <character> operator calc_func_operator
-
-%type <valueList> calc_func_expr calc_func_expr_list calc_func_paren_expr expr key_list maybe_media_value valid_calc_func_expr valid_expr whitespace_or_expr maybe_expr
-%destructor { delete $$; } calc_func_expr calc_func_expr_list calc_func_paren_expr expr key_list maybe_media_value valid_calc_func_expr valid_expr whitespace_or_expr maybe_expr
-
-%type <string> lang_range
-%type <stringList> comma_separated_lang_ranges
-%destructor { delete $$; } comma_separated_lang_ranges
-
-%type <string> min_or_max
-
-%type <string> element_name
-
-%type <location> error_location
-
-#if ENABLE_CSS_GRID_LAYOUT
-
-%type <valueList> ident_list
-%destructor { delete $$; } ident_list
-
-%type <value> track_names_list
-%destructor { destroy($$); } track_names_list
-
-#endif
-
-%token SUPPORTS_AND
-%token SUPPORTS_NOT
-%token SUPPORTS_OR
-%token SUPPORTS_SYM
-%token WEBKIT_SUPPORTS_CONDITION_SYM
-
-%type <rule> supports
-%destructor { if ($$) $$->deref(); } supports
-
-%type <boolean> supports_condition supports_condition_in_parens supports_conjunction supports_declaration_condition supports_disjunction supports_error supports_negation
-
-#if ENABLE_CSS_DEVICE_ADAPTATION
-
-%type <rule> viewport
-%destructor { if ($$) $$->deref(); } viewport
-
-#endif
-
-#if ENABLE_VIDEO_TRACK
-
-%token <string> CUEFUNCTION
-
-#endif
-
-
-%token <string> SLOTTEDFUNCTION
-%token <string> HOSTFUNCTION
-
-
-%%
-
-stylesheet:
- maybe_space maybe_charset maybe_sgml rule_list
- | webkit_rule maybe_space
- | webkit_decls maybe_space
- | webkit_value maybe_space
- | webkit_mediaquery maybe_space
- | webkit_selector maybe_space
- | webkit_keyframe_rule maybe_space
- | webkit_supports_condition maybe_space
- ;
-
-webkit_rule: WEBKIT_RULE_SYM '{' maybe_space valid_rule maybe_space '}' { parser->m_rule = adoptRef($4); } ;
-
-webkit_keyframe_rule: KEYFRAME_RULE_SYM '{' maybe_space keyframe_rule maybe_space '}' { parser->m_keyframe = adoptRef($4); } ;
-
-webkit_decls: WEBKIT_DECLS_SYM '{' maybe_space_before_declaration declaration_list '}' ;
-
-webkit_value:
- WEBKIT_VALUE_SYM '{' maybe_space expr '}' {
- if ($4) {
- parser->m_valueList = std::unique_ptr<CSSParserValueList>($4);
- int oldParsedProperties = parser->m_parsedProperties.size();
- if (!parser->parseValue(parser->m_id, parser->m_important))
- parser->rollbackLastProperties(parser->m_parsedProperties.size() - oldParsedProperties);
- parser->m_valueList = nullptr;
- }
- }
-;
-
-webkit_mediaquery: WEBKIT_MEDIAQUERY_SYM WHITESPACE maybe_space media_query '}' { parser->m_mediaQuery = std::unique_ptr<MediaQuery>($4); } ;
-
-webkit_selector:
- WEBKIT_SELECTOR_SYM '{' maybe_space selector_list '}' {
- if ($4) {
- if (parser->m_selectorListForParseSelector)
- parser->m_selectorListForParseSelector->adoptSelectorVector(*$4);
- parser->recycleSelectorVector(std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($4));
- }
- }
-;
-
-webkit_supports_condition: WEBKIT_SUPPORTS_CONDITION_SYM WHITESPACE maybe_space supports_condition '}' { parser->m_supportsCondition = $4; } ;
-
-/* for expressions that require at least one whitespace to be present, like the + and - operators in calc expressions */
-space: WHITESPACE | space WHITESPACE ;
-
-maybe_space: /* empty */ %prec UNIMPORTANT_TOK | maybe_space WHITESPACE ;
-
-maybe_sgml: /* empty */ | maybe_sgml SGML_CD | maybe_sgml WHITESPACE ;
-
-maybe_charset: /* empty */ | charset ;
-
-closing_brace: '}' | %prec LOWEST_PREC TOKEN_EOF ;
-
-closing_parenthesis: ')' | %prec LOWEST_PREC TOKEN_EOF ;
-
-closing_bracket: ']' | %prec LOWEST_PREC TOKEN_EOF;
-
-charset:
- CHARSET_SYM maybe_space STRING maybe_space ';' {
- if (parser->m_styleSheet)
- parser->m_styleSheet->parserSetEncodingFromCharsetRule($3);
- if (parser->isExtractingSourceData() && parser->m_currentRuleDataStack->isEmpty() && parser->m_ruleSourceDataResult)
- parser->addNewRuleToSourceTree(CSSRuleSourceData::createUnknown());
- }
- | CHARSET_SYM error invalid_block
- | CHARSET_SYM error ';'
-;
-
-// Ignore any @charset rule not at the beginning of the style sheet.
-ignored_charset: CHARSET_SYM maybe_space STRING maybe_space ';' | CHARSET_SYM maybe_space ';' ;
-
-rule_list:
- /* empty */
- | rule_list rule maybe_sgml {
- if (RefPtr<StyleRuleBase> rule = adoptRef($2)) {
- if (parser->m_styleSheet)
- parser->m_styleSheet->parserAppendRule(rule.releaseNonNull());
- }
- }
- ;
-
-valid_rule:
- ruleset
- | media
- | page
- | font_face
- | keyframes
- | namespace { $$ = nullptr; }
- | import
- | region
- | supports
-#if ENABLE_CSS_DEVICE_ADAPTATION
- | viewport
-#endif
- ;
-
-rule:
- valid_rule {
- $$ = $1;
- parser->m_hadSyntacticallyValidCSSRule = true;
- }
- | ignored_charset { $$ = nullptr; }
- | invalid_rule { $$ = nullptr; }
- | invalid_at { $$ = nullptr; }
- ;
-
-block_rule_list:
- /* empty */ { $$ = nullptr; }
- | block_rule_list block_rule maybe_sgml {
- $$ = $1;
- if (RefPtr<StyleRuleBase> rule = adoptRef($2)) {
- if (!$$)
- $$ = new Vector<RefPtr<StyleRuleBase>>;
- $$->append(WTFMove(rule));
- }
- }
- ;
-
-block_valid_rule_list:
- /* empty */ { $$ = nullptr; }
- | block_valid_rule_list block_valid_rule maybe_sgml {
- $$ = $1;
- if (RefPtr<StyleRuleBase> rule = adoptRef($2)) {
- if (!$$)
- $$ = new Vector<RefPtr<StyleRuleBase>>;
- $$->append(WTFMove(rule));
- }
- }
- ;
-
-block_valid_rule:
- ruleset
- | page
- | font_face
- | media
- | keyframes
- | supports
-#if ENABLE_CSS_DEVICE_ADAPTATION
- | viewport
-#endif
- ;
-
-block_rule: block_valid_rule | invalid_rule { $$ = nullptr; } | invalid_at { $$ = nullptr; } | namespace { $$ = nullptr; } | import | region ;
-
-at_import_header_end_maybe_space:
- maybe_space {
- parser->markRuleHeaderEnd();
- parser->markRuleBodyStart();
- }
- ;
-
-before_import_rule:
- /* empty */ {
- parser->markRuleHeaderStart(StyleRule::Import);
- }
- ;
-
-import:
- before_import_rule IMPORT_SYM at_import_header_end_maybe_space string_or_uri maybe_space maybe_media_list ';' {
- $$ = parser->createImportRule($4, adoptRef($6)).leakRef();
- }
- | before_import_rule IMPORT_SYM at_import_header_end_maybe_space string_or_uri maybe_space maybe_media_list TOKEN_EOF {
- $$ = parser->createImportRule($4, adoptRef($6)).leakRef();
- }
- | before_import_rule IMPORT_SYM at_import_header_end_maybe_space string_or_uri maybe_space maybe_media_list invalid_block {
- $$ = nullptr;
- parser->popRuleData();
- if ($6)
- $6->deref();
- }
- | before_import_rule IMPORT_SYM error ';' {
- $$ = nullptr;
- parser->popRuleData();
- }
- | before_import_rule IMPORT_SYM error invalid_block {
- $$ = nullptr;
- parser->popRuleData();
- }
- ;
-
-namespace:
- NAMESPACE_SYM maybe_space maybe_ns_prefix string_or_uri maybe_space ';' { parser->addNamespace($3, $4); }
- | NAMESPACE_SYM maybe_space maybe_ns_prefix string_or_uri maybe_space invalid_block
- | NAMESPACE_SYM error invalid_block
- | NAMESPACE_SYM error ';'
- ;
-
-maybe_ns_prefix: /* empty */ { $$.clear(); } | IDENT maybe_space;
-
-string_or_uri: STRING | URI ;
-
-maybe_media_value: /*empty*/ { $$ = nullptr; } | ':' maybe_space expr maybe_space { $$ = $3; } ;
-
-base_media_query_expression: '(' maybe_space IDENT maybe_space maybe_media_value ')' {
- std::unique_ptr<CSSParserValueList> mediaValue($5);
- $3.convertToASCIILowercaseInPlace();
- $$ = new MediaQueryExpression($3, mediaValue.get());
- }
- ;
-
-media_query_expression:
- maybe_media_restrictor maybe_space base_media_query_expression maybe_space {
- if ($1 != MediaQuery::None) {
- // If restrictor is specified, media query expression is invalid.
- // Create empty media query expression and continue parsing media query.
- delete $3;
- $$ = new MediaQueryExpression;
- } else
- $$ = $3;
- }
- ;
-
-media_query_expression_list:
- media_query_expression {
- $$ = new Vector<MediaQueryExpression>;
- $$->append(WTFMove(*$1));
- delete $1;
- }
- | media_query_expression_list maybe_space MEDIA_AND maybe_space media_query_expression {
- $$ = $1;
- $$->append(WTFMove(*$5));
- delete $5;
- }
- ;
-
-maybe_and_media_query_expression_list:
- /*empty*/ {
- $$ = new Vector<MediaQueryExpression>;
- }
- | MEDIA_AND maybe_space media_query_expression_list {
- $$ = $3;
- }
- ;
-
-maybe_media_restrictor:
- /*empty*/ {
- $$ = MediaQuery::None;
- }
- | MEDIA_ONLY {
- $$ = MediaQuery::Only;
- }
- | MEDIA_NOT {
- $$ = MediaQuery::Not;
- }
- ;
-
-media_query:
- media_query_expression_list {
- $$ = new MediaQuery(MediaQuery::None, "all", WTFMove(*$1));
- delete $1;
- }
- |
- maybe_media_restrictor maybe_space IDENT maybe_space maybe_and_media_query_expression_list {
- $3.convertToASCIILowercaseInPlace();
- $$ = new MediaQuery($1, $3, WTFMove(*$5));
- delete $5;
- }
- ;
-
-maybe_media_list: /* empty */ { $$ = &MediaQuerySet::create().leakRef(); } | media_list ;
-
-media_list:
- media_query {
- $$ = &MediaQuerySet::create().leakRef();
- $$->addMediaQuery(WTFMove(*$1));
- delete $1;
- parser->updateLastMediaLine(*$$);
- }
- | media_list ',' maybe_space media_query {
- $$ = $1;
- if ($$) {
- $$->addMediaQuery(WTFMove(*$4));
- parser->updateLastMediaLine(*$$);
- }
- delete $4;
- }
- | media_list error {
- $$ = nullptr;
- if ($1)
- $1->deref();
- }
- ;
-
-at_rule_body_start:
- /* empty */ {
- parser->markRuleBodyStart();
- }
- ;
-
-before_media_rule:
- /* empty */ {
- parser->markRuleHeaderStart(StyleRule::Media);
- }
- ;
-
-at_rule_header_end_maybe_space:
- maybe_space {
- parser->markRuleHeaderEnd();
- }
- ;
-
-media:
- before_media_rule MEDIA_SYM maybe_space media_list at_rule_header_end '{' at_rule_body_start maybe_space block_rule_list save_block {
- $$ = &parser->createMediaRule(adoptRef($4), std::unique_ptr<Vector<RefPtr<StyleRuleBase>>>($9).get()).leakRef();
- }
- | before_media_rule MEDIA_SYM at_rule_header_end_maybe_space '{' at_rule_body_start maybe_space block_rule_list save_block {
- $$ = &parser->createEmptyMediaRule(std::unique_ptr<Vector<RefPtr<StyleRuleBase>>>($7).get()).leakRef();
- }
- | before_media_rule MEDIA_SYM at_rule_header_end_maybe_space ';' {
- $$ = nullptr;
- parser->popRuleData();
- }
- ;
-
-supports:
- before_supports_rule SUPPORTS_SYM maybe_space supports_condition at_supports_rule_header_end '{' at_rule_body_start maybe_space block_rule_list save_block {
- $$ = &parser->createSupportsRule($4, std::unique_ptr<Vector<RefPtr<StyleRuleBase>>>($9).get()).leakRef();
- }
- | before_supports_rule SUPPORTS_SYM supports_error {
- $$ = nullptr;
- parser->popRuleData();
- parser->popSupportsRuleData();
- }
- ;
-
-supports_error:
- error ';' {
- $$ = false;
- }
- | error invalid_block {
- $$ = false;
- }
- ;
-
-before_supports_rule:
- /* empty */ {
- parser->markRuleHeaderStart(StyleRule::Supports);
- parser->markSupportsRuleHeaderStart();
- }
- ;
-
-at_supports_rule_header_end:
- /* empty */ {
- parser->markRuleHeaderEnd();
- parser->markSupportsRuleHeaderEnd();
- }
- ;
-
-supports_condition: supports_condition_in_parens | supports_negation | supports_conjunction | supports_disjunction ;
-
-supports_negation: SUPPORTS_NOT maybe_space supports_condition_in_parens { $$ = !$3; } ;
-
-supports_conjunction:
- supports_condition_in_parens SUPPORTS_AND maybe_space supports_condition_in_parens { $$ = $1 && $4; }
- | supports_conjunction SUPPORTS_AND maybe_space supports_condition_in_parens { $$ = $1 && $4; }
- ;
-
-supports_disjunction:
- supports_condition_in_parens SUPPORTS_OR maybe_space supports_condition_in_parens { $$ = $1 || $4; }
- | supports_disjunction SUPPORTS_OR maybe_space supports_condition_in_parens { $$ = $1 || $4; }
- ;
-
-supports_condition_in_parens:
- '(' maybe_space supports_condition ')' maybe_space { $$ = $3; }
- | supports_declaration_condition { $$ = $1; }
- | '(' error ')' { $$ = false; }
- ;
-
-supports_declaration_condition:
- '(' maybe_space property ':' maybe_space expr priority ')' maybe_space {
- $$ = false;
- CSSParser* p = static_cast<CSSParser*>(parser);
- std::unique_ptr<CSSParserValueList> propertyValue($6);
- if ($3 && propertyValue) {
- p->m_valueList = WTFMove(propertyValue);
- int oldParsedProperties = p->m_parsedProperties.size();
- $$ = p->parseValue($3, $7);
- // We just need to know if the declaration is supported as it is written. Rollback any additions.
- if ($$)
- p->rollbackLastProperties(p->m_parsedProperties.size() - oldParsedProperties);
- p->m_valueList = nullptr;
- }
- p->markPropertyEnd($7, false);
- }
- |
- '(' maybe_space CUSTOM_PROPERTY maybe_space ':' whitespace_or_expr priority ')' maybe_space {
- $$ = false;
- CSSParser* p = static_cast<CSSParser*>(parser);
- std::unique_ptr<CSSParserValueList> propertyValue($6);
- if (propertyValue) {
- parser->m_valueList = WTFMove(propertyValue);
- int oldParsedProperties = p->m_parsedProperties.size();
- p->setCustomPropertyName($3);
- $$ = p->parseValue(CSSPropertyCustom, $7);
- if ($$)
- p->rollbackLastProperties(p->m_parsedProperties.size() - oldParsedProperties);
- p->m_valueList = nullptr;
- }
- p->markPropertyEnd($7, false);
- }
- ;
-
-before_keyframes_rule:
- /* empty */ {
- parser->markRuleHeaderStart(StyleRule::Keyframe);
- }
- ;
-
-keyframes:
- before_keyframes_rule KEYFRAMES_SYM maybe_space keyframe_name at_rule_header_end_maybe_space '{' at_rule_body_start maybe_space keyframes_rule closing_brace {
- $$ = &parser->createKeyframesRule($4, std::unique_ptr<Vector<RefPtr<StyleKeyframe>>>($9)).leakRef();
- }
- ;
-
-keyframe_name: IDENT | STRING ;
-
-keyframes_rule:
- /* empty */ { $$ = new Vector<RefPtr<StyleKeyframe>>; }
- | keyframes_rule keyframe_rule maybe_space {
- $$ = $1;
- if (RefPtr<StyleKeyframe> keyframe = adoptRef($2))
- $$->append(WTFMove(keyframe));
- }
- ;
-
-keyframe_rule: key_list maybe_space '{' maybe_space declaration_list closing_brace { $$ = parser->createKeyframe(*std::unique_ptr<CSSParserValueList>($1)).leakRef(); } ;
-
-key_list:
- key {
- $$ = new CSSParserValueList;
- $$->addValue($1);
- }
- | key_list maybe_space ',' maybe_space key {
- $$ = $1;
- if ($$)
- $$->addValue($5);
- }
- ;
-
-key:
- maybe_unary_operator PERCENTAGE {
- $$.id = CSSValueInvalid;
- $$.isInt = false;
- $$.fValue = $1 * $2;
- $$.unit = CSSPrimitiveValue::CSS_NUMBER;
- }
- | IDENT {
- $$.id = CSSValueInvalid;
- $$.isInt = false;
- if (equalLettersIgnoringASCIICase($1, "from"))
- $$.fValue = 0;
- else if (equalLettersIgnoringASCIICase($1, "to"))
- $$.fValue = 100;
- else {
- $$.unit = 0;
- YYERROR;
- }
- $$.unit = CSSPrimitiveValue::CSS_NUMBER;
- }
- | error {
- $$.unit = 0;
- }
- ;
-
-before_page_rule:
- /* empty */ {
- parser->markRuleHeaderStart(StyleRule::Page);
- }
- ;
-
-page:
- before_page_rule PAGE_SYM maybe_space page_selector at_rule_header_end_maybe_space
- '{' at_rule_body_start maybe_space_before_declaration declarations_and_margins closing_brace {
- if ($4)
- $$ = parser->createPageRule(std::unique_ptr<CSSParserSelector>($4)).leakRef();
- else {
- // Clear properties in the invalid @page rule.
- parser->clearProperties();
- // Also clear margin at-rules here once we fully implement margin at-rules parsing.
- $$ = nullptr;
- parser->popRuleData();
- }
- }
- | before_page_rule PAGE_SYM error invalid_block {
- parser->popRuleData();
- $$ = nullptr;
- }
- | before_page_rule PAGE_SYM error ';' {
- parser->popRuleData();
- $$ = nullptr;
- }
- ;
-
-page_selector:
- IDENT {
- $$ = new CSSParserSelector(QualifiedName(nullAtom, $1, parser->m_defaultNamespace));
- $$->setForPage();
- }
- | IDENT pseudo_page {
- $$ = $2;
- if ($$) {
- $$->prependTagSelector(QualifiedName(nullAtom, $1, parser->m_defaultNamespace));
- $$->setForPage();
- }
- }
- | pseudo_page {
- $$ = $1;
- if ($$)
- $$->setForPage();
- }
- | /* empty */ {
- $$ = new CSSParserSelector;
- $$->setForPage();
- }
- ;
-
-declarations_and_margins: declaration_list | declarations_and_margins margin_box maybe_space declaration_list ;
-
-margin_box:
- margin_sym {
- parser->startDeclarationsForMarginBox();
- } maybe_space '{' maybe_space declaration_list closing_brace {
- parser->createMarginAtRule($1);
- }
- ;
-
-margin_sym:
- TOPLEFTCORNER_SYM {
- $$ = CSSSelector::TopLeftCornerMarginBox;
- }
- | TOPLEFT_SYM {
- $$ = CSSSelector::TopLeftMarginBox;
- }
- | TOPCENTER_SYM {
- $$ = CSSSelector::TopCenterMarginBox;
- }
- | TOPRIGHT_SYM {
- $$ = CSSSelector::TopRightMarginBox;
- }
- | TOPRIGHTCORNER_SYM {
- $$ = CSSSelector::TopRightCornerMarginBox;
- }
- | BOTTOMLEFTCORNER_SYM {
- $$ = CSSSelector::BottomLeftCornerMarginBox;
- }
- | BOTTOMLEFT_SYM {
- $$ = CSSSelector::BottomLeftMarginBox;
- }
- | BOTTOMCENTER_SYM {
- $$ = CSSSelector::BottomCenterMarginBox;
- }
- | BOTTOMRIGHT_SYM {
- $$ = CSSSelector::BottomRightMarginBox;
- }
- | BOTTOMRIGHTCORNER_SYM {
- $$ = CSSSelector::BottomRightCornerMarginBox;
- }
- | LEFTTOP_SYM {
- $$ = CSSSelector::LeftTopMarginBox;
- }
- | LEFTMIDDLE_SYM {
- $$ = CSSSelector::LeftMiddleMarginBox;
- }
- | LEFTBOTTOM_SYM {
- $$ = CSSSelector::LeftBottomMarginBox;
- }
- | RIGHTTOP_SYM {
- $$ = CSSSelector::RightTopMarginBox;
- }
- | RIGHTMIDDLE_SYM {
- $$ = CSSSelector::RightMiddleMarginBox;
- }
- | RIGHTBOTTOM_SYM {
- $$ = CSSSelector::RightBottomMarginBox;
- }
- ;
-
-before_font_face_rule:
- /* empty */ {
- parser->markRuleHeaderStart(StyleRule::FontFace);
- }
- ;
-
-font_face:
- before_font_face_rule FONT_FACE_SYM at_rule_header_end_maybe_space '{' at_rule_body_start maybe_space_before_declaration declaration_list closing_brace {
- $$ = parser->createFontFaceRule().leakRef();
- }
- | before_font_face_rule FONT_FACE_SYM error invalid_block {
- $$ = nullptr;
- parser->popRuleData();
- }
- | before_font_face_rule FONT_FACE_SYM error ';' {
- $$ = nullptr;
- parser->popRuleData();
- }
-;
-
-#if ENABLE_CSS_DEVICE_ADAPTATION
-
-before_viewport_rule:
- /* empty */ {
- parser->markViewportRuleBodyStart();
- parser->markRuleHeaderStart(StyleRule::Viewport);
- }
- ;
-
-viewport:
- before_viewport_rule WEBKIT_VIEWPORT_RULE_SYM at_rule_header_end_maybe_space
- '{' at_rule_body_start maybe_space_before_declaration declaration_list closing_brace {
- $$ = &parser->createViewportRule().leakRef();
- parser->markViewportRuleBodyEnd();
- }
- | before_viewport_rule WEBKIT_VIEWPORT_RULE_SYM error invalid_block {
- $$ = nullptr;
- parser->popRuleData();
- parser->markViewportRuleBodyEnd();
- }
- | before_viewport_rule WEBKIT_VIEWPORT_RULE_SYM error ';' {
- $$ = nullptr;
- parser->popRuleData();
- parser->markViewportRuleBodyEnd();
- }
-;
-
-#endif
-
-before_region_rule:
- /* empty */ {
- parser->markRuleHeaderStart(StyleRule::Region);
- }
- ;
-
-region:
- before_region_rule WEBKIT_REGION_RULE_SYM maybe_space selector_list at_rule_header_end '{' at_rule_body_start maybe_space block_valid_rule_list save_block {
- std::unique_ptr<Vector<RefPtr<StyleRuleBase>>> ruleList($9);
- if ($4)
- $$ = parser->createRegionRule(std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($4).get(), ruleList.get()).leakRef();
- else {
- $$ = nullptr;
- parser->popRuleData();
- }
- }
-;
-
-combinator:
- '+' maybe_space { $$ = CSSParserSelectorCombinator::DirectAdjacent; }
- | '~' maybe_space { $$ = CSSParserSelectorCombinator::IndirectAdjacent; }
- | '>' maybe_space { $$ = CSSParserSelectorCombinator::Child; }
-#if ENABLE_CSS_SELECTORS_LEVEL4
- | '>' '>' maybe_space { $$ = CSSParserSelectorCombinator::DescendantDoubleChild; }
-#endif
- ;
-
-maybe_unary_operator: unary_operator | { $$ = 1; } ;
-
-unary_operator: '-' { $$ = -1; } | '+' { $$ = 1; } ;
-
-maybe_space_before_declaration: maybe_space { parser->markPropertyStart(); } ;
-
-before_selector_list:
- {
- parser->markRuleHeaderStart(StyleRule::Style);
- parser->markSelectorStart();
- }
- ;
-
-at_rule_header_end: { parser->markRuleHeaderEnd(); } ;
-
-at_selector_end: { parser->markSelectorEnd(); } ;
-
-ruleset:
- before_selector_list selector_list at_selector_end at_rule_header_end '{' at_rule_body_start maybe_space_before_declaration declaration_list closing_brace {
- $$ = parser->createStyleRule($2).leakRef();
- parser->recycleSelectorVector(std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($2));
- }
- ;
-
-before_selector_group_item: { parser->markSelectorStart(); } ;
-
-selector_list:
- complex_selector %prec UNIMPORTANT_TOK {
- $$ = nullptr;
- if ($1) {
- $$ = parser->createSelectorVector().release();
- $$->append(std::unique_ptr<CSSParserSelector>($1));
- }
- }
- | selector_list at_selector_end ',' maybe_space before_selector_group_item complex_selector %prec UNIMPORTANT_TOK {
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> selectorList($1);
- std::unique_ptr<CSSParserSelector> selector($6);
- $$ = nullptr;
- if (selectorList && selector) {
- $$ = selectorList.release();
- $$->append(WTFMove(selector));
- }
- }
- | selector_list error {
- $$ = nullptr;
- delete $1;
- }
- ;
-
-before_nested_selector_list: { parser->startNestedSelectorList(); } ;
-after_nested_selector_list: { parser->endNestedSelectorList(); } ;
-
-nested_selector_list:
- before_nested_selector_list selector_list after_nested_selector_list {
- $$ = $2;
- }
- ;
-
-lang_range: IDENT | STRING ;
-
-comma_separated_lang_ranges:
- lang_range %prec UNIMPORTANT_TOK {
- $$ = new Vector<CSSParserString>;
- $$->append($1);
- }
- | comma_separated_lang_ranges maybe_space ',' maybe_space lang_range %prec UNIMPORTANT_TOK {
- $$ = $1;
- if ($$)
- $1->append($5);
- }
- | comma_separated_lang_ranges error {
- $$ = nullptr;
- delete $1;
- }
- ;
-
-complex_selector_with_trailing_whitespace:
- complex_selector WHITESPACE;
-
-complex_selector:
- compound_selector
- | complex_selector_with_trailing_whitespace
- | complex_selector_with_trailing_whitespace compound_selector {
- std::unique_ptr<CSSParserSelector> left($1);
- std::unique_ptr<CSSParserSelector> right($2);
- $$ = nullptr;
- if (left && right) {
- right->appendTagHistory(CSSParserSelectorCombinator::DescendantSpace, WTFMove(left));
- $$ = right.release();
- }
- }
- | complex_selector combinator compound_selector {
- std::unique_ptr<CSSParserSelector> left($1);
- std::unique_ptr<CSSParserSelector> right($3);
- $$ = nullptr;
- if (left && right) {
- right->appendTagHistory($2, WTFMove(left));
- $$ = right.release();
- }
- }
- | complex_selector error {
- $$ = nullptr;
- delete $1;
- }
- ;
-
-namespace_selector:
- '|' {
- static LChar emptyString = '\0';
- $$.init(&emptyString, 0);
- }
- | '*' '|' { static LChar star = '*'; $$.init(&star, 1); }
- | IDENT '|'
-;
-
-compound_selector:
- element_name {
- $$ = new CSSParserSelector(QualifiedName(nullAtom, $1, parser->m_defaultNamespace));
- }
- | element_name specifier_list {
- $$ = $2;
- if ($$) {
- QualifiedName elementName(nullAtom, $1, parser->m_defaultNamespace);
- parser->rewriteSpecifiersWithElementName(elementName, *$$);
- }
- }
- | specifier_list {
- $$ = $1;
- if ($$)
- parser->rewriteSpecifiersWithNamespaceIfNeeded(*$$);
- }
- | namespace_selector element_name {
- $$ = new CSSParserSelector(parser->determineNameInNamespace($1, $2));
- }
- | namespace_selector element_name specifier_list {
- $$ = $3;
- if ($$)
- parser->rewriteSpecifiersWithElementName($1, $2, *$$);
- }
- | namespace_selector specifier_list {
- $$ = $2;
- if ($$)
- parser->rewriteSpecifiersWithElementName($1, starAtom, *$$);
- }
- ;
-
-simple_selector_list:
- compound_selector %prec UNIMPORTANT_TOK {
- $$ = nullptr;
- if ($1) {
- $$ = parser->createSelectorVector().release();
- $$->append(std::unique_ptr<CSSParserSelector>($1));
- }
- }
- | simple_selector_list maybe_space ',' maybe_space compound_selector %prec UNIMPORTANT_TOK {
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> list($1);
- std::unique_ptr<CSSParserSelector> selector($5);
- $$ = nullptr;
- if (list && selector) {
- $$ = list.release();
- $$->append(WTFMove(selector));
- }
- }
- | simple_selector_list error {
- $$ = nullptr;
- delete $1;
- }
- ;
-
-element_name:
- IDENT {
- $$ = $1;
- }
- | '*' {
- static LChar star = '*';
- $$.init(&star, 1);
- }
- ;
-
-specifier_list:
- specifier
- | specifier_list specifier {
- std::unique_ptr<CSSParserSelector> list($1);
- std::unique_ptr<CSSParserSelector> specifier($2);
- $$ = nullptr;
- if (list && specifier)
- $$ = parser->rewriteSpecifiers(WTFMove(list), WTFMove(specifier)).release();
- }
- | specifier_list error {
- $$ = nullptr;
- delete $1;
- }
-;
-
-specifier:
- IDSEL {
- $$ = new CSSParserSelector;
- $$->setMatch(CSSSelector::Id);
- $$->setValue($1, parser->m_context.mode == HTMLQuirksMode);
- }
- | HEX {
- if (isASCIIDigit($1[0]))
- $$ = nullptr;
- else {
- $$ = new CSSParserSelector;
- $$->setMatch(CSSSelector::Id);
- $$->setValue($1, parser->m_context.mode == HTMLQuirksMode);
- }
- }
- | class
- | attrib
- | pseudo
- ;
-
-class:
- '.' IDENT {
- $$ = new CSSParserSelector;
- $$->setMatch(CSSSelector::Class);
- $$->setValue($2, parser->m_context.mode == HTMLQuirksMode);
- }
- ;
-
-attrib:
- '[' maybe_space IDENT maybe_space ']' {
- $$ = new CSSParserSelector;
- $$->setAttribute(QualifiedName(nullAtom, $3, nullAtom), parser->m_context.isHTMLDocument);
- $$->setMatch(CSSSelector::Set);
- }
- | '[' maybe_space IDENT maybe_space match maybe_space ident_or_string maybe_space attrib_flags ']' {
- $$ = new CSSParserSelector;
- $$->setAttribute(QualifiedName(nullAtom, $3, nullAtom), parser->m_context.isHTMLDocument);
- $$->setMatch($5);
- $$->setValue($7);
- $$->setAttributeValueMatchingIsCaseInsensitive($9);
- }
- | '[' maybe_space namespace_selector IDENT maybe_space ']' {
- $$ = new CSSParserSelector;
- $$->setAttribute(parser->determineNameInNamespace($3, $4), parser->m_context.isHTMLDocument);
- $$->setMatch(CSSSelector::Set);
- }
- | '[' maybe_space namespace_selector IDENT maybe_space match maybe_space ident_or_string maybe_space attrib_flags ']' {
- $$ = new CSSParserSelector;
- $$->setAttribute(parser->determineNameInNamespace($3, $4), parser->m_context.isHTMLDocument);
- $$->setMatch($6);
- $$->setValue($8);
- $$->setAttributeValueMatchingIsCaseInsensitive($10);
- }
- ;
-
-attrib_flags:
- IDENT maybe_space {
- if (UNLIKELY($1.length() != 1 || !isASCIIAlphaCaselessEqual($1[0], 'i')))
- YYERROR;
- $$ = true;
- }
- |
- /* empty */ {
- $$ = false;
- }
-
-match:
- '=' {
- $$ = CSSSelector::Exact;
- }
- | INCLUDES {
- $$ = CSSSelector::List;
- }
- | DASHMATCH {
- $$ = CSSSelector::Hyphen;
- }
- | BEGINSWITH {
- $$ = CSSSelector::Begin;
- }
- | ENDSWITH {
- $$ = CSSSelector::End;
- }
- | CONTAINS {
- $$ = CSSSelector::Contain;
- }
- ;
-
-ident_or_string: IDENT | STRING ;
-
-pseudo_page:
- ':' IDENT {
- $$ = CSSParserSelector::parsePagePseudoSelector($2);
- }
-
-nth_selector_ending:
- ')' {
- $$ = nullptr;
- }
- | space ')' {
- $$ = nullptr;
- }
- | space NTHCHILDSELECTORSEPARATOR space nested_selector_list maybe_space ')' {
- if ($4)
- $$ = $4;
- else
- YYERROR;
- }
- ;
-
-pseudo:
- ':' IDENT {
- $$ = CSSParserSelector::parsePseudoClassAndCompatibilityElementSelector($2);
- }
- | ':' ':' IDENT {
- $$ = CSSParserSelector::parsePseudoElementSelector($3);
- }
-#if ENABLE_VIDEO_TRACK
- // used by ::cue(:past/:future)
- | ':' ':' CUEFUNCTION maybe_space simple_selector_list maybe_space ')' {
- $$ = CSSParserSelector::parsePseudoElementCueFunctionSelector($3, $5);
- }
-#endif
- | ':' ':' SLOTTEDFUNCTION maybe_space compound_selector maybe_space ')' {
- $$ = CSSParserSelector::parsePseudoElementSlottedFunctionSelector($3, $5);
- }
- | ':' HOSTFUNCTION maybe_space compound_selector maybe_space ')' {
- $$ = CSSParserSelector::parsePseudoClassHostFunctionSelector($2, $4);
- }
- // use by :-webkit-any.
- // FIXME: should we support generic selectors here or just simple_selectors?
- // Use simple_selector_list for now to match -moz-any.
- // See http://lists.w3.org/Archives/Public/www-style/2010Sep/0566.html for some
- // related discussion with respect to :not.
- | ':' ANYFUNCTION maybe_space simple_selector_list maybe_space ')' {
- $$ = nullptr;
- if ($4) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->adoptSelectorVector(*std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($4));
- selector->setPseudoClassValue($2);
- if (selector->pseudoClassType() == CSSSelector::PseudoClassAny)
- $$ = selector.release();
- }
- }
- | ':' MATCHESFUNCTION maybe_space nested_selector_list maybe_space ')' {
- $$ = nullptr;
- if ($4) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->adoptSelectorVector(*std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($4));
- selector->setPseudoClassValue($2);
- if (selector->pseudoClassType() == CSSSelector::PseudoClassMatches)
- $$ = selector.release();
- }
- }
- | ':' LANGFUNCTION maybe_space comma_separated_lang_ranges maybe_space ')' {
- $$ = nullptr;
- if ($4) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setLangArgumentList(*std::unique_ptr<Vector<CSSParserString>>($4));
- selector->setPseudoClassValue($2);
- if (selector->pseudoClassType() == CSSSelector::PseudoClassLang)
- $$ = selector.release();
- }
- }
-
-#if ENABLE_CSS_SELECTORS_LEVEL4
- | ':' DIRFUNCTION maybe_space IDENT maybe_space ')' {
- $$ = nullptr;
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- if (selector->pseudoClassType() == CSSSelector::PseudoClassDir)
- $$ = selector.release();
- }
-
- | ':' ROLEFUNCTION maybe_space IDENT maybe_space ')' {
- $$ = nullptr;
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- if (selector->pseudoClassType() == CSSSelector::PseudoClassRole)
- $$ = selector.release();
- }
-#endif
-
- // Definition of :nth-child().
- | ':' NTHCHILDFUNCTIONS maybe_space NTH nth_selector_ending {
- $$ = nullptr;
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($5);
- if (selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- if (ending)
- selector->adoptSelectorVector(*ending);
- CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
- if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
- $$ = selector.release();
- }
- }
- | ':' NTHCHILDFUNCTIONS maybe_space maybe_unary_operator INTEGER nth_selector_ending {
- $$ = nullptr;
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($6);
- if (selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument(AtomicString::number($4 * $5));
- selector->setPseudoClassValue($2);
- if (ending)
- selector->adoptSelectorVector(*ending);
- CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
- if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
- $$ = selector.release();
- }
- }
- | ':' NTHCHILDFUNCTIONS maybe_space IDENT nth_selector_ending {
- $$ = nullptr;
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> ending($5);
- if (isValidNthToken($4) && selectorListDoesNotMatchAnyPseudoElement(ending.get())) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- if (ending)
- selector->adoptSelectorVector(*ending);
- CSSSelector::PseudoClassType pseudoClassType = selector->pseudoClassType();
- if (pseudoClassType == CSSSelector::PseudoClassNthChild || pseudoClassType == CSSSelector::PseudoClassNthLastChild)
- $$ = selector.release();
- }
- }
-
- // used by :nth-*(ax+b)
- | ':' FUNCTION maybe_space NTH maybe_space ')' {
- $$ = nullptr;
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- if (selector->pseudoClassType() != CSSSelector::PseudoClassUnknown)
- $$ = selector.release();
- }
- // used by :nth-*
- | ':' FUNCTION maybe_space maybe_unary_operator INTEGER maybe_space ')' {
- $$ = nullptr;
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument(AtomicString::number($4 * $5));
- selector->setPseudoClassValue($2);
- if (selector->pseudoClassType() != CSSSelector::PseudoClassUnknown)
- $$ = selector.release();
- }
- // used by :nth-*(odd/even) and :lang
- | ':' FUNCTION maybe_space IDENT maybe_space ')' {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setArgument($4);
- selector->setPseudoClassValue($2);
- CSSSelector::PseudoClassType type = selector->pseudoClassType();
- if (type == CSSSelector::PseudoClassUnknown)
- selector = nullptr;
- else if (type == CSSSelector::PseudoClassNthChild ||
- type == CSSSelector::PseudoClassNthOfType ||
- type == CSSSelector::PseudoClassNthLastChild ||
- type == CSSSelector::PseudoClassNthLastOfType) {
- if (!isValidNthToken($4))
- selector = nullptr;
- }
- $$ = selector.release();
- }
- // Definition of :not().
- | ':' NOTFUNCTION maybe_space nested_selector_list maybe_space ')' {
- $$ = nullptr;
- if ($4) {
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> list($4);
- if (selectorListDoesNotMatchAnyPseudoElement(list.get())) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->setPseudoClassValue($2);
- selector->adoptSelectorVector(*list);
- if (selector->pseudoClassType() == CSSSelector::PseudoClassNot)
- $$ = selector.release();
- }
- }
- }
- ;
-
-declaration_list:
- /* empty */ { $$ = false; }
- | declaration
- | decl_list declaration { $$ = $1 || $2; }
- | decl_list
- | decl_list_recovery { $$ = false; }
- | decl_list decl_list_recovery
- ;
-
-decl_list:
- declaration ';' maybe_space {
- parser->markPropertyStart();
- $$ = $1;
- }
- | decl_list_recovery ';' maybe_space {
- parser->markPropertyStart();
- $$ = false;
- }
- | decl_list declaration ';' maybe_space {
- parser->markPropertyStart();
- $$ = $1;
- if ($2)
- $$ = $2;
- }
- | decl_list decl_list_recovery ';' maybe_space {
- parser->markPropertyStart();
- $$ = $1;
- }
- ;
-
-decl_list_recovery:
- error error_location error_recovery {
- parser->syntaxError($2, CSSParser::PropertyDeclarationError);
- }
- ;
-
-declaration:
- CUSTOM_PROPERTY maybe_space ':' whitespace_or_expr priority {
- $$ = false;
- bool isPropertyParsed = false;
- std::unique_ptr<CSSParserValueList> propertyValue($4);
- if (propertyValue) {
- parser->m_valueList = WTFMove(propertyValue);
- int oldParsedProperties = parser->m_parsedProperties.size();
- parser->setCustomPropertyName($1);
- $$ = parser->parseValue(CSSPropertyCustom, $5);
- if (!$$)
- parser->rollbackLastProperties(parser->m_parsedProperties.size() - oldParsedProperties);
- else
- isPropertyParsed = true;
- parser->m_valueList = nullptr;
- }
- parser->markPropertyEnd($5, isPropertyParsed);
- }
- | property ':' maybe_space expr priority {
- $$ = false;
- bool isPropertyParsed = false;
- std::unique_ptr<CSSParserValueList> propertyValue($4);
- if ($1 && propertyValue) {
- parser->m_valueList = WTFMove(propertyValue);
- int oldParsedProperties = parser->m_parsedProperties.size();
- $$ = parser->parseValue($1, $5);
- if (!$$)
- parser->rollbackLastProperties(parser->m_parsedProperties.size() - oldParsedProperties);
- else
- isPropertyParsed = true;
- parser->m_valueList = nullptr;
- }
- parser->markPropertyEnd($5, isPropertyParsed);
- }
- | property declaration_recovery { $$ = false; }
- | property ':' maybe_space expr priority declaration_recovery {
- // When we encounter something like p {color: red !important fail;} we should drop the declaration.
- parser->markPropertyEnd(false, false);
- delete $4;
- $$ = false;
- }
- | IMPORTANT_SYM maybe_space declaration_recovery {
- // Handle this case -- div { text-align: center; !important } -- by just reducing away the stray !important.
- $$ = false;
- }
- | property ':' maybe_space declaration_recovery {
- // If we come across rules with invalid values like this case: p { weight: *; }, just discard the rule.
- parser->markPropertyEnd(false, false);
- $$ = false;
- }
- ;
-
-declaration_recovery: error error_location error_recovery { parser->syntaxError($2); } ;
-
-property: IDENT maybe_space { $$ = cssPropertyID($1); } ;
-
-priority: IMPORTANT_SYM maybe_space { $$ = true; } | /* empty */ { $$ = false; } ;
-
-#if ENABLE_CSS_GRID_LAYOUT
-
-ident_list:
- IDENT maybe_space {
- $$ = new CSSParserValueList;
- $$->addValue(makeIdentValue($1));
- }
- | ident_list IDENT maybe_space {
- $$ = $1;
- $$->addValue(makeIdentValue($2));
- }
- ;
-
-track_names_list:
- '[' maybe_space closing_bracket {
- $$.setFromValueList(std::make_unique<CSSParserValueList>());
- }
- | '[' maybe_space ident_list closing_bracket {
- $$.setFromValueList(std::unique_ptr<CSSParserValueList>($3));
- }
- | '[' maybe_space expr_recovery closing_bracket {
- $$.id = CSSValueInvalid;
- $$.unit = 0;
- YYERROR;
- }
- ;
-
-#endif
-
-whitespace_or_expr:
- WHITESPACE maybe_expr {
- if ($2)
- $$ = $2;
- else {
- CSSParserValue val;
- val.id = CSSValueInvalid;
- val.unit = CSSPrimitiveValue::CSS_PARSER_WHITESPACE;
- val.string.init(emptyString());
- $$ = new CSSParserValueList;
- $$->addValue(val);
- }
- }
- | maybe_space expr { $$ = $2; }
- ;
-
-maybe_expr: /* empty */ { $$ = nullptr; } | expr { $$ = $1; };
-
-expr: valid_expr | valid_expr expr_recovery { $$ = nullptr; delete $1; } ;
-
-valid_expr:
- term {
- $$ = new CSSParserValueList;
- $$->addValue($1);
- }
- | valid_expr operator term {
- $$ = $1;
- if (!$$)
- destroy($3);
- else {
- if ($2) {
- CSSParserValue v;
- v.id = CSSValueInvalid;
- v.unit = CSSParserValue::Operator;
- v.iValue = $2;
- $$->addValue(v);
- }
- $$->addValue($3);
- }
- }
- ;
-
-expr_recovery: error error_location error_recovery ;
-
-operator: '/' maybe_space { $$ = '/'; } | ',' maybe_space { $$ = ','; } | /* empty */ { $$ = 0; } ;
-
-term:
- unary_term maybe_space
- | unary_operator unary_term maybe_space { $$ = $2; $$.fValue *= $1; }
- | STRING maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_STRING; }
- | IDENT maybe_space { $$ = makeIdentValue($1); }
- /* We might need to actually parse the number from a dimension, but we can't just put something that uses $$.string into unary_term. */
- | DIMEN maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
- | unary_operator DIMEN maybe_space { $$.id = CSSValueInvalid; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
- | URI maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_URI; }
- | UNICODERANGE maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; }
- | HEX maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; }
- | '#' maybe_space { $$.id = CSSValueInvalid; $$.string = CSSParserString(); $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } /* Handle error case: "color: #;" */
- /* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */
- | function maybe_space
- | calc_function maybe_space
- | variable_function maybe_space
- | min_or_max_function maybe_space
- | '%' maybe_space { /* Handle width: %; */
- $$.id = CSSValueInvalid; $$.unit = 0;
- }
-#if ENABLE_CSS_GRID_LAYOUT
- | track_names_list maybe_space
-#endif
- ;
-
-unary_term:
- INTEGER { $$.id = CSSValueInvalid; $$.isInt = true; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_NUMBER; }
- | FLOATTOKEN { $$.id = CSSValueInvalid; $$.isInt = false; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_NUMBER; }
- | PERCENTAGE { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_PERCENTAGE; }
- | PXS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_PX; }
- | CMS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_CM; }
- | MMS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_MM; }
- | INS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_IN; }
- | PTS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_PT; }
- | PCS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_PC; }
- | DEGS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_DEG; }
- | RADS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_RAD; }
- | GRADS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_GRAD; }
- | TURNS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_TURN; }
- | MSECS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_MS; }
- | SECS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_S; }
- | HERTZ { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_HZ; }
- | KHERTZ { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_KHZ; }
- | EMS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_EMS; }
- | QEMS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSParserValue::Q_EMS; }
- | EXS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_EXS; }
- | REMS {
- $$.id = CSSValueInvalid;
- $$.fValue = $1;
- $$.unit = CSSPrimitiveValue::CSS_REMS;
- }
- | CHS { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_CHS; }
- | VW { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_VW; }
- | VH { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_VH; }
- | VMIN { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_VMIN; }
- | VMAX { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_VMAX; }
- | DPPX { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_DPPX; }
- | DPI { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_DPI; }
- | DPCM { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_DPCM; }
- | FR { $$.id = CSSValueInvalid; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_FR; }
- ;
-
-function:
- FUNCTION maybe_space expr closing_parenthesis {
- CSSParserFunction* f = new CSSParserFunction;
- f->name = $1;
- f->args = std::unique_ptr<CSSParserValueList>($3);
- $$.id = CSSValueInvalid;
- $$.unit = CSSParserValue::Function;
- $$.function = f;
- } |
- FUNCTION maybe_space closing_parenthesis {
- CSSParserFunction* f = new CSSParserFunction;
- f->name = $1;
- f->args = std::make_unique<CSSParserValueList>();
- $$.id = CSSValueInvalid;
- $$.unit = CSSParserValue::Function;
- $$.function = f;
- } |
- FUNCTION maybe_space expr_recovery closing_parenthesis {
- CSSParserFunction* f = new CSSParserFunction;
- f->name = $1;
- f->args = nullptr;
- $$.id = CSSValueInvalid;
- $$.unit = CSSParserValue::Function;
- $$.function = f;
- }
- ;
-
-variable_function:
- VARFUNCTION maybe_space CUSTOM_PROPERTY maybe_space closing_parenthesis {
- CSSParserVariable* var = new CSSParserVariable;
- var->name = $3;
- var->args = nullptr;
- $$.id = CSSValueInvalid;
- $$.unit = CSSParserValue::Variable;
- $$.variable = var;
- }
- | VARFUNCTION maybe_space CUSTOM_PROPERTY maybe_space ',' maybe_space expr closing_parenthesis {
- CSSParserVariable* var = new CSSParserVariable;
- var->name = $3;
- var->args = std::unique_ptr<CSSParserValueList>($7);
- $$.id = CSSValueInvalid;
- $$.unit = CSSParserValue::Variable;
- $$.variable = var;
- }
- | VARFUNCTION maybe_space CUSTOM_PROPERTY maybe_space ',' maybe_space closing_parenthesis {
- CSSParserVariable* var = new CSSParserVariable;
- var->name = $3;
- var->args = std::make_unique<CSSParserValueList>();
- $$.id = CSSValueInvalid;
- $$.unit = CSSParserValue::Variable;
- $$.variable = var;
- }
- // Error handling cases
- | VARFUNCTION maybe_space CUSTOM_PROPERTY maybe_space ',' closing_parenthesis {
- $$.id = CSSValueInvalid;
- $$.unit = 0;
- YYERROR;
- }
- | VARFUNCTION maybe_space CUSTOM_PROPERTY maybe_space ',' maybe_space invalid_var_fallback maybe_space closing_parenthesis {
- $$.id = CSSValueInvalid;
- $$.unit = 0;
- YYERROR;
- }
- | VARFUNCTION maybe_space CUSTOM_PROPERTY maybe_space ',' maybe_space priority closing_parenthesis {
- $$.id = CSSValueInvalid;
- $$.unit = 0;
- YYERROR;
- }
- | VARFUNCTION maybe_space expr closing_parenthesis {
- $$.id = CSSValueInvalid;
- $$.unit = 0;
- delete $3;
- YYERROR;
- }
- | VARFUNCTION maybe_space expr_recovery closing_parenthesis {
- $$.id = CSSValueInvalid;
- $$.unit = 0;
- YYERROR;
- }
- ;
-
-invalid_var_fallback:
- '!' | ';';
-
-calc_func_term:
- unary_term
- | unary_operator unary_term { $$ = $2; $$.fValue *= $1; }
- | variable_function
- ;
-
-/*
- * The grammar requires spaces around binary ‘+’ and ‘-’ operators.
- * The '*' and '/' operators do not require spaces.
- * http://www.w3.org/TR/css3-values/#calc-syntax
- */
-calc_func_operator:
- space '+' space {
- $$ = '+';
- }
- | space '-' space {
- $$ = '-';
- }
- | calc_maybe_space '*' maybe_space {
- $$ = '*';
- }
- | calc_maybe_space '/' maybe_space {
- $$ = '/';
- }
- ;
-
-calc_maybe_space: /* empty */ | WHITESPACE ;
-
-calc_func_paren_expr:
- '(' maybe_space calc_func_expr calc_maybe_space closing_parenthesis {
- $$ = nullptr;
- if ($3) {
- $$ = $3;
- CSSParserValue v;
- v.id = CSSValueInvalid;
- v.unit = CSSParserValue::Operator;
- v.iValue = '(';
- $$->insertValueAt(0, v);
- v.iValue = ')';
- $$->addValue(v);
- }
- }
- ;
-
-calc_func_expr: valid_calc_func_expr | valid_calc_func_expr expr_recovery { $$ = nullptr; delete $1; } ;
-
-valid_calc_func_expr:
- calc_func_term {
- $$ = new CSSParserValueList;
- $$->addValue($1);
- }
- | calc_func_expr calc_func_operator calc_func_term {
- std::unique_ptr<CSSParserValueList> expression($1);
- $$ = nullptr;
- if (expression && $2) {
- $$ = expression.release();
- CSSParserValue v;
- v.id = CSSValueInvalid;
- v.unit = CSSParserValue::Operator;
- v.iValue = $2;
- $$->addValue(v);
- $$->addValue($3);
- } else {
- destroy($3);
- }
-
- }
- | calc_func_expr calc_func_operator calc_func_paren_expr {
- std::unique_ptr<CSSParserValueList> left($1);
- std::unique_ptr<CSSParserValueList> right($3);
- $$ = nullptr;
- if (left && $2 && right) {
- CSSParserValue v;
- v.id = CSSValueInvalid;
- v.unit = CSSParserValue::Operator;
- v.iValue = $2;
- left->addValue(v);
- left->extend(*right);
- $$ = left.release();
- }
- }
- | calc_func_paren_expr
- ;
-
-calc_func_expr_list:
- calc_func_expr calc_maybe_space
- | calc_func_expr_list ',' maybe_space calc_func_expr calc_maybe_space {
- std::unique_ptr<CSSParserValueList> list($1);
- std::unique_ptr<CSSParserValueList> expression($4);
- $$ = nullptr;
- if (list && expression) {
- $$ = list.release();
- CSSParserValue v;
- v.id = CSSValueInvalid;
- v.unit = CSSParserValue::Operator;
- v.iValue = ',';
- $$->addValue(v);
- $$->extend(*expression);
- }
- }
- ;
-
-calc_function:
- CALCFUNCTION maybe_space calc_func_expr calc_maybe_space closing_parenthesis {
- CSSParserFunction* f = new CSSParserFunction;
- f->name = $1;
- f->args = std::unique_ptr<CSSParserValueList>($3);
- $$.id = CSSValueInvalid;
- $$.unit = CSSParserValue::Function;
- $$.function = f;
- }
- | CALCFUNCTION maybe_space expr_recovery closing_parenthesis {
- $$.id = CSSValueInvalid;
- $$.unit = 0;
- YYERROR;
- }
- ;
-
-
-min_or_max: MINFUNCTION | MAXFUNCTION ;
-
-min_or_max_function:
- min_or_max maybe_space calc_func_expr_list closing_parenthesis {
- CSSParserFunction* f = new CSSParserFunction;
- f->name = $1;
- f->args = std::unique_ptr<CSSParserValueList>($3);
- $$.id = CSSValueInvalid;
- $$.unit = CSSParserValue::Function;
- $$.function = f;
- }
- | min_or_max maybe_space expr_recovery closing_parenthesis {
- $$.id = CSSValueInvalid;
- $$.unit = 0;
- YYERROR;
- }
- ;
-
-/* error handling rules */
-
-save_block: closing_brace | error closing_brace ;
-
-invalid_at: ATKEYWORD error invalid_block | ATKEYWORD error ';' ;
-
-invalid_rule: error invalid_block ;
-
-invalid_block: '{' error_recovery closing_brace { parser->invalidBlockHit(); } ;
-
-invalid_square_brackets_block: '[' error_recovery closing_bracket ;
-
-invalid_parentheses_block: opening_parenthesis error_recovery closing_parenthesis;
-
-opening_parenthesis:
- '(' | FUNCTION | VARFUNCTION | CALCFUNCTION | MATCHESFUNCTION | MAXFUNCTION | MINFUNCTION | ANYFUNCTION | NOTFUNCTION | LANGFUNCTION
-#if ENABLE_CSS_SELECTORS_LEVEL4
- | DIRFUNCTION | ROLEFUNCTION
-#endif
-#if ENABLE_VIDEO_TRACK
- | CUEFUNCTION
-#endif
- ;
-
-error_location: { $$ = parser->currentLocation(); } ;
-
-error_recovery:
- /* empty */
- | error_recovery error
- | error_recovery invalid_block
- | error_recovery invalid_square_brackets_block
- | error_recovery invalid_parentheses_block
- ;
-
-%%
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryincludes"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSGrammar.y.includes (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.includes 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSGrammar.y.includes 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-%{
-
-/*
- * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
- * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#include "config.h"
-
-#include "CSSParser.h"
-#include "CSSParserMode.h"
-#include "CSSPrimitiveValue.h"
-#include "CSSPropertyNames.h"
-#include "CSSSelector.h"
-#include "CSSSelectorList.h"
-#include "Document.h"
-#include "HTMLNames.h"
-#include "MediaList.h"
-#include "MediaQueryExp.h"
-#include "StyleRule.h"
-#include "StyleSheetContents.h"
-#include "CSSKeyframeRule.h"
-#include "CSSKeyframesRule.h"
-#include <wtf/FastMalloc.h>
-#include <stdlib.h>
-#include <string.h>
-
-using namespace WebCore;
-using namespace HTMLNames;
-
-#if COMPILER(MSVC)
-// See https://msdn.microsoft.com/en-us/library/1wea5zwe.aspx
-#pragma warning(disable: 4701)
-#endif
-
-#define YYMALLOC fastMalloc
-#define YYFREE fastFree
-
-#define YYENABLE_NLS 0
-#define YYLTYPE_IS_TRIVIAL 1
-#define YYMAXDEPTH 10000
-#define YYDEBUG 0
-
-#if YYDEBUG > 0
-#include <wtf/text/CString.h>
-#define YYPRINT(File,Type,Value) if (isCSSTokenAString(Type)) YYFPRINTF(File, "%s", String((Value).string).utf8().data())
-#endif
-
-%}
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSGroupingRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGroupingRule.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGroupingRule.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSGroupingRule.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -66,9 +66,8 @@
</span><span class="cx"> return Exception { INDEX_SIZE_ERR };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CSSParser parser(parserContext());
</del><span class="cx"> CSSStyleSheet* styleSheet = parentStyleSheet();
</span><del>- RefPtr<StyleRuleBase> newRule = parser.parseRule(styleSheet ? &styleSheet->contents() : nullptr, ruleString);
</del><ins>+ RefPtr<StyleRuleBase> newRule = CSSParser::parseRule(parserContext(), styleSheet ? &styleSheet->contents() : nullptr, ruleString);
</ins><span class="cx"> if (!newRule) {
</span><span class="cx"> // SYNTAX_ERR: Raised if the specified rule has a syntax error and is unparsable.
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframeRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSKeyframeRule.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframeRule.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSKeyframeRule.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "StyleProperties.h"
</span><ins>+#include "StyleRule.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframesRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSKeyframesRule.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframesRule.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSKeyframesRule.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -113,8 +113,7 @@
</span><span class="cx"> ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
</span><span class="cx">
</span><span class="cx"> CSSParser parser(parserContext());
</span><del>- CSSStyleSheet* styleSheet = parentStyleSheet();
- RefPtr<StyleKeyframe> keyframe = parser.parseKeyframeRule(styleSheet ? &styleSheet->contents() : nullptr, ruleText);
</del><ins>+ RefPtr<StyleKeyframe> keyframe = parser.parseKeyframeRule(ruleText);
</ins><span class="cx"> if (!keyframe)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSNamespaceRulecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/CSSNamespaceRule.cpp (0 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSNamespaceRule.cpp (rev 0)
+++ trunk/Source/WebCore/css/CSSNamespaceRule.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CSSNamespaceRule.h"
+
+#include "CSSMarkup.h"
+#include "StyleRule.h"
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+CSSNamespaceRule::CSSNamespaceRule(StyleRuleNamespace& namespaceRule, CSSStyleSheet* parent)
+ : CSSRule(parent)
+ , m_namespaceRule(namespaceRule)
+{
+}
+
+CSSNamespaceRule::~CSSNamespaceRule()
+{
+}
+
+AtomicString CSSNamespaceRule::namespaceURI() const
+{
+ return m_namespaceRule->uri();
+}
+
+AtomicString CSSNamespaceRule::prefix() const
+{
+ return m_namespaceRule->prefix();
+}
+
+String CSSNamespaceRule::cssText() const
+{
+ StringBuilder result;
+ result.appendLiteral("@namespace ");
+ serializeIdentifier(prefix(), result);
+ if (!prefix().isEmpty())
+ result.append(' ');
+ result.append("url(");
+ result.append(serializeString(namespaceURI()));
+ result.append(");");
+ return result.toString();
+}
+
+void CSSNamespaceRule::reattach(StyleRuleBase&)
+{
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSNamespaceRuleh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/CSSNamespaceRule.h (0 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSNamespaceRule.h (rev 0)
+++ trunk/Source/WebCore/css/CSSNamespaceRule.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "CSSRule.h"
+
+namespace WebCore {
+
+class StyleRuleNamespace;
+
+class CSSNamespaceRule final : public CSSRule {
+public:
+ static Ref<CSSNamespaceRule> create(StyleRuleNamespace& rule, CSSStyleSheet* sheet) { return adoptRef(*new CSSNamespaceRule(rule, sheet)); }
+
+ virtual ~CSSNamespaceRule();
+
+ AtomicString namespaceURI() const;
+ AtomicString prefix() const;
+
+private:
+ CSSNamespaceRule(StyleRuleNamespace&, CSSStyleSheet*);
+
+ CSSRule::Type type() const final { return NAMESPACE_RULE; }
+ String cssText() const final;
+ void reattach(StyleRuleBase&) final;
+
+ Ref<StyleRuleNamespace> m_namespaceRule;
+};
+
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_CSS_RULE(CSSNamespaceRule, CSSRule::NAMESPACE_RULE)
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSNamespaceRuleidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/CSSNamespaceRule.idl (0 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSNamespaceRule.idl (rev 0)
+++ trunk/Source/WebCore/css/CSSNamespaceRule.idl 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+* Copyright (C) 2016 Apple Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+// https://drafts.csswg.org/cssom/#the-cssnamespacerule-interface
+
+interface CSSNamespaceRule : CSSRule {
+
+ readonly attribute DOMString namespaceURI;
+ readonly attribute DOMString prefix;
+
+};
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -109,11 +109,6 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_FONT_FAMILY:
</span><span class="cx"> case CSSPrimitiveValue::CSS_IDENT:
</span><span class="cx"> case CSSPrimitiveValue::CSS_PAIR:
</span><del>- case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR:
- case CSSPrimitiveValue::CSS_PARSER_IDENTIFIER:
- case CSSPrimitiveValue::CSS_PARSER_INTEGER:
- case CSSPrimitiveValue::CSS_PARSER_OPERATOR:
- case CSSPrimitiveValue::CSS_PARSER_WHITESPACE:
</del><span class="cx"> case CSSPrimitiveValue::CSS_PROPERTY_ID:
</span><span class="cx"> case CSSPrimitiveValue::CSS_QUAD:
</span><span class="cx"> case CSSPrimitiveValue::CSS_RECT:
</span><span class="lines">@@ -147,9 +142,6 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_ATTR:
</span><span class="cx"> case CSSPrimitiveValue::CSS_COUNTER_NAME:
</span><span class="cx"> case CSSPrimitiveValue::CSS_DIMENSION:
</span><del>- case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR:
- case CSSPrimitiveValue::CSS_PARSER_IDENTIFIER:
- case CSSPrimitiveValue::CSS_PARSER_WHITESPACE:
</del><span class="cx"> return true;
</span><span class="cx"> case CSSPrimitiveValue::CSS_CALC:
</span><span class="cx"> case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH:
</span><span class="lines">@@ -175,8 +167,6 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_MS:
</span><span class="cx"> case CSSPrimitiveValue::CSS_NUMBER:
</span><span class="cx"> case CSSPrimitiveValue::CSS_PAIR:
</span><del>- case CSSPrimitiveValue::CSS_PARSER_INTEGER:
- case CSSPrimitiveValue::CSS_PARSER_OPERATOR:
</del><span class="cx"> case CSSPrimitiveValue::CSS_PC:
</span><span class="cx"> case CSSPrimitiveValue::CSS_PERCENTAGE:
</span><span class="cx"> case CSSPrimitiveValue::CSS_PROPERTY_ID:
</span><span class="lines">@@ -327,13 +317,6 @@
</span><span class="cx"> m_value.propertyID = propertyID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSPrimitiveValue::CSSPrimitiveValue(int parserOperator)
- : CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_PARSER_OPERATOR;
- m_value.parserOperator = parserOperator;
-}
-
</del><span class="cx"> CSSPrimitiveValue::CSSPrimitiveValue(double num, UnitTypes type)
</span><span class="cx"> : CSSValue(PrimitiveClass)
</span><span class="cx"> {
</span><span class="lines">@@ -529,14 +512,10 @@
</span><span class="cx"> case CSS_URI:
</span><span class="cx"> case CSS_ATTR:
</span><span class="cx"> case CSS_COUNTER_NAME:
</span><del>- case CSS_DIMENSION:
- case CSS_PARSER_HEXCOLOR:
- case CSS_PARSER_IDENTIFIER:
- case CSS_PARSER_WHITESPACE:
- ASSERT(isStringType(type));
</del><span class="cx"> if (m_value.string)
</span><span class="cx"> m_value.string->deref();
</span><span class="cx"> break;
</span><ins>+ case CSS_DIMENSION:
</ins><span class="cx"> case CSS_COUNTER:
</span><span class="cx"> m_value.counter->deref();
</span><span class="cx"> break;
</span><span class="lines">@@ -581,7 +560,6 @@
</span><span class="cx"> m_value.color = nullptr;
</span><span class="cx"> break;
</span><span class="cx"> case CSS_NUMBER:
</span><del>- case CSS_PARSER_INTEGER:
</del><span class="cx"> case CSS_PERCENTAGE:
</span><span class="cx"> case CSS_EMS:
</span><span class="cx"> case CSS_QUIRKY_EMS:
</span><span class="lines">@@ -613,7 +591,6 @@
</span><span class="cx"> case CSS_IDENT:
</span><span class="cx"> case CSS_UNKNOWN:
</span><span class="cx"> case CSS_UNICODE_RANGE:
</span><del>- case CSS_PARSER_OPERATOR:
</del><span class="cx"> case CSS_PROPERTY_ID:
</span><span class="cx"> case CSS_VALUE_ID:
</span><span class="cx"> ASSERT(!isStringType(type));
</span><span class="lines">@@ -1014,7 +991,6 @@
</span><span class="cx"> case CSS_UNKNOWN:
</span><span class="cx"> return String();
</span><span class="cx"> case CSS_NUMBER:
</span><del>- case CSS_PARSER_INTEGER:
</del><span class="cx"> return formatNumberValue("");
</span><span class="cx"> case CSS_PERCENTAGE:
</span><span class="cx"> return formatNumberValue("%");
</span><span class="lines">@@ -1122,11 +1098,6 @@
</span><span class="cx"> case CSS_LENGTH_REPEAT:
</span><span class="cx"> return lengthRepeatValue()->cssText();
</span><span class="cx"> #endif
</span><del>- case CSS_PARSER_HEXCOLOR: {
- RGBA32 rgb;
- Color::parseHexColor((String)m_value.string, rgb);
- return Color(rgb).cssText();
- }
</del><span class="cx"> case CSS_RGBCOLOR:
</span><span class="cx"> return color().cssText();
</span><span class="cx"> case CSS_PAIR:
</span><span class="lines">@@ -1167,14 +1138,6 @@
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- case CSS_PARSER_OPERATOR: {
- char c = static_cast<char>(m_value.parserOperator);
- return String(&c, 1U);
- }
- case CSS_PARSER_IDENTIFIER:
- return m_value.string;
- case CSS_PARSER_WHITESPACE:
- return " ";
</del><span class="cx"> case CSS_CALC:
</span><span class="cx"> return m_value.calc->cssText();
</span><span class="cx"> case CSS_SHAPE:
</span><span class="lines">@@ -1258,7 +1221,6 @@
</span><span class="cx"> result = CSSPrimitiveValue::create(Ref<CSSBasicShape>(*m_value.shape));
</span><span class="cx"> break;
</span><span class="cx"> case CSS_NUMBER:
</span><del>- case CSS_PARSER_INTEGER:
</del><span class="cx"> case CSS_PERCENTAGE:
</span><span class="cx"> case CSS_EMS:
</span><span class="cx"> case CSS_QUIRKY_EMS:
</span><span class="lines">@@ -1302,10 +1264,6 @@
</span><span class="cx"> break;
</span><span class="cx"> case CSS_DIMENSION:
</span><span class="cx"> case CSS_UNKNOWN:
</span><del>- case CSS_PARSER_OPERATOR:
- case CSS_PARSER_IDENTIFIER:
- case CSS_PARSER_WHITESPACE:
- case CSS_PARSER_HEXCOLOR:
</del><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1323,7 +1281,6 @@
</span><span class="cx"> case CSS_UNKNOWN:
</span><span class="cx"> return false;
</span><span class="cx"> case CSS_NUMBER:
</span><del>- case CSS_PARSER_INTEGER:
</del><span class="cx"> case CSS_PERCENTAGE:
</span><span class="cx"> case CSS_EMS:
</span><span class="cx"> case CSS_QUIRKY_EMS:
</span><span class="lines">@@ -1362,9 +1319,6 @@
</span><span class="cx"> case CSS_URI:
</span><span class="cx"> case CSS_ATTR:
</span><span class="cx"> case CSS_COUNTER_NAME:
</span><del>- case CSS_PARSER_IDENTIFIER:
- case CSS_PARSER_HEXCOLOR:
- case CSS_PARSER_WHITESPACE:
</del><span class="cx"> return equal(m_value.string, other.m_value.string);
</span><span class="cx"> case CSS_COUNTER:
</span><span class="cx"> return m_value.counter && other.m_value.counter && m_value.counter->equals(*other.m_value.counter);
</span><span class="lines">@@ -1384,8 +1338,6 @@
</span><span class="cx"> case CSS_DASHBOARD_REGION:
</span><span class="cx"> return m_value.region && other.m_value.region && m_value.region->equals(*other.m_value.region);
</span><span class="cx"> #endif
</span><del>- case CSS_PARSER_OPERATOR:
- return m_value.parserOperator == other.m_value.parserOperator;
</del><span class="cx"> case CSS_CALC:
</span><span class="cx"> return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
</span><span class="cx"> case CSS_SHAPE:
</span><span class="lines">@@ -1396,77 +1348,4 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSPrimitiveValue::buildParserValue(CSSParserValue* result) const
-{
- switch (m_primitiveUnitType) {
- case CSS_VALUE_ID:
- result->id = m_value.valueID;
- result->unit = CSSPrimitiveValue::CSS_IDENT;
- result->string.init(valueName(m_value.valueID));
- break;
- case CSS_PARSER_IDENTIFIER:
- result->id = CSSValueInvalid;
- result->unit = CSSPrimitiveValue::CSS_IDENT;
- result->string.init(m_value.string);
- break;
- case CSS_NUMBER:
- case CSS_PERCENTAGE:
- case CSS_EMS:
- case CSS_QUIRKY_EMS:
- case CSS_EXS:
- case CSS_REMS:
- case CSS_PX:
- case CSS_CM:
-#if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY)
- case CSS_DPPX:
- case CSS_DPI:
- case CSS_DPCM:
-#endif
- case CSS_MM:
- case CSS_IN:
- case CSS_PT:
- case CSS_PC:
- case CSS_DEG:
- case CSS_RAD:
- case CSS_GRAD:
- case CSS_MS:
- case CSS_S:
- case CSS_HZ:
- case CSS_KHZ:
- case CSS_TURN:
- case CSS_VW:
- case CSS_VH:
- case CSS_VMIN:
- case CSS_FR:
- result->fValue = m_value.num;
- result->unit = m_primitiveUnitType;
- break;
- case CSS_PARSER_INTEGER:
- result->fValue = m_value.num;
- result->unit = CSSPrimitiveValue::CSS_NUMBER;
- result->isInt = true;
- break;
- case CSS_PARSER_OPERATOR:
- result->iValue = m_value.parserOperator;
- result->unit = CSSParserValue::Operator;
- break;
- case CSS_DIMENSION:
- case CSS_STRING:
- case CSS_URI:
- case CSS_ATTR:
- case CSS_COUNTER_NAME:
- case CSS_PARSER_HEXCOLOR:
- result->string.init(m_value.string);
- result->unit = m_primitiveUnitType;
- break;
- case CSS_PARSER_WHITESPACE:
- return false;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
-
- return true;
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> class RenderStyle;
</span><span class="cx">
</span><span class="cx"> struct CSSFontFamily;
</span><del>-struct CSSParserValue;
</del><span class="cx"> struct Length;
</span><span class="cx"> struct LengthSize;
</span><span class="cx">
</span><span class="lines">@@ -122,14 +121,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> CSS_UNICODE_RANGE = 102,
</span><span class="cx">
</span><del>- // These next types are just used internally to allow us to translate back and forth from CSSPrimitiveValues to CSSParserValues.
- CSS_PARSER_OPERATOR = 103,
- CSS_PARSER_INTEGER = 104,
- CSS_PARSER_HEXCOLOR = 105,
-
- // This is used internally for unknown identifiers
- CSS_PARSER_IDENTIFIER = 106,
-
</del><span class="cx"> // These are from CSS3 Values and Units, but that isn't a finished standard yet
</span><span class="cx"> CSS_TURN = 107,
</span><span class="cx"> CSS_REMS = 108,
</span><span class="lines">@@ -153,9 +144,6 @@
</span><span class="cx"> CSS_PROPERTY_ID = 117,
</span><span class="cx"> CSS_VALUE_ID = 118,
</span><span class="cx">
</span><del>- // More internal parse stuff for CSS variables
- CSS_PARSER_WHITESPACE = 119,
-
</del><span class="cx"> // This value is used to handle quirky margins in reflow roots (body, td, and th) like WinIE.
</span><span class="cx"> // The basic idea is that a stylesheet can use the value __qem (for quirky em) instead of em.
</span><span class="cx"> // When the quirky value is used, if you're in quirks mode, the margin will collapse away
</span><span class="lines">@@ -222,13 +210,9 @@
</span><span class="cx"> bool isViewportPercentageMin() const { return m_primitiveUnitType == CSS_VMIN; }
</span><span class="cx"> bool isValueID() const { return m_primitiveUnitType == CSS_VALUE_ID; }
</span><span class="cx"> bool isFlex() const { return primitiveType() == CSS_FR; }
</span><del>-
- bool isParserOperator() const { return primitiveType() == CSS_PARSER_OPERATOR; }
- int parserOperator() const { return isParserOperator() ? m_value.parserOperator : 0; }
</del><span class="cx">
</span><span class="cx"> static Ref<CSSPrimitiveValue> createIdentifier(CSSValueID valueID) { return adoptRef(*new CSSPrimitiveValue(valueID)); }
</span><span class="cx"> static Ref<CSSPrimitiveValue> createIdentifier(CSSPropertyID propertyID) { return adoptRef(*new CSSPrimitiveValue(propertyID)); }
</span><del>- static Ref<CSSPrimitiveValue> createParserOperator(int parserOperator) { return adoptRef(*new CSSPrimitiveValue(parserOperator)); }
</del><span class="cx">
</span><span class="cx"> static Ref<CSSPrimitiveValue> create(double value, UnitTypes type) { return adoptRef(*new CSSPrimitiveValue(value, type)); }
</span><span class="cx"> static Ref<CSSPrimitiveValue> create(const String& value, UnitTypes type) { return adoptRef(*new CSSPrimitiveValue(value, type)); }
</span><span class="lines">@@ -258,8 +242,6 @@
</span><span class="cx">
</span><span class="cx"> double computeDegrees() const;
</span><span class="cx">
</span><del>- bool buildParserValue(CSSParserValue*) const;
-
</del><span class="cx"> enum TimeUnit { Seconds, Milliseconds };
</span><span class="cx"> template<typename T, TimeUnit timeUnit> T computeTime() const;
</span><span class="cx">
</span><span class="lines">@@ -328,7 +310,6 @@
</span><span class="cx">
</span><span class="cx"> CSSPrimitiveValue(CSSValueID);
</span><span class="cx"> CSSPrimitiveValue(CSSPropertyID);
</span><del>- CSSPrimitiveValue(int parserOperator);
</del><span class="cx"> CSSPrimitiveValue(const Color&);
</span><span class="cx"> CSSPrimitiveValue(const Length&);
</span><span class="cx"> CSSPrimitiveValue(const Length&, const RenderStyle&);
</span><span class="lines">@@ -371,7 +352,6 @@
</span><span class="cx"> union {
</span><span class="cx"> CSSPropertyID propertyID;
</span><span class="cx"> CSSValueID valueID;
</span><del>- int parserOperator;
</del><span class="cx"> double num;
</span><span class="cx"> StringImpl* string;
</span><span class="cx"> Counter* counter;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSRule.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRule.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSRule.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> // <https://bugs.webkit.org/show_bug.cgi?id=71293>.
</span><span class="cx"> KEYFRAMES_RULE,
</span><span class="cx"> KEYFRAME_RULE,
</span><ins>+ NAMESPACE_RULE = 10, // Matches other browsers.
</ins><span class="cx"> SUPPORTS_RULE = 12,
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> WEBKIT_VIEWPORT_RULE = 15,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSRuleidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSRule.idl (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRule.idl 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSRule.idl 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> const unsigned short PAGE_RULE = 6;
</span><span class="cx"> const unsigned short KEYFRAMES_RULE = 7;
</span><span class="cx"> const unsigned short KEYFRAME_RULE = 8;
</span><ins>+ const unsigned short NAMESPACE_RULE = 10;
</ins><span class="cx"> const unsigned short SUPPORTS_RULE = 12;
</span><span class="cx"> [Conditional=CSS_DEVICE_ADAPTATION] const unsigned short WEBKIT_VIEWPORT_RULE = 15;
</span><span class="cx"> [Conditional=CSS_REGIONS] const unsigned short WEBKIT_REGION_RULE = 16;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -289,8 +289,7 @@
</span><span class="cx">
</span><span class="cx"> if (index > length())
</span><span class="cx"> return Exception { INDEX_SIZE_ERR };
</span><del>- CSSParser p(m_contents.get().parserContext());
- RefPtr<StyleRuleBase> rule = p.parseRule(m_contents.ptr(), ruleString);
</del><ins>+ RefPtr<StyleRuleBase> rule = CSSParser::parseRule(m_contents.get().parserContext(), m_contents.ptr(), ruleString);
</ins><span class="cx">
</span><span class="cx"> if (!rule)
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -60,9 +60,7 @@
</span><span class="cx"> #include "CSSUnicodeRangeValue.h"
</span><span class="cx"> #include "CSSUnsetValue.h"
</span><span class="cx"> #include "CSSValueList.h"
</span><del>-#include "CSSVariableDependentValue.h"
</del><span class="cx"> #include "CSSVariableReferenceValue.h"
</span><del>-#include "CSSVariableValue.h"
</del><span class="cx"> #include "SVGColor.h"
</span><span class="cx"> #include "SVGPaint.h"
</span><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="lines">@@ -246,10 +244,6 @@
</span><span class="cx"> return compareCSSValues<CSSVariableReferenceValue>(*this, other);
</span><span class="cx"> case PendingSubstitutionValueClass:
</span><span class="cx"> return compareCSSValues<CSSPendingSubstitutionValue>(*this, other);
</span><del>- case VariableDependentClass:
- return compareCSSValues<CSSVariableDependentValue>(*this, other);
- case VariableClass:
- return compareCSSValues<CSSVariableValue>(*this, other);
</del><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span><span class="lines">@@ -354,10 +348,6 @@
</span><span class="cx"> return downcast<CSSContentDistributionValue>(*this).customCSSText();
</span><span class="cx"> case CustomPropertyClass:
</span><span class="cx"> return downcast<CSSCustomPropertyValue>(*this).customCSSText();
</span><del>- case VariableDependentClass:
- return downcast<CSSVariableDependentValue>(*this).customCSSText();
- case VariableClass:
- return downcast<CSSVariableValue>(*this).customCSSText();
</del><span class="cx"> case CustomIdentClass:
</span><span class="cx"> return downcast<CSSCustomIdentValue>(*this).customCSSText();
</span><span class="cx"> case VariableReferenceClass:
</span><span class="lines">@@ -503,12 +493,6 @@
</span><span class="cx"> case CustomPropertyClass:
</span><span class="cx"> delete downcast<CSSCustomPropertyValue>(this);
</span><span class="cx"> return;
</span><del>- case VariableDependentClass:
- delete downcast<CSSVariableDependentValue>(this);
- return;
- case VariableClass:
- delete downcast<CSSVariableValue>(this);
- return;
</del><span class="cx"> case CustomIdentClass:
</span><span class="cx"> delete downcast<CSSCustomIdentValue>(this);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSValue.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -79,8 +79,6 @@
</span><span class="cx"> bool isCrossfadeValue() const { return m_classType == CrossfadeClass; }
</span><span class="cx"> bool isCursorImageValue() const { return m_classType == CursorImageClass; }
</span><span class="cx"> bool isCustomPropertyValue() const { return m_classType == CustomPropertyClass; }
</span><del>- bool isVariableDependentValue() const { return m_classType == VariableDependentClass; }
- bool isVariableValue() const { return m_classType == VariableClass; }
</del><span class="cx"> bool isFunctionValue() const { return m_classType == FunctionClass; }
</span><span class="cx"> bool isFontFeatureValue() const { return m_classType == FontFeatureClass; }
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="lines">@@ -129,7 +127,7 @@
</span><span class="cx"> bool isVariableReferenceValue() const { return m_classType == VariableReferenceClass; }
</span><span class="cx"> bool isPendingSubstitutionValue() const { return m_classType == PendingSubstitutionValueClass; }
</span><span class="cx">
</span><del>- bool hasVariableReferences() const { return isVariableDependentValue() || isVariableReferenceValue() || isPendingSubstitutionValue(); }
</del><ins>+ bool hasVariableReferences() const { return isVariableReferenceValue() || isPendingSubstitutionValue(); }
</ins><span class="cx">
</span><span class="cx"> bool isCSSOMSafe() const { return m_isCSSOMSafe; }
</span><span class="cx"> bool isSubtypeExposedToCSSOM() const
</span><span class="lines">@@ -204,12 +202,7 @@
</span><span class="cx">
</span><span class="cx"> CustomIdentClass,
</span><span class="cx">
</span><del>- // FIXME-NEWPARSER: Unify variables implementation.
</del><span class="cx"> CustomPropertyClass,
</span><del>- VariableDependentClass,
- VariableClass,
-
- // New variables implementation.
</del><span class="cx"> VariableReferenceClass,
</span><span class="cx"> PendingSubstitutionValueClass,
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueList.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueList.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSValueList.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -23,10 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSCustomPropertyValue.h"
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><del>-#include "CSSParserValues.h"
</del><span class="cx"> #include "CSSPrimitiveValue.h"
</span><del>-#include "CSSVariableDependentValue.h"
-#include "CSSVariableValue.h"
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -43,18 +40,6 @@
</span><span class="cx"> m_valueListSeparator = listSeparator;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSValueList::CSSValueList(CSSParserValueList& parserValues)
- : CSSValue(ValueListClass)
-{
- m_valueListSeparator = SpaceSeparator;
- m_values.reserveInitialCapacity(parserValues.size());
- for (unsigned i = 0, size = parserValues.size(); i < size; ++i) {
- RefPtr<CSSValue> value = parserValues.valueAt(i)->createCSSValue();
- ASSERT(value);
- m_values.uncheckedAppend(value.releaseNonNull());
- }
-}
-
</del><span class="cx"> bool CSSValueList::removeAll(CSSValue* value)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Why even take a pointer?
</span><span class="lines">@@ -119,13 +104,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (auto& value : m_values) {
</span><del>- bool suppressSeparator = false;
- if (m_valueListSeparator == SpaceSeparator && value->isPrimitiveValue()) {
- auto* primitiveValue = &downcast<CSSPrimitiveValue>(*value.ptr());
- if (primitiveValue->parserOperator() == ',')
- suppressSeparator = true;
- }
- if (!suppressSeparator && !result.isEmpty())
</del><ins>+ if (!result.isEmpty())
</ins><span class="cx"> result.append(separator);
</span><span class="cx"> result.append(value.get().cssText());
</span><span class="cx"> }
</span><span class="lines">@@ -179,112 +158,4 @@
</span><span class="cx"> return adoptRef(*new CSSValueList(*this));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-bool CSSValueList::containsVariables() const
-{
- for (unsigned i = 0; i < m_values.size(); i++) {
- if (m_values[i]->isVariableValue())
- return true;
- if (m_values[i]->isFunctionValue()) {
- auto& functionValue = downcast<CSSFunctionValue>(*item(i));
- CSSValueList* args = functionValue.arguments();
- if (args && args->containsVariables())
- return true;
- } else if (m_values[i]->isValueList()) {
- auto& listValue = downcast<CSSValueList>(*item(i));
- if (listValue.containsVariables())
- return true;
- }
- }
- return false;
-}
-
-bool CSSValueList::checkVariablesForCycles(CustomPropertyValueMap& customProperties, HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties) const
-{
- for (unsigned i = 0; i < m_values.size(); i++) {
- auto* value = item(i);
- if (value->isVariableValue()) {
- auto& variableValue = downcast<CSSVariableValue>(*value);
- if (seenProperties.contains(variableValue.name()))
- return false;
- RefPtr<CSSCustomPropertyValue> value = customProperties.get(variableValue.name());
- if (value && value->containsVariables() && !downcast<CSSVariableDependentValue>(*(value->deprecatedValue())).checkVariablesForCycles(variableValue.name(), customProperties, seenProperties, invalidProperties))
- return false;
-
- // Have to check the fallback values.
- auto* fallbackArgs = variableValue.fallbackArguments();
- if (!fallbackArgs || !fallbackArgs->length())
- continue;
-
- if (!fallbackArgs->checkVariablesForCycles(customProperties, seenProperties, invalidProperties))
- return false;
- } else if (value->isFunctionValue()) {
- auto& functionValue = downcast<CSSFunctionValue>(*value);
- auto* args = functionValue.arguments();
- if (args && !args->checkVariablesForCycles(customProperties, seenProperties, invalidProperties))
- return false;
- } else if (value->isValueList()) {
- auto& listValue = downcast<CSSValueList>(*value);
- if (!listValue.checkVariablesForCycles(customProperties, seenProperties, invalidProperties))
- return false;
- }
- }
- return true;
-}
-
-bool CSSValueList::buildParserValueSubstitutingVariables(CSSParserValue* result, const CustomPropertyValueMap& customProperties) const
-{
- result->id = CSSValueInvalid;
- result->unit = CSSParserValue::ValueList;
- result->valueList = new CSSParserValueList();
- return buildParserValueListSubstitutingVariables(result->valueList, customProperties);
-}
-
-bool CSSValueList::buildParserValueListSubstitutingVariables(CSSParserValueList* parserList, const CustomPropertyValueMap& customProperties) const
-{
- for (auto& value : m_values) {
- switch (value.get().classType()) {
- case FunctionClass: {
- CSSParserValue result;
- result.id = CSSValueInvalid;
- if (!downcast<CSSFunctionValue>(value.get()).buildParserValueSubstitutingVariables(&result, customProperties)) {
- WebCore::destroy(result);
- return false;
- }
- parserList->addValue(result);
- break;
- }
- case ValueListClass: {
- CSSParserValue result;
- result.id = CSSValueInvalid;
- if (!downcast<CSSValueList>(value.get()).buildParserValueSubstitutingVariables(&result, customProperties)) {
- WebCore::destroy(result);
- return false;
- }
- parserList->addValue(result);
- break;
- }
- case VariableClass: {
- if (!downcast<CSSVariableValue>(value.get()).buildParserValueListSubstitutingVariables(parserList, customProperties))
- return false;
- break;
- }
- case PrimitiveClass: {
- // FIXME: Will have to change this if we start preserving invalid tokens.
- CSSParserValue result;
- result.id = CSSValueInvalid;
- if (downcast<CSSPrimitiveValue>(value.get()).buildParserValue(&result))
- parserList->addValue(result);
- else
- WebCore::destroy(result);
- break;
- }
- default:
- ASSERT_NOT_REACHED();
- return false;
- }
- }
- return true;
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueList.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueList.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSValueList.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -46,10 +46,6 @@
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new CSSValueList(SlashSeparator));
</span><span class="cx"> }
</span><del>- static Ref<CSSValueList> createFromParserValueList(CSSParserValueList& list)
- {
- return adoptRef(*new CSSValueList(list));
- }
</del><span class="cx">
</span><span class="cx"> size_t length() const { return m_values.size(); }
</span><span class="cx"> CSSValue* item(size_t index) { return index < m_values.size() ? m_values[index].ptr() : nullptr; }
</span><span class="lines">@@ -76,12 +72,6 @@
</span><span class="cx">
</span><span class="cx"> Ref<CSSValueList> cloneForCSSOM() const;
</span><span class="cx">
</span><del>- bool containsVariables() const;
- bool checkVariablesForCycles(CustomPropertyValueMap& customProperties, HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties) const;
-
- bool buildParserValueListSubstitutingVariables(CSSParserValueList*, const CustomPropertyValueMap& customProperties) const;
- bool buildParserValueSubstitutingVariables(CSSParserValue*, const CustomPropertyValueMap& customProperties) const;
-
</del><span class="cx"> protected:
</span><span class="cx"> CSSValueList(ClassType, ValueListSeparator);
</span><span class="cx"> CSSValueList(const CSSValueList& cloneFrom);
</span><span class="lines">@@ -88,7 +78,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit CSSValueList(ValueListSeparator);
</span><del>- explicit CSSValueList(CSSParserValueList&);
</del><span class="cx">
</span><span class="cx"> Vector<Ref<CSSValue>, 4> m_values;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuePoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValuePool.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValuePool.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSValuePool.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -140,8 +140,13 @@
</span><span class="cx"> m_fontFaceValueCache.remove(m_fontFaceValueCache.begin());
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValueList>& value = m_fontFaceValueCache.add(string, nullptr).iterator->value;
</span><del>- if (!value)
- value = CSSParser::parseFontFaceValue(string);
</del><ins>+ if (value)
+ return value;
+
+ RefPtr<CSSValue> result = CSSParser::parseSingleValue(CSSPropertyFontFamily, string);
+ if (!result || !result->isValueList())
+ return value;
+ value = static_pointer_cast<CSSValueList>(result);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSVariableDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSVariableData.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSVariableData.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSVariableData.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "CSSCustomPropertyValue.h"
</span><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSParserTokenRange.h"
</span><ins>+#include <wtf/text/AtomicStringHash.h>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSVariableDependentValuecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSVariableDependentValue.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSVariableDependentValue.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSVariableDependentValue.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CSSVariableDependentValue.h"
-
-#include "CSSCustomPropertyValue.h"
-#include <wtf/text/AtomicStringHash.h>
-
-namespace WebCore {
-
-bool CSSVariableDependentValue::checkVariablesForCycles(const AtomicString& name, CustomPropertyValueMap& customProperties, const HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties)
-{
- if (invalidProperties.contains(name))
- return false;
-
- HashSet<AtomicString> newSeenProperties = seenProperties;
- newSeenProperties.add(name);
-
- bool valid = valueList().checkVariablesForCycles(customProperties, newSeenProperties, invalidProperties);
- if (!valid)
- invalidProperties.add(name);
-
- return valid;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSVariableDependentValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSVariableDependentValue.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSVariableDependentValue.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSVariableDependentValue.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,78 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "CSSPropertyNames.h"
-#include "CSSValueList.h"
-#include <wtf/RefPtr.h>
-
-// FIXME-NEWPARSER: This will be removed in favor of CSSVariableReferenceValue
-namespace WebCore {
-
-class CSSVariableDependentValue final : public CSSValue {
-public:
- static Ref<CSSVariableDependentValue> create(Ref<CSSValueList>&& valueList, CSSPropertyID propId)
- {
- return adoptRef(*new CSSVariableDependentValue(WTFMove(valueList), propId));
- }
-
- String customCSSText() const
- {
- if (!m_serialized) {
- m_serialized = true;
- m_stringValue = m_valueList->customCSSText();
- }
- return m_stringValue;
- }
-
- // FIXME: Should arguably implement equals on all of the CSSParserValues, but CSSValue equivalence
- // is rarely used, so serialization to compare is probably fine.
- bool equals(const CSSVariableDependentValue& other) const { return customCSSText() == other.customCSSText(); }
-
- CSSPropertyID propertyID() const { return m_propertyID; }
-
- CSSValueList& valueList() { return m_valueList.get(); }
- const CSSValueList& valueList() const { return m_valueList.get(); }
-
- bool checkVariablesForCycles(const AtomicString& name, CustomPropertyValueMap& customProperties, const HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties);
-
-private:
- CSSVariableDependentValue(Ref<CSSValueList>&& valueList, CSSPropertyID propId)
- : CSSValue(VariableDependentClass)
- , m_valueList(WTFMove(valueList))
- , m_propertyID(propId)
- {
- }
-
- Ref<CSSValueList> m_valueList;
- CSSPropertyID m_propertyID;
- mutable String m_stringValue;
- mutable bool m_serialized { false };
-};
-
-} // namespace WebCore
-
-SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSVariableDependentValue, isVariableDependentValue())
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSVariableValuecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSVariableValue.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSVariableValue.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSVariableValue.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,86 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CSSVariableValue.h"
-
-#include "CSSCustomPropertyValue.h"
-#include "CSSParserValues.h"
-#include "CSSValueList.h"
-#include "CSSVariableDependentValue.h"
-#include <wtf/text/StringBuilder.h>
-
-namespace WebCore {
-
-CSSVariableValue::CSSVariableValue(CSSParserVariable* variable)
- : CSSValue(VariableClass)
- , m_name(variable->name)
-{
- if (variable->args)
- m_fallbackArguments = CSSValueList::createFromParserValueList(*variable->args);
-}
-
-CSSVariableValue::CSSVariableValue(const String& name, PassRefPtr<CSSValueList> fallbackArgs)
- : CSSValue(VariableClass)
- , m_name(name)
- , m_fallbackArguments(fallbackArgs)
-{
-}
-
-String CSSVariableValue::customCSSText() const
-{
- StringBuilder result;
- result.append("var(");
- result.append(m_name);
- if (m_fallbackArguments) {
- result.append(", ");
- result.append(m_fallbackArguments->cssText());
- }
- result.append(")");
- return result.toString();
-}
-
-bool CSSVariableValue::equals(const CSSVariableValue& other) const
-{
- return m_name == other.m_name && compareCSSValuePtr(m_fallbackArguments, other.m_fallbackArguments);
-}
-
-bool CSSVariableValue::buildParserValueListSubstitutingVariables(CSSParserValueList* resultList, const CustomPropertyValueMap& customProperties) const
-{
- if (RefPtr<CSSCustomPropertyValue> customPropertyValue = customProperties.get(m_name)) {
- auto value = customPropertyValue->deprecatedValue();
- if (value && value->isValueList())
- return downcast<CSSValueList>(*value).buildParserValueListSubstitutingVariables(resultList, customProperties);
- if (value && value->isVariableDependentValue())
- return downcast<CSSVariableDependentValue>(*value).valueList().buildParserValueListSubstitutingVariables(resultList, customProperties);
- }
-
- // We failed to substitute the variable. If it has fallback arguments, use those instead.
- if (!fallbackArguments() || !fallbackArguments()->length())
- return false;
- return fallbackArguments()->buildParserValueListSubstitutingVariables(resultList, customProperties);
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSVariableValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSVariableValue.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSVariableValue.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/CSSVariableValue.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "CSSValue.h"
-
-// FIXME-NEWPARSER: This will be removed in favor of the new variables implementation.
-namespace WebCore {
-
-class CSSValueList;
-class CSSParserValueList;
-struct CSSParserVariable;
-
-class CSSVariableValue final : public CSSValue {
-public:
- static Ref<CSSVariableValue> create(CSSParserVariable* Variable)
- {
- return adoptRef(*new CSSVariableValue(Variable));
- }
-
- static Ref<CSSVariableValue> create(const String& name, PassRefPtr<CSSValueList> fallbackArguments)
- {
- return adoptRef(*new CSSVariableValue(name, fallbackArguments));
- }
-
- String customCSSText() const;
-
- bool equals(const CSSVariableValue&) const;
-
- const String& name() const { return m_name; }
- CSSValueList* fallbackArguments() const { return m_fallbackArguments.get(); }
-
- bool buildParserValueListSubstitutingVariables(CSSParserValueList*, const CustomPropertyValueMap& customProperties) const;
-
-private:
- explicit CSSVariableValue(CSSParserVariable*);
- CSSVariableValue(const String&, PassRefPtr<CSSValueList>);
-
- String m_name;
- RefPtr<CSSValueList> m_fallbackArguments;
-};
-
-} // namespace WebCore
-
-SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSVariableValue, isVariableValue())
</del></span></pre></div>
<a id="trunkSourceWebCorecssDOMCSSNamespacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMCSSNamespace.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMCSSNamespace.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/DOMCSSNamespace.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSMarkup.h"
</span><span class="cx"> #include "CSSParser.h"
</span><ins>+#include "CSSPropertyParser.h"
</ins><span class="cx"> #include "StyleProperties.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/FontFace.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "CSSFontFeatureValue.h"
</span><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSUnicodeRangeValue.h"
</span><ins>+#include "CSSValueList.h"
</ins><span class="cx"> #include "CSSValuePool.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "FontVariantBuilder.h"
</span><span class="lines">@@ -126,10 +127,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> FontFace::parseString(const String& string, CSSPropertyID propertyID)
</span><span class="cx"> {
</span><del>- auto style = MutableStyleProperties::create();
- if (CSSParser::parseValue(style, propertyID, string, true, HTMLStandardMode, nullptr) == CSSParser::ParseResult::Error)
- return nullptr;
- return style->getPropertyCSSValue(propertyID);
</del><ins>+ // FIXME: Should use the Document to get the right parsing mode.
+ return CSSParser::parseFontFaceDescriptor(propertyID, string, HTMLStandardMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> FontFace::setFamily(const String& family)
</span></span></pre></div>
<a id="trunkSourceWebCorecssInspectorCSSOMWrapperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "CSSDefaultStyleSheets.h"
</span><span class="cx"> #include "CSSImportRule.h"
</span><span class="cx"> #include "CSSMediaRule.h"
</span><ins>+#include "CSSNamespaceRule.h"
</ins><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryExp.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryExp.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/MediaQueryExp.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -122,80 +122,6 @@
</span><span class="cx"> return mediaFeature == MediaFeatureNames::grid;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isFeatureValidWithIdentifier(const AtomicString& mediaFeature, CSSValueID id)
-{
- if (!id)
- return false;
-
- return featureWithValidIdent(mediaFeature);
-}
-
-static inline bool isFeatureValidWithNonNegativeLengthOrNumber(const AtomicString& mediaFeature, const CSSParserValue& value)
-{
- if (!(CSSPrimitiveValue::isLength(static_cast<CSSPrimitiveValue::UnitTypes>(value.unit)) || value.unit == CSSPrimitiveValue::CSS_NUMBER) || value.fValue < 0)
- return false;
-
- return mediaFeature == MediaFeatureNames::height
- || mediaFeature == MediaFeatureNames::maxHeight
- || mediaFeature == MediaFeatureNames::minHeight
- || mediaFeature == MediaFeatureNames::width
- || mediaFeature == MediaFeatureNames::maxWidth
- || mediaFeature == MediaFeatureNames::minWidth
- || mediaFeature == MediaFeatureNames::deviceHeight
- || mediaFeature == MediaFeatureNames::maxDeviceHeight
- || mediaFeature == MediaFeatureNames::minDeviceHeight
- || mediaFeature == MediaFeatureNames::deviceWidth
- || mediaFeature == MediaFeatureNames::maxDeviceWidth
- || mediaFeature == MediaFeatureNames::minDeviceWidth;
-}
-
-static inline bool isFeatureValidWithDensity(const AtomicString& mediaFeature, const CSSParserValue& value)
-{
- if (!CSSPrimitiveValue::isResolution(static_cast<CSSPrimitiveValue::UnitTypes>(value.unit)) || value.fValue <= 0)
- return false;
-
- return mediaFeature == MediaFeatureNames::resolution
- || mediaFeature == MediaFeatureNames::maxResolution
- || mediaFeature == MediaFeatureNames::minResolution;
-}
-
-static inline bool isFeatureValidWithNonNegativeInteger(const AtomicString& mediaFeature, const CSSParserValue& value)
-{
- if (!value.isInt || value.fValue < 0)
- return false;
-
- return mediaFeature == MediaFeatureNames::color
- || mediaFeature == MediaFeatureNames::maxColor
- || mediaFeature == MediaFeatureNames::minColor
- || mediaFeature == MediaFeatureNames::colorIndex
- || mediaFeature == MediaFeatureNames::maxColorIndex
- || mediaFeature == MediaFeatureNames::minColorIndex
- || mediaFeature == MediaFeatureNames::minMonochrome
- || mediaFeature == MediaFeatureNames::maxMonochrome;
-}
-
-static inline bool isFeatureValidWithNonNegativeNumber(const AtomicString& mediaFeature, const CSSParserValue& value)
-{
- if (value.unit != CSSPrimitiveValue::CSS_NUMBER || value.fValue < 0)
- return false;
-
- return mediaFeature == MediaFeatureNames::transform2d
- || mediaFeature == MediaFeatureNames::transform3d
- || mediaFeature == MediaFeatureNames::transition
- || mediaFeature == MediaFeatureNames::animation
- || mediaFeature == MediaFeatureNames::devicePixelRatio
- || mediaFeature == MediaFeatureNames::maxDevicePixelRatio
- || mediaFeature == MediaFeatureNames::minDevicePixelRatio;
-}
-
-static inline bool isFeatureValidWithZeroOrOne(const AtomicString& mediaFeature, const CSSParserValue& value)
-{
- if (!value.isInt || !(value.fValue == 1 || !value.fValue))
- return false;
-
- return mediaFeature == MediaFeatureNames::grid;
-}
-
</del><span class="cx"> static inline bool isAspectRatioFeature(const AtomicString& mediaFeature)
</span><span class="cx"> {
</span><span class="cx"> return mediaFeature == MediaFeatureNames::aspectRatio
</span><span class="lines">@@ -238,56 +164,6 @@
</span><span class="cx"> || mediaFeature == MediaFeatureNames::videoPlayableInline;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isFeatureValidWithNumberWithUnit(const AtomicString& mediaFeature, const CSSParserValue& value)
-{
- return isFeatureValidWithDensity(mediaFeature, value) || isFeatureValidWithNonNegativeLengthOrNumber(mediaFeature, value);
-}
-
-static inline bool isFeatureValidWithNumber(const AtomicString& mediaFeature, const CSSParserValue& value)
-{
- return isFeatureValidWithNonNegativeInteger(mediaFeature, value) || isFeatureValidWithNonNegativeNumber(mediaFeature, value) || isFeatureValidWithZeroOrOne(mediaFeature, value);
-}
-
-static inline bool isSlash(CSSParserValue& value)
-{
- return value.unit == CSSParserValue::Operator && value.iValue == '/';
-}
-
-static inline bool isPositiveIntegerValue(CSSParserValue& value)
-{
- return value.unit == CSSPrimitiveValue::CSS_NUMBER && value.fValue > 0 && value.isInt;
-}
-
-MediaQueryExpression::MediaQueryExpression(const AtomicString& mediaFeature, CSSParserValueList* valueList)
- : m_mediaFeature(mediaFeature)
-{
- if (!valueList) {
- if (isFeatureValidWithoutValue(mediaFeature))
- m_isValid = true;
- } else if (valueList->size() == 1) {
- auto& value = *valueList->valueAt(0);
- if (isFeatureValidWithIdentifier(mediaFeature, value.id)) {
- m_value = CSSPrimitiveValue::createIdentifier(value.id);
- m_isValid = true;
- } else if (isFeatureValidWithNumberWithUnit(mediaFeature, value) || isFeatureValidWithNonNegativeLengthOrNumber(mediaFeature, value)) {
- m_value = CSSPrimitiveValue::create(value.fValue, (CSSPrimitiveValue::UnitTypes) value.unit);
- m_isValid = true;
- } else if (isFeatureValidWithNumber(mediaFeature, value)) {
- // FIXME: Can we merge this with the case above?
- m_value = CSSPrimitiveValue::create(value.fValue, CSSPrimitiveValue::CSS_NUMBER);
- m_isValid = true;
- }
- } else if (valueList->size() == 3 && isAspectRatioFeature(mediaFeature)) {
- auto& numerator = *valueList->valueAt(0);
- auto& slash = *valueList->valueAt(1);
- auto& denominator = *valueList->valueAt(2);
- if (isPositiveIntegerValue(numerator) && isSlash(slash) && isPositiveIntegerValue(denominator)) {
- m_value = CSSAspectRatioValue::create(numerator.fValue, denominator.fValue);
- m_isValid = true;
- }
- }
-}
-
</del><span class="cx"> MediaQueryExpression::MediaQueryExpression(const String& feature, const Vector<CSSParserToken, 4>& tokenList)
</span><span class="cx"> : m_mediaFeature(feature.convertToASCIILowercase())
</span><span class="cx"> , m_isValid(false)
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryExph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryExp.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryExp.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/MediaQueryExp.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -33,13 +33,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class CSSParserValueList;
-
</del><span class="cx"> // FIXME: Rename the file to match this class's name.
</span><span class="cx"> class MediaQueryExpression {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- explicit MediaQueryExpression(const AtomicString& mediaFeature = emptyAtom, CSSParserValueList* values = nullptr);
</del><span class="cx"> explicit MediaQueryExpression(const String& mediaFeature, const Vector<CSSParserToken, 4>& tokenList);
</span><span class="cx">
</span><span class="cx"> const AtomicString& mediaFeature() const;
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSCustomPropertyValue.h"
</span><del>-#include "CSSParser.h"
</del><ins>+#include "CSSPropertyParser.h"
</ins><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "CustomElementReactionQueue.h"
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> if (!willMutate())
</span><span class="cx"> return { };
</span><span class="cx">
</span><del>- bool changed = m_propertySet->parseDeclaration(text, cssParserContext(), contextStyleSheet());
</del><ins>+ bool changed = m_propertySet->parseDeclaration(text, cssParserContext());
</ins><span class="cx">
</span><span class="cx"> didMutate(changed ? PropertyChanged : NoChanges);
</span><span class="cx">
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">
</span><span class="cx"> bool changed;
</span><span class="cx"> if (propertyID == CSSPropertyCustom)
</span><del>- changed = m_propertySet->setCustomProperty(propertyName, value, important, cssParserContext(), contextStyleSheet());
</del><ins>+ changed = m_propertySet->setCustomProperty(propertyName, value, important, cssParserContext());
</ins><span class="cx"> else
</span><span class="cx"> changed = m_propertySet->setProperty(propertyID, value, important, cssParserContext(), contextStyleSheet());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorPseudoTypeMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorPseudoTypeMap.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorPseudoTypeMap.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/SelectorPseudoTypeMap.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -29,14 +29,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-struct CSSParserString;
-
</del><span class="cx"> struct PseudoClassOrCompatibilityPseudoElement {
</span><span class="cx"> CSSSelector::PseudoClassType pseudoClass;
</span><span class="cx"> CSSSelector::PseudoElementType compatibilityPseudoElement;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-PseudoClassOrCompatibilityPseudoElement parsePseudoClassAndCompatibilityElementString(const CSSParserString& pseudoTypeString);
</del><span class="cx"> PseudoClassOrCompatibilityPseudoElement parsePseudoClassAndCompatibilityElementString(const StringView& pseudoTypeString);
</span><span class="cx"> CSSSelector::PseudoElementType parsePseudoElementString(const StringImpl& pseudoTypeString);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><span class="cx"> #include "CSSValueList.h"
</span><span class="cx"> #include "CSSValuePool.h"
</span><del>-#include "CSSVariableDependentValue.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "PropertySetCSSStyleDeclaration.h"
</span><span class="cx"> #include "StylePropertyShorthand.h"
</span><span class="lines">@@ -132,8 +131,6 @@
</span><span class="cx"> RefPtr<CSSValue> value = getPropertyCSSValueInternal(shorthand.properties()[0]);
</span><span class="cx"> if (!value)
</span><span class="cx"> return String();
</span><del>- if (value->isVariableDependentValue())
- return value->cssText();
</del><span class="cx"> if (value->isPendingSubstitutionValue())
</span><span class="cx"> return downcast<CSSPendingSubstitutionValue>(*value).shorthandValue()->cssText();
</span><span class="cx"> }
</span><span class="lines">@@ -608,14 +605,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> StyleProperties::getPropertyCSSValue(CSSPropertyID propertyID) const
</span><span class="cx"> {
</span><del>- RefPtr<CSSValue> value = getPropertyCSSValueInternal(propertyID);
- if (value && value->isVariableDependentValue()) {
- auto& dependentValue = downcast<CSSVariableDependentValue>(*value);
- if (dependentValue.propertyID() != propertyID)
- return CSSCustomPropertyValue::createInvalid(); // Have to return special "pending-substitution" value.
- }
-
- return value;
</del><ins>+ return getPropertyCSSValueInternal(propertyID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> StyleProperties::getPropertyCSSValueInternal(CSSPropertyID propertyID) const
</span><span class="lines">@@ -749,7 +739,7 @@
</span><span class="cx"> return setProperty(propertyID, value, important, parserContext);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MutableStyleProperties::setCustomProperty(const String& propertyName, const String& value, bool important, CSSParserContext parserContext, StyleSheetContents* contextStyleSheet)
</del><ins>+bool MutableStyleProperties::setCustomProperty(const String& propertyName, const String& value, bool important, CSSParserContext parserContext)
</ins><span class="cx"> {
</span><span class="cx"> // Setting the value to an empty string just removes the property in both IE and Gecko.
</span><span class="cx"> // Setting it to null seems to produce less consistent results, but we treat it just the same.
</span><span class="lines">@@ -759,7 +749,7 @@
</span><span class="cx"> parserContext.mode = cssParserMode();
</span><span class="cx"> // When replacing an existing property value, this moves the property to the end of the list.
</span><span class="cx"> // Firefox preserves the position, and MSIE moves the property to the beginning.
</span><del>- return CSSParser::parseCustomPropertyValue(*this, propertyName, value, important, parserContext, contextStyleSheet) == CSSParser::ParseResult::Changed;
</del><ins>+ return CSSParser::parseCustomPropertyValue(*this, propertyName, value, important, parserContext) == CSSParser::ParseResult::Changed;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MutableStyleProperties::setProperty(CSSPropertyID propertyID, RefPtr<CSSValue>&& value, bool important)
</span><span class="lines">@@ -811,7 +801,7 @@
</span><span class="cx"> return setProperty(CSSProperty(propertyID, CSSValuePool::singleton().createIdentifierValue(identifier), important));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MutableStyleProperties::parseDeclaration(const String& styleDeclaration, CSSParserContext context, StyleSheetContents* contextStyleSheet)
</del><ins>+bool MutableStyleProperties::parseDeclaration(const String& styleDeclaration, CSSParserContext context)
</ins><span class="cx"> {
</span><span class="cx"> auto oldProperties = WTFMove(m_propertyVector);
</span><span class="cx"> m_propertyVector.clear();
</span><span class="lines">@@ -819,7 +809,7 @@
</span><span class="cx"> context.mode = cssParserMode();
</span><span class="cx">
</span><span class="cx"> CSSParser parser(context);
</span><del>- parser.parseDeclaration(*this, styleDeclaration, 0, contextStyleSheet);
</del><ins>+ parser.parseDeclaration(*this, styleDeclaration);
</ins><span class="cx">
</span><span class="cx"> // We could do better. Just changing property order does not require style invalidation.
</span><span class="cx"> return oldProperties != m_propertyVector;
</span><span class="lines">@@ -868,11 +858,7 @@
</span><span class="cx"> CSSPropertyID borderFallbackShorthandProperty = CSSPropertyInvalid;
</span><span class="cx"> String value;
</span><span class="cx">
</span><del>- if (property.value() && property.value()->isVariableDependentValue()) {
- auto& dependentValue = downcast<CSSVariableDependentValue>(*property.value());
- if (dependentValue.propertyID() != propertyID)
- shorthandPropertyID = dependentValue.propertyID();
- } else if (property.value() && property.value()->isPendingSubstitutionValue()) {
</del><ins>+ if (property.value() && property.value()->isPendingSubstitutionValue()) {
</ins><span class="cx"> auto& substitutionValue = downcast<CSSPendingSubstitutionValue>(*property.value());
</span><span class="cx"> shorthandPropertyID = substitutionValue.shorthandPropertyId();
</span><span class="cx"> value = substitutionValue.shorthandValue()->cssText();
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/StyleProperties.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> void mergeAndOverrideOnConflict(const StyleProperties&);
</span><span class="cx">
</span><span class="cx"> void clear();
</span><del>- bool parseDeclaration(const String& styleDeclaration, CSSParserContext, StyleSheetContents* = nullptr);
</del><ins>+ bool parseDeclaration(const String& styleDeclaration, CSSParserContext);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT CSSStyleDeclaration* ensureCSSStyleDeclaration();
</span><span class="cx"> CSSStyleDeclaration* ensureInlineCSSStyleDeclaration(StyledElement* parentElement);
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> Vector<CSSProperty, 4> m_propertyVector;
</span><span class="cx">
</span><span class="cx"> // Methods for querying and altering CSS custom properties.
</span><del>- bool setCustomProperty(const String& propertyName, const String& value, bool important, CSSParserContext, StyleSheetContents* = nullptr);
</del><ins>+ bool setCustomProperty(const String& propertyName, const String& value, bool important, CSSParserContext);
</ins><span class="cx"> bool removeCustomProperty(const String& propertyName, String* returnText = nullptr);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include "CSSFontSelector.h"
</span><span class="cx"> #include "CSSFontValue.h"
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><ins>+#include "CSSGradientValue.h"
</ins><span class="cx"> #include "CSSImageSetValue.h"
</span><span class="cx"> #include "CSSInheritedValue.h"
</span><span class="cx"> #include "CSSInitialValue.h"
</span><span class="lines">@@ -61,7 +62,6 @@
</span><span class="cx"> #include "CSSTimingFunctionValue.h"
</span><span class="cx"> #include "CSSValueList.h"
</span><span class="cx"> #include "CSSValuePool.h"
</span><del>-#include "CSSVariableDependentValue.h"
</del><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "CachedSVGDocument.h"
</span><span class="lines">@@ -1609,13 +1609,8 @@
</span><span class="cx"> CSSValueID customPropertyValueID = CSSValueInvalid;
</span><span class="cx">
</span><span class="cx"> if (id == CSSPropertyCustom) {
</span><del>- // FIXME-NEWPARSER: Can clean this up once old parser is gone and remove
- // the deprecatedValue call and the valueToCheckForInheritInitial variable.
</del><span class="cx"> customPropertyValue = &downcast<CSSCustomPropertyValue>(*valueToApply);
</span><del>- valueToCheckForInheritInitial = customPropertyValue->deprecatedValue().get();
</del><span class="cx"> customPropertyValueID = customPropertyValue->valueID();
</span><del>- if (customPropertyValueID != CSSValueInvalid)
- valueToCheckForInheritInitial = valueToApply.get();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isInherit = state.parentStyle() ? valueToCheckForInheritInitial->isInheritedValue() || customPropertyValueID == CSSValueInherit : false;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/StyleResolver.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> class CSSProperty;
</span><span class="cx"> class CSSStyleSheet;
</span><span class="cx"> class CSSValue;
</span><del>-class CSSVariableDependentValue;
</del><span class="cx"> class ContainerNode;
</span><span class="cx"> class Document;
</span><span class="cx"> class Element;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/StyleRule.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "CSSKeyframeRule.h"
</span><span class="cx"> #include "CSSKeyframesRule.h"
</span><span class="cx"> #include "CSSMediaRule.h"
</span><ins>+#include "CSSNamespaceRule.h"
</ins><span class="cx"> #include "CSSPageRule.h"
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="cx"> #include "CSSSupportsRule.h"
</span><span class="lines">@@ -184,9 +185,11 @@
</span><span class="cx"> rule = WebKitCSSViewportRule::create(downcast<StyleRuleViewport>(self), parentSheet);
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><ins>+ case Namespace:
+ rule = CSSNamespaceRule::create(downcast<StyleRuleNamespace>(self), parentSheet);
+ break;
</ins><span class="cx"> case Unknown:
</span><span class="cx"> case Charset:
</span><del>- case Namespace: // FIXME: Add support for CSSNamespaceRule.
</del><span class="cx"> case Keyframe:
</span><span class="cx"> #if !ENABLE(CSS_REGIONS)
</span><span class="cx"> case Region:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleSheetContentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleSheetContents.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleSheetContents.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/StyleSheetContents.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSParser p(parserContext());
</span><del>- p.parseSheet(this, sheetText, TextPosition(), nullptr, true);
</del><ins>+ p.parseSheet(this, sheetText);
</ins><span class="cx">
</span><span class="cx"> if (m_parserContext.needsSiteSpecificQuirks && isStrictParserMode(m_parserContext.mode)) {
</span><span class="cx"> // Work around <https://bugs.webkit.org/show_bug.cgi?id=28350>.
</span><span class="lines">@@ -345,13 +345,8 @@
</span><span class="cx">
</span><span class="cx"> bool StyleSheetContents::parseString(const String& sheetText)
</span><span class="cx"> {
</span><del>- return parseStringAtPosition(sheetText, TextPosition(), false);
-}
-
-bool StyleSheetContents::parseStringAtPosition(const String& sheetText, const TextPosition& textPosition, bool createdByParser)
-{
</del><span class="cx"> CSSParser p(parserContext());
</span><del>- p.parseSheet(this, sheetText, textPosition, nullptr, createdByParser);
</del><ins>+ p.parseSheet(this, sheetText);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -426,7 +421,7 @@
</span><span class="cx">
</span><span class="cx"> URL StyleSheetContents::completeURL(const String& url) const
</span><span class="cx"> {
</span><del>- return CSSParser::completeURL(m_parserContext, url);
</del><ins>+ return m_parserContext.completeURL(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool traverseSubresourcesInRules(const Vector<RefPtr<StyleRuleBase>>& rules, const std::function<bool (const CachedResource&)>& handler)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleSheetContentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleSheetContents.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleSheetContents.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/StyleSheetContents.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx">
</span><span class="cx"> void parseAuthorStyleSheet(const CachedCSSStyleSheet*, const SecurityOrigin*);
</span><span class="cx"> WEBCORE_EXPORT bool parseString(const String&);
</span><del>- bool parseStringAtPosition(const String&, const TextPosition&, bool createdByParser);
</del><span class="cx">
</span><span class="cx"> bool isCacheable() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSMatrixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSMatrix.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSMatrix.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/WebKitCSSMatrix.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebKitCSSMatrix.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSParser.h"
</span><ins>+#include "CSSPrimitiveValue.h"
</ins><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "CSSToLengthConversionData.h"
</span><span class="cx"> #include "CSSValueKeywords.h"
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeSelectorPseudoClassAndCompatibilityElementMappy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -185,19 +185,6 @@
</span><span class="cx"> """ % longest_keyword)
</span><span class="cx">
</span><span class="cx"> output_file.write("""
</span><del>-PseudoClassOrCompatibilityPseudoElement parsePseudoClassAndCompatibilityElementString(const CSSParserString& pseudoTypeString)
-{
- const SelectorPseudoClassOrCompatibilityPseudoElementEntry* entry;
- if (pseudoTypeString.is8Bit())
- entry = parsePseudoClassAndCompatibilityElementString(pseudoTypeString.characters8(), pseudoTypeString.length());
- else
- entry = parsePseudoClassAndCompatibilityElementString(pseudoTypeString.characters16(), pseudoTypeString.length());
-
- if (entry)
- return entry->pseudoTypes;
- return { CSSSelector::PseudoClassUnknown, CSSSelector::PseudoElementUnknown };
-}
-
</del><span class="cx"> PseudoClassOrCompatibilityPseudoElement parsePseudoClassAndCompatibilityElementString(const StringView& pseudoTypeString)
</span><span class="cx"> {
</span><span class="cx"> const SelectorPseudoClassOrCompatibilityPseudoElementEntry* entry;
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -28,191 +28,32 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CSSParser.h"
</span><span class="cx">
</span><del>-#include "CSSAnimationTriggerScrollValue.h"
-#include "CSSAspectRatioValue.h"
-#include "CSSBasicShapes.h"
-#include "CSSBorderImage.h"
-#include "CSSBorderImageSliceValue.h"
-#include "CSSCanvasValue.h"
-#include "CSSContentDistributionValue.h"
-#include "CSSCrossfadeValue.h"
-#include "CSSCursorImageValue.h"
-#include "CSSCustomPropertyValue.h"
-#include "CSSFilterImageValue.h"
-#include "CSSFontFaceRule.h"
-#include "CSSFontFaceSrcValue.h"
-#include "CSSFontFeatureValue.h"
-#include "CSSFontValue.h"
-#include "CSSFontVariationValue.h"
-#include "CSSFunctionValue.h"
-#include "CSSGradientValue.h"
-#include "CSSImageSetValue.h"
-#include "CSSImageValue.h"
-#include "CSSInheritedValue.h"
-#include "CSSInitialValue.h"
</del><span class="cx"> #include "CSSKeyframeRule.h"
</span><del>-#include "CSSKeyframesRule.h"
-#include "CSSLineBoxContainValue.h"
-#include "CSSMediaRule.h"
-#include "CSSNamedImageValue.h"
-#include "CSSPageRule.h"
</del><span class="cx"> #include "CSSParserFastPaths.h"
</span><span class="cx"> #include "CSSParserImpl.h"
</span><del>-#include "CSSParserObserver.h"
</del><span class="cx"> #include "CSSPendingSubstitutionValue.h"
</span><del>-#include "CSSPrimitiveValue.h"
-#include "CSSPrimitiveValueMappings.h"
</del><span class="cx"> #include "CSSPropertyParser.h"
</span><del>-#include "CSSPropertySourceData.h"
-#include "CSSReflectValue.h"
-#include "CSSRevertValue.h"
-#include "CSSSelector.h"
</del><span class="cx"> #include "CSSSelectorParser.h"
</span><del>-#include "CSSShadowValue.h"
-#include "CSSStyleSheet.h"
</del><span class="cx"> #include "CSSSupportsParser.h"
</span><del>-#include "CSSTimingFunctionValue.h"
</del><span class="cx"> #include "CSSTokenizer.h"
</span><del>-#include "CSSUnicodeRangeValue.h"
-#include "CSSUnsetValue.h"
-#include "CSSValueKeywords.h"
-#include "CSSValueList.h"
-#include "CSSValuePool.h"
-#include "CSSVariableDependentValue.h"
</del><ins>+#include "CSSVariableData.h"
</ins><span class="cx"> #include "CSSVariableReferenceValue.h"
</span><del>-#include "Counter.h"
</del><span class="cx"> #include "Document.h"
</span><del>-#include "FloatConversion.h"
-#include "GridArea.h"
-#include "HTMLOptGroupElement.h"
-#include "HTMLParserIdioms.h"
-#include "HashTools.h"
-#include "MediaList.h"
-#include "MediaQueryExp.h"
</del><ins>+#include "Element.h"
</ins><span class="cx"> #include "Page.h"
</span><del>-#include "PageConsoleClient.h"
-#include "Pair.h"
-#include "Rect.h"
</del><span class="cx"> #include "RenderTheme.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><del>-#include "SVGParserUtilities.h"
-#include "SVGPathByteStream.h"
-#include "SVGPathUtilities.h"
-#include "SelectorChecker.h"
-#include "SelectorCheckerTestFunctions.h"
</del><span class="cx"> #include "Settings.h"
</span><del>-#include "StyleProperties.h"
-#include "StylePropertyShorthand.h"
-#include "StylePropertyShorthandFunctions.h"
</del><ins>+#include "StyleColor.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><del>-#include "StyleRuleImport.h"
</del><span class="cx"> #include "StyleSheetContents.h"
</span><del>-#include "TextEncoding.h"
-#include "WebKitCSSRegionRule.h"
-#include "WebKitCSSTransformValue.h"
-#include <bitset>
-#include <limits.h>
-#include <wtf/HexNumber.h>
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/SetForScope.h>
-#include <wtf/StdLibExtras.h>
-#include <wtf/dtoa.h>
-#include <wtf/text/StringBuffer.h>
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><del>-#include <wtf/text/StringImpl.h>
</del><span class="cx">
</span><del>-#if ENABLE(CSS_GRID_LAYOUT)
-#include "CSSGridAutoRepeatValue.h"
-#include "CSSGridLineNamesValue.h"
-#include "CSSGridTemplateAreasValue.h"
-#endif
-
-#if ENABLE(CSS_SCROLL_SNAP)
-#include "LengthRepeat.h"
-#endif
-
-#if ENABLE(DASHBOARD_SUPPORT)
-#include "DashboardRegion.h"
-#endif
-
-#define YYDEBUG 0
-
-#if YYDEBUG > 0
-extern int cssyydebug;
-#endif
-
-extern int cssyyparse(WebCore::CSSParser*);
-
</del><span class="cx"> using namespace WTF;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-const unsigned CSSParser::invalidParsedPropertiesCount = std::numeric_limits<unsigned>::max();
-static const double MAX_SCALE = 1000000;
-
-template<unsigned length> bool equalLettersIgnoringASCIICase(const CSSParserValue& value, const char (&lowercaseLetters)[length])
-{
- ASSERT(value.unit == CSSPrimitiveValue::CSS_IDENT || value.unit == CSSPrimitiveValue::CSS_STRING);
- return equalLettersIgnoringASCIICase(value.string, lowercaseLetters);
-}
-
-static bool hasPrefix(const char* string, unsigned length, const char* prefix)
-{
- for (unsigned i = 0; i < length; ++i) {
- if (!prefix[i])
- return true;
- if (string[i] != prefix[i])
- return false;
- }
- return false;
-}
-
-template<typename... Args>
-static Ref<CSSPrimitiveValue> createPrimitiveValuePair(Args&&... args)
-{
- return CSSValuePool::singleton().createValue(Pair::create(std::forward<Args>(args)...));
-}
-
-class AnimationParseContext {
-public:
- AnimationParseContext() = default;
-
- void commitFirstAnimation()
- {
- m_firstAnimationCommitted = true;
- }
-
- bool hasCommittedFirstAnimation() const
- {
- return m_firstAnimationCommitted;
- }
-
- void commitAnimationPropertyKeyword()
- {
- m_animationPropertyKeywordAllowed = false;
- }
-
- bool animationPropertyKeywordAllowed() const
- {
- return m_animationPropertyKeywordAllowed;
- }
-
- bool hasSeenAnimationPropertyKeyword() const
- {
- return m_hasSeenAnimationPropertyKeyword;
- }
-
- void sawAnimationPropertyKeyword()
- {
- m_hasSeenAnimationPropertyKeyword = true;
- }
-
-private:
- bool m_animationPropertyKeywordAllowed { true };
- bool m_firstAnimationCommitted { false };
- bool m_hasSeenAnimationPropertyKeyword { false };
-};
-
</del><span class="cx"> const CSSParserContext& strictCSSParserContext()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<CSSParserContext> strictContext(HTMLStandardMode);
</span><span class="lines">@@ -251,7 +92,6 @@
</span><span class="cx"> textAutosizingEnabled = settings->textAutosizingEnabled();
</span><span class="cx"> #endif
</span><span class="cx"> springTimingFunctionEnabled = settings->springTimingFunctionEnabled();
</span><del>- useNewParser = settings->newCSSParserEnabled();
</del><span class="cx">
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="cx"> variationFontsEnabled = settings->variationFontsEnabled();
</span><span class="lines">@@ -287,9 +127,6 @@
</span><span class="cx"> CSSParser::CSSParser(const CSSParserContext& context)
</span><span class="cx"> : m_context(context)
</span><span class="cx"> {
</span><del>-#if YYDEBUG > 0
- cssyydebug = 1;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSParser::~CSSParser()
</span><span class="lines">@@ -296,1177 +133,106 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename CharacterType> ALWAYS_INLINE static void convertToASCIILowercaseInPlace(CharacterType* characters, unsigned length)
</del><ins>+void CSSParser::parseSheet(StyleSheetContents* sheet, const String& string)
</ins><span class="cx"> {
</span><del>- for (unsigned i = 0; i < length; ++i)
- characters[i] = toASCIILower(characters[i]);
</del><ins>+ return CSSParserImpl::parseStyleSheet(string, m_context, sheet);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSParserString::convertToASCIILowercaseInPlace()
-{
- if (is8Bit())
- WebCore::convertToASCIILowercaseInPlace(characters8(), length());
- else
- WebCore::convertToASCIILowercaseInPlace(characters16(), length());
-}
-
-void CSSParser::setupParser(const char* prefix, unsigned prefixLength, StringView string, const char* suffix, unsigned suffixLength)
-{
- ASSERT(!m_context.useNewParser);
-
- m_parsedTextPrefixLength = prefixLength;
- unsigned stringLength = string.length();
- unsigned length = stringLength + m_parsedTextPrefixLength + suffixLength + 1;
- m_length = length;
-
- if (!stringLength || string.is8Bit()) {
- m_dataStart8 = std::make_unique<LChar[]>(length);
- for (unsigned i = 0; i < m_parsedTextPrefixLength; ++i)
- m_dataStart8[i] = prefix[i];
-
- if (stringLength)
- memcpy(m_dataStart8.get() + m_parsedTextPrefixLength, string.characters8(), stringLength * sizeof(LChar));
-
- unsigned start = m_parsedTextPrefixLength + stringLength;
- unsigned end = start + suffixLength;
- for (unsigned i = start; i < end; i++)
- m_dataStart8[i] = suffix[i - start];
-
- m_dataStart8[length - 1] = '\0';
-
- m_is8BitSource = true;
- m_currentCharacter8 = m_dataStart8.get();
- m_currentCharacter16 = nullptr;
- setTokenStart<LChar>(m_currentCharacter8);
- m_lexFunc = &CSSParser::realLex<LChar>;
- return;
- }
-
- m_dataStart16 = std::make_unique<UChar[]>(length);
- for (unsigned i = 0; i < m_parsedTextPrefixLength; ++i)
- m_dataStart16[i] = prefix[i];
-
- ASSERT(stringLength);
- memcpy(m_dataStart16.get() + m_parsedTextPrefixLength, string.characters16(), stringLength * sizeof(UChar));
-
- unsigned start = m_parsedTextPrefixLength + stringLength;
- unsigned end = start + suffixLength;
- for (unsigned i = start; i < end; i++)
- m_dataStart16[i] = suffix[i - start];
-
- m_dataStart16[length - 1] = '\0';
-
- m_is8BitSource = false;
- m_currentCharacter8 = nullptr;
- m_currentCharacter16 = m_dataStart16.get();
- setTokenStart<UChar>(m_currentCharacter16);
- m_lexFunc = &CSSParser::realLex<UChar>;
-}
-
-// FIXME-NEWPARSER: This API needs to change. It's polluted with Inspector stuff, and that should
-// use the new obverver model instead.
-void CSSParser::parseSheet(StyleSheetContents* sheet, const String& string, const TextPosition& textPosition, RuleSourceDataList* ruleSourceDataResult, bool logErrors)
-{
- // FIXME-NEWPARSER: It's easier for testing to let the entire UA sheet parse with the old
- // parser. That way we can still have the default styles look correct while we add in support for
- // properties.
- if (m_context.useNewParser)
- return CSSParserImpl::parseStyleSheet(string, m_context, sheet);
-
- setStyleSheet(sheet);
- m_defaultNamespace = starAtom; // Reset the default namespace.
- if (ruleSourceDataResult)
- m_currentRuleDataStack = std::make_unique<RuleSourceDataList>();
- m_ruleSourceDataResult = ruleSourceDataResult;
-
- m_logErrors = logErrors && sheet->singleOwnerDocument() && !sheet->baseURL().isEmpty() && sheet->singleOwnerDocument()->page();
- m_ignoreErrorsInDeclaration = false;
- m_sheetStartLineNumber = textPosition.m_line.zeroBasedInt();
- m_sheetStartColumnNumber = textPosition.m_column.zeroBasedInt();
- m_lineNumber = m_sheetStartLineNumber;
- m_columnOffsetForLine = 0;
- setupParser("", string, "");
- cssyyparse(this);
- sheet->shrinkToFit();
- m_currentRuleDataStack.reset();
- m_ruleSourceDataResult = nullptr;
- m_rule = nullptr;
- m_ignoreErrorsInDeclaration = false;
- m_logErrors = false;
-}
-
</del><span class="cx"> void CSSParser::parseSheetForInspector(const CSSParserContext& context, StyleSheetContents* sheet, const String& string, CSSParserObserver& observer)
</span><span class="cx"> {
</span><span class="cx"> return CSSParserImpl::parseStyleSheetForInspector(string, context, sheet, observer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StyleRuleBase> CSSParser::parseRule(StyleSheetContents* sheet, const String& string)
</del><ins>+RefPtr<StyleRuleBase> CSSParser::parseRule(const CSSParserContext& context, StyleSheetContents* sheet, const String& string)
</ins><span class="cx"> {
</span><del>- if (m_context.useNewParser)
- return CSSParserImpl::parseRule(string, m_context, sheet, CSSParserImpl::AllowImportRules);
- setStyleSheet(sheet);
- m_allowNamespaceDeclarations = false;
- setupParser("@-webkit-rule{", string, "} ");
- cssyyparse(this);
- return m_rule;
</del><ins>+ return CSSParserImpl::parseRule(string, context, sheet, CSSParserImpl::AllowImportRules);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StyleKeyframe> CSSParser::parseKeyframeRule(StyleSheetContents* sheet, const String& string)
</del><ins>+RefPtr<StyleKeyframe> CSSParser::parseKeyframeRule(const String& string)
</ins><span class="cx"> {
</span><del>- if (m_context.useNewParser) {
- RefPtr<StyleRuleBase> keyframe = CSSParserImpl::parseRule(string, m_context, nullptr, CSSParserImpl::KeyframeRules);
- return downcast<StyleKeyframe>(keyframe.get());
- }
-
- setStyleSheet(sheet);
- setupParser("@-webkit-keyframe-rule{ ", string, "} ");
- cssyyparse(this);
- return m_keyframe;
</del><ins>+ RefPtr<StyleRuleBase> keyframe = CSSParserImpl::parseRule(string, m_context, nullptr, CSSParserImpl::KeyframeRules);
+ return downcast<StyleKeyframe>(keyframe.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSParser::parseSupportsCondition(const String& condition)
</span><span class="cx"> {
</span><del>- if (m_context.useNewParser) {
- CSSTokenizer tokenizer(condition);
- CSSParserTokenRange range = tokenizer.tokenRange();
- CSSParserImpl parser(m_context);
- return CSSSupportsParser::supportsCondition(range, parser) == CSSSupportsParser::Supported;
- }
-
- m_supportsCondition = false;
- // can't use { because tokenizer state switches from supports to initial state when it sees { token.
- // instead insert one " " (which is WHITESPACE in CSSGrammar.y)
- setupParser("@-webkit-supports-condition ", condition, "} ");
- cssyyparse(this);
- return m_supportsCondition;
</del><ins>+ CSSTokenizer tokenizer(condition);
+ CSSParserTokenRange range = tokenizer.tokenRange();
+ CSSParserImpl parser(m_context);
+ return CSSSupportsParser::supportsCondition(range, parser) == CSSSupportsParser::Supported;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isColorPropertyID(CSSPropertyID propertyId)
</del><ins>+Color CSSParser::parseColor(const String& string, bool strict)
</ins><span class="cx"> {
</span><del>- switch (propertyId) {
- case CSSPropertyColor:
- case CSSPropertyBackgroundColor:
- case CSSPropertyBorderBottomColor:
- case CSSPropertyBorderLeftColor:
- case CSSPropertyBorderRightColor:
- case CSSPropertyBorderTopColor:
- case CSSPropertyOutlineColor:
- case CSSPropertyTextLineThroughColor:
- case CSSPropertyTextOverlineColor:
- case CSSPropertyTextUnderlineColor:
- case CSSPropertyWebkitBorderAfterColor:
- case CSSPropertyWebkitBorderBeforeColor:
- case CSSPropertyWebkitBorderEndColor:
- case CSSPropertyWebkitBorderStartColor:
- case CSSPropertyColumnRuleColor:
- case CSSPropertyWebkitTextDecorationColor:
- case CSSPropertyWebkitTextEmphasisColor:
- case CSSPropertyWebkitTextFillColor:
- case CSSPropertyWebkitTextStrokeColor:
- return true;
- default:
- return false;
- }
</del><ins>+ if (string.isEmpty())
+ return Color();
+
+ // Try named colors first.
+ Color namedColor { string };
+ if (namedColor.isValid())
+ return namedColor;
+
+ // Try the fast path to parse hex and rgb.
+ RefPtr<CSSValue> value = CSSParserFastPaths::parseColor(string, strict ? HTMLStandardMode : HTMLQuirksMode);
+
+ // If that fails, try the full parser.
+ if (!value)
+ value = parseSingleValue(CSSPropertyColor, string, strictCSSParserContext());
+ if (!value || !value->isPrimitiveValue())
+ return Color();
+ const auto& primitiveValue = downcast<CSSPrimitiveValue>(*value);
+ if (!primitiveValue.isRGBColor())
+ return Color();
+ return primitiveValue.color();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::isValidSystemColorValue(CSSValueID valueID)
</del><ins>+Color CSSParser::parseSystemColor(const String& string, Document* document)
</ins><span class="cx"> {
</span><del>- return valueID >= CSSValueAqua && valueID <= CSSValueAppleSystemYellow;
-}
-
-static bool validPrimitiveValueColor(CSSValueID valueID, bool strict = false)
-{
- return (valueID == CSSValueWebkitText || valueID == CSSValueCurrentcolor || valueID == CSSValueMenu
- || CSSParser::isValidSystemColorValue(valueID) || valueID == CSSValueAlpha
- || (valueID >= CSSValueWebkitFocusRingColor && valueID < CSSValueWebkitText && !strict));
-}
-
-static CSSParser::ParseResult parseColorValue(MutableStyleProperties& declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
-{
- ASSERT(!string.isEmpty());
- bool strict = isStrictParserMode(cssParserMode);
- if (!isColorPropertyID(propertyId))
- return CSSParser::ParseResult::Error;
-
- CSSParserString cssString;
- cssString.init(string);
- CSSValueID valueID = cssValueKeywordID(cssString);
- if (validPrimitiveValueColor(valueID, strict)) {
- auto value = CSSValuePool::singleton().createIdentifierValue(valueID);
- return declaration.addParsedProperty(CSSProperty(propertyId, WTFMove(value), important)) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged;
- }
- Color color = CSSParser::fastParseColor(string, strict && string[0] != '#');
- if (!color.isValid())
- return CSSParser::ParseResult::Error;
-
- auto value = CSSValuePool::singleton().createColorValue(color);
- return declaration.addParsedProperty(CSSProperty(propertyId, WTFMove(value), important)) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged;
-}
-
-static inline bool isSimpleLengthPropertyID(CSSPropertyID propertyId, bool& acceptsNegativeNumbers)
-{
- switch (propertyId) {
- case CSSPropertyFontSize:
- case CSSPropertyHeight:
- case CSSPropertyWidth:
- case CSSPropertyMinHeight:
- case CSSPropertyMinWidth:
- case CSSPropertyPaddingBottom:
- case CSSPropertyPaddingLeft:
- case CSSPropertyPaddingRight:
- case CSSPropertyPaddingTop:
- case CSSPropertyWebkitLogicalWidth:
- case CSSPropertyWebkitLogicalHeight:
- case CSSPropertyWebkitMinLogicalWidth:
- case CSSPropertyWebkitMinLogicalHeight:
- case CSSPropertyWebkitPaddingAfter:
- case CSSPropertyWebkitPaddingBefore:
- case CSSPropertyWebkitPaddingEnd:
- case CSSPropertyWebkitPaddingStart:
-#if ENABLE(CSS_GRID_LAYOUT)
- case CSSPropertyGridColumnGap:
- case CSSPropertyGridRowGap:
-#endif
- case CSSPropertyShapeMargin:
- acceptsNegativeNumbers = false;
- return true;
- case CSSPropertyBottom:
- case CSSPropertyCx:
- case CSSPropertyCy:
- case CSSPropertyLeft:
- case CSSPropertyMarginBottom:
- case CSSPropertyMarginLeft:
- case CSSPropertyMarginRight:
- case CSSPropertyMarginTop:
- case CSSPropertyR:
- case CSSPropertyRx:
- case CSSPropertyRy:
- case CSSPropertyRight:
- case CSSPropertyTop:
- case CSSPropertyWebkitMarginAfter:
- case CSSPropertyWebkitMarginBefore:
- case CSSPropertyWebkitMarginEnd:
- case CSSPropertyWebkitMarginStart:
- case CSSPropertyX:
- case CSSPropertyY:
- acceptsNegativeNumbers = true;
- return true;
- default:
- return false;
- }
-}
-
-template <typename CharacterType>
-static inline bool parseSimpleLength(const CharacterType* characters, unsigned& length, CSSPrimitiveValue::UnitTypes& unit, double& number)
-{
- if (length > 2 && (characters[length - 2] | 0x20) == 'p' && (characters[length - 1] | 0x20) == 'x') {
- length -= 2;
- unit = CSSPrimitiveValue::CSS_PX;
- } else if (length > 1 && characters[length - 1] == '%') {
- length -= 1;
- unit = CSSPrimitiveValue::CSS_PERCENTAGE;
- }
-
- // We rely on charactersToDouble for validation as well. The function
- // will set "ok" to "false" if the entire passed-in character range does
- // not represent a double.
- bool ok;
- number = charactersToDouble(characters, length, &ok);
- return ok;
-}
-
-static CSSParser::ParseResult parseSimpleLengthValue(MutableStyleProperties& declaration, CSSPropertyID propertyId, const String& string, bool important, CSSParserMode cssParserMode)
-{
- ASSERT(!string.isEmpty());
- bool acceptsNegativeNumbers;
- if (!isSimpleLengthPropertyID(propertyId, acceptsNegativeNumbers))
- return CSSParser::ParseResult::Error;
-
- unsigned length = string.length();
- double number;
- CSSPrimitiveValue::UnitTypes unit = CSSPrimitiveValue::CSS_NUMBER;
-
- if (string.is8Bit()) {
- if (!parseSimpleLength(string.characters8(), length, unit, number))
- return CSSParser::ParseResult::Error;
- } else {
- if (!parseSimpleLength(string.characters16(), length, unit, number))
- return CSSParser::ParseResult::Error;
- }
-
- if (unit == CSSPrimitiveValue::CSS_NUMBER) {
- if (number && isStrictParserMode(cssParserMode))
- return CSSParser::ParseResult::Error;
- unit = CSSPrimitiveValue::CSS_PX;
- }
- if (number < 0 && !acceptsNegativeNumbers)
- return CSSParser::ParseResult::Error;
- if (std::isinf(number))
- return CSSParser::ParseResult::Error;
-
- auto value = CSSValuePool::singleton().createValue(number, unit);
- return declaration.addParsedProperty(CSSProperty(propertyId, WTFMove(value), important)) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged;
-}
-
-static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int valueID, const CSSParserContext& parserContext, StyleSheetContents* styleSheetContents)
-{
- if (!valueID)
- return false;
-
- switch (propertyId) {
- case CSSPropertyBorderCollapse: // collapse | separate | inherit
- if (valueID == CSSValueCollapse || valueID == CSSValueSeparate)
- return true;
- break;
- case CSSPropertyBorderTopStyle: // <border-style> | inherit
- case CSSPropertyBorderRightStyle: // Defined as: none | hidden | dotted | dashed |
- case CSSPropertyBorderBottomStyle: // solid | double | groove | ridge | inset | outset
- case CSSPropertyBorderLeftStyle:
- case CSSPropertyWebkitBorderAfterStyle:
- case CSSPropertyWebkitBorderBeforeStyle:
- case CSSPropertyWebkitBorderEndStyle:
- case CSSPropertyWebkitBorderStartStyle:
- case CSSPropertyColumnRuleStyle:
- if (valueID >= CSSValueNone && valueID <= CSSValueDouble)
- return true;
- break;
- case CSSPropertyBoxSizing:
- if (valueID == CSSValueBorderBox || valueID == CSSValueContentBox)
- return true;
- break;
- case CSSPropertyCaptionSide: // top | bottom | left | right | inherit
- if (valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueTop || valueID == CSSValueBottom)
- return true;
- break;
- case CSSPropertyClear: // none | left | right | both | inherit
- if (valueID == CSSValueNone || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueBoth)
- return true;
- break;
- case CSSPropertyDirection: // ltr | rtl | inherit
- if (valueID == CSSValueLtr || valueID == CSSValueRtl)
- return true;
- break;
- case CSSPropertyDisplay:
- // inline | block | list-item | inline-block | table |
- // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
- // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none | inherit
- // flex | -webkit-flex | inline-flex | -webkit-inline-flex | grid | inline-grid | contents
- if ((valueID >= CSSValueInline && valueID <= CSSValueContents) || valueID == CSSValueNone)
- return true;
-#if ENABLE(CSS_GRID_LAYOUT)
- if (parserContext.cssGridLayoutEnabled && (valueID == CSSValueGrid || valueID == CSSValueInlineGrid))
- return true;
-#endif
- break;
-
- case CSSPropertyEmptyCells: // show | hide | inherit
- if (valueID == CSSValueShow || valueID == CSSValueHide)
- return true;
- break;
- case CSSPropertyFloat: // left | right | none | center (for buggy CSS, maps to none)
- if (valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueNone || valueID == CSSValueCenter)
- return true;
- break;
- case CSSPropertyFontStyle: // normal | italic | oblique | inherit
- if (valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique)
- return true;
- break;
- case CSSPropertyFontStretch:
- return false;
- case CSSPropertyImageRendering: // auto | optimizeSpeed | optimizeQuality | -webkit-crisp-edges | -webkit-optimize-contrast | crisp-edges | pixelated
- // optimizeSpeed and optimizeQuality are deprecated; a user agent must accept them as valid values but must treat them as having the same behavior as pixelated and auto respectively.
- if (valueID == CSSValueAuto || valueID == CSSValueOptimizespeed || valueID == CSSValueOptimizequality
- || valueID == CSSValueWebkitCrispEdges || valueID == CSSValueWebkitOptimizeContrast || valueID == CSSValueCrispEdges || valueID == CSSValuePixelated)
- return true;
- break;
- case CSSPropertyListStylePosition: // inside | outside | inherit
- if (valueID == CSSValueInside || valueID == CSSValueOutside)
- return true;
- break;
- case CSSPropertyListStyleType:
- // See section CSS_PROP_LIST_STYLE_TYPE of file CSSValueKeywords.in
- // for the list of supported list-style-types.
- if ((valueID >= CSSValueDisc && valueID <= CSSValueKatakanaIroha) || valueID == CSSValueNone)
- return true;
- break;
- case CSSPropertyObjectFit:
- if (valueID == CSSValueFill || valueID == CSSValueContain || valueID == CSSValueCover || valueID == CSSValueNone || valueID == CSSValueScaleDown)
- return true;
- break;
- case CSSPropertyOutlineStyle: // (<border-style> except hidden) | auto | inherit
- if (valueID == CSSValueAuto || valueID == CSSValueNone || (valueID >= CSSValueInset && valueID <= CSSValueDouble))
- return true;
- break;
- case CSSPropertyOverflowWrap: // normal | break-word
- case CSSPropertyWordWrap:
- if (valueID == CSSValueNormal || valueID == CSSValueBreakWord)
- return true;
- break;
-#if ENABLE(TOUCH_EVENTS)
- case CSSPropertyTouchAction: // auto | manipulation
- if (valueID == CSSValueAuto || valueID == CSSValueManipulation)
- return true;
- break;
-#endif
-#if ENABLE(CSS_SCROLL_SNAP)
- case CSSPropertyWebkitScrollSnapType: // none | mandatory | proximity
- if (valueID == CSSValueNone || valueID == CSSValueMandatory || valueID == CSSValueProximity)
- return true;
- break;
-#endif
- case CSSPropertyOverflowX: // visible | hidden | scroll | auto | overlay | inherit
- if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay)
- return true;
- break;
- case CSSPropertyOverflowY: // visible | hidden | scroll | auto | overlay | inherit | -webkit-paged-x | -webkit-paged-y
- if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay || valueID == CSSValueWebkitPagedX || valueID == CSSValueWebkitPagedY)
- return true;
- break;
- case CSSPropertyPageBreakAfter: // auto | always | avoid | left | right | inherit
- case CSSPropertyPageBreakBefore:
- case CSSPropertyWebkitColumnBreakAfter:
- case CSSPropertyWebkitColumnBreakBefore:
- if (valueID == CSSValueAuto || valueID == CSSValueAlways || valueID == CSSValueAvoid || valueID == CSSValueLeft || valueID == CSSValueRight)
- return true;
- break;
- case CSSPropertyPageBreakInside: // avoid | auto | inherit
- case CSSPropertyWebkitColumnBreakInside:
- if (valueID == CSSValueAuto || valueID == CSSValueAvoid)
- return true;
- break;
- case CSSPropertyPointerEvents:
- // none | visiblePainted | visibleFill | visibleStroke | visible |
- // painted | fill | stroke | auto | all | inherit
- if (valueID == CSSValueVisible || valueID == CSSValueNone || valueID == CSSValueAll || valueID == CSSValueAuto || (valueID >= CSSValueVisiblepainted && valueID <= CSSValueStroke))
- return true;
- break;
- case CSSPropertyPosition: // static | relative | absolute | fixed | sticky | inherit
- if (valueID == CSSValueStatic || valueID == CSSValueRelative || valueID == CSSValueAbsolute || valueID == CSSValueFixed || valueID == CSSValueWebkitSticky)
- return true;
- break;
- case CSSPropertyResize: // none | both | horizontal | vertical | auto
- if (valueID == CSSValueNone || valueID == CSSValueBoth || valueID == CSSValueHorizontal || valueID == CSSValueVertical || valueID == CSSValueAuto)
- return true;
- break;
- case CSSPropertySpeak: // none | normal | spell-out | digits | literal-punctuation | no-punctuation | inherit
- if (valueID == CSSValueNone || valueID == CSSValueNormal || valueID == CSSValueSpellOut || valueID == CSSValueDigits || valueID == CSSValueLiteralPunctuation || valueID == CSSValueNoPunctuation)
- return true;
- break;
- case CSSPropertyTableLayout: // auto | fixed | inherit
- if (valueID == CSSValueAuto || valueID == CSSValueFixed)
- return true;
- break;
- case CSSPropertyTextAlign:
- // left | right | center | justify | -webkit-left | -webkit-right | -webkit-center | -webkit-match-parent
- // | start | end | inherit | -webkit-auto (converted to start)
- if ((valueID >= CSSValueWebkitAuto && valueID <= CSSValueWebkitMatchParent) || valueID == CSSValueStart || valueID == CSSValueEnd)
- return true;
- break;
- case CSSPropertyTextLineThroughMode:
- case CSSPropertyTextOverlineMode:
- case CSSPropertyTextUnderlineMode:
- if (valueID == CSSValueContinuous || valueID == CSSValueSkipWhiteSpace)
- return true;
- break;
- case CSSPropertyTextLineThroughStyle:
- case CSSPropertyTextOverlineStyle:
- case CSSPropertyTextUnderlineStyle:
- if (valueID == CSSValueNone || valueID == CSSValueSolid || valueID == CSSValueDouble || valueID == CSSValueDashed || valueID == CSSValueDotDash || valueID == CSSValueDotDotDash || valueID == CSSValueWave)
- return true;
- break;
- case CSSPropertyTextOverflow: // clip | ellipsis
- if (valueID == CSSValueClip || valueID == CSSValueEllipsis)
- return true;
- break;
- case CSSPropertyTextRendering: // auto | optimizeSpeed | optimizeLegibility | geometricPrecision
- if (valueID == CSSValueAuto || valueID == CSSValueOptimizespeed || valueID == CSSValueOptimizelegibility || valueID == CSSValueGeometricprecision)
- return true;
- break;
- case CSSPropertyTextTransform: // capitalize | uppercase | lowercase | none | inherit
- if ((valueID >= CSSValueCapitalize && valueID <= CSSValueLowercase) || valueID == CSSValueNone)
- return true;
- break;
- case CSSPropertyUnicodeBidi:
- if (valueID == CSSValueNormal || valueID == CSSValueEmbed || valueID == CSSValueBidiOverride || valueID == CSSValueWebkitIsolate
- || valueID == CSSValueWebkitIsolateOverride || valueID == CSSValueWebkitPlaintext)
- return true;
- break;
- case CSSPropertyVisibility: // visible | hidden | collapse | inherit
- if (valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueCollapse)
- return true;
- break;
- case CSSPropertyWebkitAppearance:
- if ((valueID >= CSSValueCheckbox && valueID <= CSSValueCapsLockIndicator) || valueID == CSSValueNone)
- return true;
- break;
- case CSSPropertyWebkitBackfaceVisibility:
- if (valueID == CSSValueVisible || valueID == CSSValueHidden)
- return true;
- break;
-#if ENABLE(CSS_COMPOSITING)
- case CSSPropertyMixBlendMode:
- if (valueID == CSSValueNormal || valueID == CSSValueMultiply || valueID == CSSValueScreen
- || valueID == CSSValueOverlay || valueID == CSSValueDarken || valueID == CSSValueLighten || valueID == CSSValueColorDodge
- || valueID == CSSValueColorBurn || valueID == CSSValueHardLight || valueID == CSSValueSoftLight || valueID == CSSValueDifference
- || valueID == CSSValueExclusion || valueID == CSSValuePlusDarker || valueID == CSSValuePlusLighter)
- return true;
- break;
- case CSSPropertyIsolation:
- if (valueID == CSSValueAuto || valueID == CSSValueIsolate)
- return true;
- break;
-#endif
- case CSSPropertyWebkitBorderFit:
- if (valueID == CSSValueBorder || valueID == CSSValueLines)
- return true;
- break;
- case CSSPropertyWebkitBoxAlign:
- if (valueID == CSSValueStretch || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline)
- return true;
- break;
-#if ENABLE(CSS_BOX_DECORATION_BREAK)
- case CSSPropertyWebkitBoxDecorationBreak:
- if (valueID == CSSValueClone || valueID == CSSValueSlice)
- return true;
- break;
-#endif
- case CSSPropertyWebkitBoxDirection:
- if (valueID == CSSValueNormal || valueID == CSSValueReverse)
- return true;
- break;
- case CSSPropertyWebkitBoxLines:
- if (valueID == CSSValueSingle || valueID == CSSValueMultiple)
- return true;
- break;
- case CSSPropertyWebkitBoxOrient:
- if (valueID == CSSValueHorizontal || valueID == CSSValueVertical || valueID == CSSValueInlineAxis || valueID == CSSValueBlockAxis)
- return true;
- break;
- case CSSPropertyWebkitBoxPack:
- if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueJustify)
- return true;
- break;
-#if ENABLE(CURSOR_VISIBILITY)
- case CSSPropertyWebkitCursorVisibility:
- if (valueID == CSSValueAuto || valueID == CSSValueAutoHide)
- return true;
- break;
-#endif
- case CSSPropertyWebkitColumnAxis:
- if (valueID == CSSValueHorizontal || valueID == CSSValueVertical || valueID == CSSValueAuto)
- return true;
- break;
- case CSSPropertyColumnFill:
- if (valueID == CSSValueAuto || valueID == CSSValueBalance)
- return true;
- break;
- case CSSPropertyWebkitColumnProgression:
- if (valueID == CSSValueNormal || valueID == CSSValueReverse)
- return true;
- break;
- case CSSPropertyAlignContent:
- // FIXME: Per CSS alignment, this property should accept an optional <overflow-position>. We should share this parsing code with 'justify-self'.
- // FIXME: For now, we will do it behind the GRID_LAYOUT compile flag.
- return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround || valueID == CSSValueStretch;
- case CSSPropertyAlignItems:
- // FIXME: Per CSS alignment, this property should accept the same arguments as 'justify-self' so we should share its parsing code.
- // FIXME: For now, we will do it behind the GRID_LAYOUT compile flag.
- if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
- return true;
- break;
- case CSSPropertyAlignSelf:
- // FIXME: Per CSS alignment, this property should accept the same arguments as 'justify-self' so we should share its parsing code.
- // FIXME: For now, we will do it behind the GRID_LAYOUT compile flag.
- if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
- return true;
- break;
- case CSSPropertyFlexDirection:
- if (valueID == CSSValueRow || valueID == CSSValueRowReverse || valueID == CSSValueColumn || valueID == CSSValueColumnReverse)
- return true;
- break;
- case CSSPropertyFlexWrap:
- if (valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID == CSSValueWrapReverse)
- return true;
- break;
- case CSSPropertyJustifyContent:
- // FIXME: Per CSS alignment, this property should accept an optional <overflow-position>. We should share this parsing code with 'justify-self'.
- // FIXME: For now, we will do it behind the GRID_LAYOUT compile flag.
- return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround;
- case CSSPropertyWebkitFontKerning:
- if (valueID == CSSValueAuto || valueID == CSSValueNormal || valueID == CSSValueNone)
- return true;
- break;
- case CSSPropertyWebkitFontSmoothing:
- if (valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased)
- return true;
- break;
- case CSSPropertyWebkitHyphens:
- if (valueID == CSSValueNone || valueID == CSSValueManual || valueID == CSSValueAuto)
- return true;
- break;
- case CSSPropertyWebkitLineAlign:
- if (valueID == CSSValueNone || valueID == CSSValueEdges)
- return true;
- break;
- case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-white-space
- if (valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpace)
- return true;
- break;
- case CSSPropertyWebkitLineSnap:
- if (valueID == CSSValueNone || valueID == CSSValueBaseline || valueID == CSSValueContain)
- return true;
- break;
- case CSSPropertyWebkitMarginAfterCollapse:
- case CSSPropertyWebkitMarginBeforeCollapse:
- case CSSPropertyWebkitMarginBottomCollapse:
- case CSSPropertyWebkitMarginTopCollapse:
- if (valueID == CSSValueCollapse || valueID == CSSValueSeparate || valueID == CSSValueDiscard)
- return true;
- break;
- case CSSPropertyWebkitMarqueeDirection:
- if (valueID == CSSValueForwards || valueID == CSSValueBackwards || valueID == CSSValueAhead || valueID == CSSValueReverse || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueDown
- || valueID == CSSValueUp || valueID == CSSValueAuto)
- return true;
- break;
- case CSSPropertyWebkitMarqueeStyle:
- if (valueID == CSSValueNone || valueID == CSSValueSlide || valueID == CSSValueScroll || valueID == CSSValueAlternate)
- return true;
- break;
- case CSSPropertyWebkitNbspMode: // normal | space
- if (valueID == CSSValueNormal || valueID == CSSValueSpace)
- return true;
- break;
-#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
- case CSSPropertyWebkitOverflowScrolling:
- if (valueID == CSSValueAuto || valueID == CSSValueTouch)
- return true;
- break;
-#endif
- case CSSPropertyWebkitPrintColorAdjust:
- if (valueID == CSSValueExact || valueID == CSSValueEconomy)
- return true;
- break;
-#if ENABLE(CSS_REGIONS)
- case CSSPropertyWebkitRegionBreakAfter:
- case CSSPropertyWebkitRegionBreakBefore:
- if (valueID == CSSValueAuto || valueID == CSSValueAlways || valueID == CSSValueAvoid || valueID == CSSValueLeft || valueID == CSSValueRight)
- return true;
- break;
- case CSSPropertyWebkitRegionBreakInside:
- if (valueID == CSSValueAuto || valueID == CSSValueAvoid)
- return true;
- break;
- case CSSPropertyWebkitRegionFragment:
- if (valueID == CSSValueAuto || valueID == CSSValueBreak)
- return true;
- break;
-#endif
- case CSSPropertyWebkitRtlOrdering:
- if (valueID == CSSValueLogical || valueID == CSSValueVisual)
- return true;
- break;
-
- case CSSPropertyWebkitRubyPosition:
- if (valueID == CSSValueBefore || valueID == CSSValueAfter || valueID == CSSValueInterCharacter)
- return true;
- break;
-
-#if ENABLE(CSS3_TEXT)
- case CSSPropertyWebkitTextAlignLast:
- // auto | start | end | left | right | center | justify
- if ((valueID >= CSSValueLeft && valueID <= CSSValueJustify) || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueAuto)
- return true;
- break;
-#endif // CSS3_TEXT
- case CSSPropertyWebkitTextCombine:
- if (valueID == CSSValueNone || valueID == CSSValueHorizontal)
- return true;
- break;
- case CSSPropertyWebkitTextDecorationStyle:
- if (valueID == CSSValueSolid || valueID == CSSValueDouble || valueID == CSSValueDotted || valueID == CSSValueDashed || valueID == CSSValueWavy)
- return true;
- break;
-#if ENABLE(CSS3_TEXT)
- case CSSPropertyWebkitTextJustify:
- // auto | none | inter-word | distribute
- if (valueID == CSSValueInterWord || valueID == CSSValueDistribute || valueID == CSSValueAuto || valueID == CSSValueNone)
- return true;
- break;
-#endif // CSS3_TEXT
- case CSSPropertyWebkitTextOrientation:
- if (valueID == CSSValueSideways || valueID == CSSValueSidewaysRight || valueID == CSSValueVerticalRight
- || valueID == CSSValueMixed || valueID == CSSValueUpright)
- return true;
- break;
- case CSSPropertyWebkitTextSecurity:
- // disc | circle | square | none | inherit
- if (valueID == CSSValueDisc || valueID == CSSValueCircle || valueID == CSSValueSquare || valueID == CSSValueNone)
- return true;
- break;
- case CSSPropertyWebkitTextZoom:
- if (valueID == CSSValueNormal || valueID == CSSValueReset)
- return true;
- break;
-#if PLATFORM(IOS)
- // Apple specific property. These will never be standardized and is purely to
- // support custom WebKit-based Apple applications.
- case CSSPropertyWebkitTouchCallout:
- if (valueID == CSSValueDefault || valueID == CSSValueNone)
- return true;
- break;
-#endif
- case CSSPropertyTransformStyle:
- case CSSPropertyWebkitTransformStyle:
- if (valueID == CSSValueFlat || valueID == CSSValuePreserve3d)
- return true;
- break;
- case CSSPropertyWebkitUserDrag: // auto | none | element
- if (valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueElement)
- return true;
- break;
- case CSSPropertyWebkitUserModify: // read-only | read-write
- if (valueID == CSSValueReadOnly || valueID == CSSValueReadWrite || valueID == CSSValueReadWritePlaintextOnly) {
- if (styleSheetContents)
- styleSheetContents->parserSetUsesStyleBasedEditability();
- return true;
- }
- break;
- case CSSPropertyWebkitUserSelect: // auto | none | text | all
- if (valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueText)
- return true;
- if (valueID == CSSValueAll) {
- if (styleSheetContents)
- styleSheetContents->parserSetUsesStyleBasedEditability();
- return true;
- }
- break;
- case CSSPropertyWhiteSpace: // normal | pre | nowrap | inherit
- if (valueID == CSSValueNormal || valueID == CSSValuePre || valueID == CSSValuePreWrap || valueID == CSSValuePreLine || valueID == CSSValueNowrap)
- return true;
- break;
- case CSSPropertyWordBreak: // normal | break-all | keep-all | break-word (this is a custom extension)
- if (valueID == CSSValueNormal || valueID == CSSValueBreakAll || valueID == CSSValueKeepAll || valueID == CSSValueBreakWord)
- return true;
- break;
-#if ENABLE(CSS_TRAILING_WORD)
- case CSSPropertyAppleTrailingWord: // auto | -apple-partially-balanced
- if (valueID == CSSValueAuto || valueID == CSSValueWebkitPartiallyBalanced)
- return true;
- break;
-#endif
-#if ENABLE(APPLE_PAY)
- case CSSPropertyApplePayButtonStyle: // white | white-outline | black
- if (valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack)
- return true;
- break;
- case CSSPropertyApplePayButtonType: // plain | buy | set-up | donate
- if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueDonate)
- return true;
- break;
-#endif
- case CSSPropertyFontVariantPosition: // normal | sub | super
- if (valueID == CSSValueNormal || valueID == CSSValueSub || valueID == CSSValueSuper)
- return true;
- break;
- case CSSPropertyFontVariantCaps: // normal | small-caps | all-small-caps | petite-caps | all-petite-caps | unicase | titling-caps
- if (valueID == CSSValueNormal || valueID == CSSValueSmallCaps || valueID == CSSValueAllSmallCaps || valueID == CSSValuePetiteCaps || valueID == CSSValueAllPetiteCaps || valueID == CSSValueUnicase || valueID == CSSValueTitlingCaps)
- return true;
- break;
- case CSSPropertyFontVariantAlternates: // We only support the normal and historical-forms values.
- if (valueID == CSSValueNormal || valueID == CSSValueHistoricalForms)
- return true;
- break;
-
- case CSSPropertyBreakAfter:
- case CSSPropertyBreakBefore:
- // auto | avoid | left | right | recto | verso | column | page | region | avoid-page | avoid-column | avoid-region
- if (valueID == CSSValueAuto || valueID == CSSValueAvoid || valueID == CSSValueLeft || valueID == CSSValueRight
- || valueID == CSSValueRecto || valueID == CSSValueVerso || valueID == CSSValueColumn || valueID == CSSValuePage
- || valueID == CSSValueRegion || valueID == CSSValueAvoidColumn || valueID == CSSValueAvoidPage || valueID == CSSValueAvoidRegion)
- return true;
- break;
- case CSSPropertyBreakInside:
- // auto | avoid | avoid-page | avoid-column | avoid-region
- if (valueID == CSSValueAuto || valueID == CSSValueAvoid || valueID == CSSValueAvoidColumn || valueID == CSSValueAvoidPage || valueID == CSSValueAvoidRegion)
- return true;
- break;
- // SVG CSS properties
- case CSSPropertyAlignmentBaseline:
- // auto | baseline | before-edge | text-before-edge | middle |
- // central | after-edge | text-after-edge | ideographic | alphabetic |
- // hanging | mathematical | inherit
- if (valueID == CSSValueAuto || valueID == CSSValueBaseline || valueID == CSSValueMiddle || (valueID >= CSSValueBeforeEdge && valueID <= CSSValueMathematical))
- return true;
- break;
- case CSSPropertyBufferedRendering:
- if (valueID == CSSValueAuto || valueID == CSSValueDynamic || valueID == CSSValueStatic)
- return true;
- break;
- case CSSPropertyClipRule:
- case CSSPropertyFillRule:
- if (valueID == CSSValueNonzero || valueID == CSSValueEvenodd)
- return true;
- break;
- case CSSPropertyColorInterpolation:
- case CSSPropertyColorInterpolationFilters:
- if (valueID == CSSValueAuto || valueID == CSSValueSrgb || valueID == CSSValueLinearrgb)
- return true;
- break;
- case CSSPropertyColorRendering:
- if (valueID == CSSValueAuto || valueID == CSSValueOptimizespeed || valueID == CSSValueOptimizequality)
- return true;
- break;
- case CSSPropertyDominantBaseline:
- // auto | use-script | no-change | reset-size | ideographic |
- // alphabetic | hanging | mathematical | central | middle |
- // text-after-edge | text-before-edge | inherit
- if (valueID == CSSValueAuto || valueID == CSSValueMiddle
- || (valueID >= CSSValueUseScript && valueID <= CSSValueResetSize)
- || (valueID >= CSSValueCentral && valueID <= CSSValueMathematical))
- return true;
- break;
- case CSSPropertyMaskType:
- if (valueID == CSSValueLuminance || valueID == CSSValueAlpha)
- return true;
- break;
- case CSSPropertyShapeRendering:
- if (valueID == CSSValueAuto || valueID == CSSValueOptimizespeed || valueID == CSSValueCrispedges || valueID == CSSValueGeometricprecision)
- return true;
- break;
- case CSSPropertyStrokeLinecap:
- if (valueID == CSSValueButt || valueID == CSSValueRound || valueID == CSSValueSquare)
- return true;
- break;
- case CSSPropertyStrokeLinejoin:
- if (valueID == CSSValueMiter || valueID == CSSValueRound || valueID == CSSValueBevel)
- return true;
- break;
- case CSSPropertyTextAnchor:
- if (valueID == CSSValueStart || valueID == CSSValueMiddle || valueID == CSSValueEnd)
- return true;
- break;
- case CSSPropertyVectorEffect:
- if (valueID == CSSValueNone || valueID == CSSValueNonScalingStroke)
- return true;
- break;
- case CSSPropertyWritingMode:
- if ((valueID >= CSSValueHorizontalTb && valueID <= CSSValueHorizontalBt)
- || valueID == CSSValueLrTb || valueID == CSSValueRlTb || valueID == CSSValueTbRl
- || valueID == CSSValueLr || valueID == CSSValueRl || valueID == CSSValueTb)
- return true;
- break;
- default:
- ASSERT_NOT_REACHED();
- return false;
- }
-#if !ENABLE(CSS_GRID_LAYOUT)
- UNUSED_PARAM(parserContext);
-#endif
- return false;
-}
-
-static bool isUniversalKeyword(const String& string)
-{
- // These keywords can be used for all properties.
- return equalLettersIgnoringASCIICase(string, "initial")
- || equalLettersIgnoringASCIICase(string, "inherit")
- || equalLettersIgnoringASCIICase(string, "unset")
- || equalLettersIgnoringASCIICase(string, "revert");
-}
-
-static bool isKeywordPropertyID(CSSPropertyID propertyID)
-{
- switch (propertyID) {
- case CSSPropertyPageBreakAfter:
- case CSSPropertyPageBreakBefore:
- case CSSPropertyPageBreakInside:
- case CSSPropertyWebkitColumnBreakAfter:
- case CSSPropertyWebkitColumnBreakBefore:
- case CSSPropertyWebkitColumnBreakInside:
-#if ENABLE(CSS_REGIONS)
- case CSSPropertyWebkitRegionBreakAfter:
- case CSSPropertyWebkitRegionBreakBefore:
- case CSSPropertyWebkitRegionBreakInside:
-#endif
- return true;
- default:
- break;
- }
</del><ins>+ if (!document || !document->page())
+ return Color();
</ins><span class="cx">
</span><del>- return CSSParserFastPaths::isKeywordPropertyID(propertyID);
</del><ins>+ CSSValueID id = cssValueKeywordID(string);
+ if (!StyleColor::isSystemColor(id))
+ return Color();
+
+ return document->page()->theme().systemColor(id);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static CSSParser::ParseResult parseKeywordValue(MutableStyleProperties& declaration, CSSPropertyID propertyId, const String& string, bool important, const CSSParserContext& parserContext, StyleSheetContents* styleSheetContents)
</del><ins>+RefPtr<CSSValue> CSSParser::parseSingleValue(CSSPropertyID propertyID, const String& string, const CSSParserContext& context)
</ins><span class="cx"> {
</span><del>- ASSERT(!string.isEmpty());
-
- if (!isKeywordPropertyID(propertyId)) {
- if (!isUniversalKeyword(string))
- return CSSParser::ParseResult::Error;
-
- // Don't try to parse initial/inherit/unset/revert shorthands; return an error so the caller will use the full CSS parser.
- if (shorthandForProperty(propertyId).length())
- return CSSParser::ParseResult::Error;
- }
-
- CSSParserString cssString;
- cssString.init(string);
- CSSValueID valueID = cssValueKeywordID(cssString);
-
- if (!valueID)
- return CSSParser::ParseResult::Error;
-
- RefPtr<CSSValue> value;
- if (valueID == CSSValueInherit)
- value = CSSValuePool::singleton().createInheritedValue();
- else if (valueID == CSSValueInitial)
- value = CSSValuePool::singleton().createExplicitInitialValue();
- else if (valueID == CSSValueUnset)
- value = CSSValuePool::singleton().createUnsetValue();
- else if (valueID == CSSValueRevert)
- value = CSSValuePool::singleton().createRevertValue();
- else if (isValidKeywordPropertyAndValue(propertyId, valueID, parserContext, styleSheetContents))
- value = CSSValuePool::singleton().createIdentifierValue(valueID);
- else
- return CSSParser::ParseResult::Error;
-
- return declaration.addParsedProperty(CSSProperty(propertyId, value.releaseNonNull(), important)) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged;
-}
-
-template <typename CharacterType>
-static bool parseTransformTranslateArguments(WebKitCSSTransformValue& transformValue, CharacterType* characters, unsigned length, unsigned start, unsigned expectedCount)
-{
- auto& cssValuePool = CSSValuePool::singleton();
- while (expectedCount) {
- size_t end = WTF::find(characters, length, expectedCount == 1 ? ')' : ',', start);
- if (end == notFound || (expectedCount == 1 && end != length - 1))
- return false;
- unsigned argumentLength = end - start;
- CSSPrimitiveValue::UnitTypes unit = CSSPrimitiveValue::CSS_NUMBER;
- double number;
- if (!parseSimpleLength(characters + start, argumentLength, unit, number))
- return false;
- if (unit != CSSPrimitiveValue::CSS_PX && (number || unit != CSSPrimitiveValue::CSS_NUMBER))
- return false;
- transformValue.append(cssValuePool.createValue(number, CSSPrimitiveValue::CSS_PX));
- start = end + 1;
- --expectedCount;
- }
- return true;
-}
-
-static CSSParser::ParseResult parseTranslateTransformValue(MutableStyleProperties& properties, CSSPropertyID propertyID, const String& string, bool important)
-{
- if (propertyID != CSSPropertyTransform)
- return CSSParser::ParseResult::Error;
-
- static const unsigned shortestValidTransformStringLength = 12;
- static const unsigned likelyMultipartTransformStringLengthCutoff = 32;
- if (string.length() < shortestValidTransformStringLength || string.length() > likelyMultipartTransformStringLengthCutoff)
- return CSSParser::ParseResult::Error;
-
- if (!string.startsWith("translate", false))
- return CSSParser::ParseResult::Error;
-
- UChar c9 = toASCIILower(string[9]);
- UChar c10 = toASCIILower(string[10]);
-
- WebKitCSSTransformValue::TransformOperationType transformType;
- unsigned expectedArgumentCount = 1;
- unsigned argumentStart = 11;
- if (c9 == 'x' && c10 == '(')
- transformType = WebKitCSSTransformValue::TranslateXTransformOperation;
- else if (c9 == 'y' && c10 == '(')
- transformType = WebKitCSSTransformValue::TranslateYTransformOperation;
- else if (c9 == 'z' && c10 == '(')
- transformType = WebKitCSSTransformValue::TranslateZTransformOperation;
- else if (c9 == '(') {
- transformType = WebKitCSSTransformValue::TranslateTransformOperation;
- expectedArgumentCount = 2;
- argumentStart = 10;
- } else if (c9 == '3' && c10 == 'd' && string[11] == '(') {
- transformType = WebKitCSSTransformValue::Translate3DTransformOperation;
- expectedArgumentCount = 3;
- argumentStart = 12;
- } else
- return CSSParser::ParseResult::Error;
-
- auto transformValue = WebKitCSSTransformValue::create(transformType);
- bool success;
- if (string.is8Bit())
- success = parseTransformTranslateArguments(transformValue, string.characters8(), string.length(), argumentStart, expectedArgumentCount);
- else
- success = parseTransformTranslateArguments(transformValue, string.characters16(), string.length(), argumentStart, expectedArgumentCount);
- if (!success)
- return CSSParser::ParseResult::Error;
-
- auto result = CSSValueList::createSpaceSeparated();
- result->append(WTFMove(transformValue));
- return properties.addParsedProperty(CSSProperty(CSSPropertyTransform, WTFMove(result), important)) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged;
-}
-
-RefPtr<CSSValueList> CSSParser::parseFontFaceValue(const AtomicString& string)
-{
</del><span class="cx"> if (string.isEmpty())
</span><span class="cx"> return nullptr;
</span><del>-
- auto valueList = CSSValueList::createCommaSeparated();
-
- Vector<String> familyNames;
- string.string().split(',', true, familyNames);
-
- auto& cssValuePool = CSSValuePool::singleton();
- for (auto& familyName : familyNames) {
- String stripped = stripLeadingAndTrailingHTMLSpaces(familyName);
- if (stripped.isEmpty())
- return nullptr;
-
- RefPtr<CSSValue> value;
- for (auto propertyID : { CSSValueSerif, CSSValueSansSerif, CSSValueCursive, CSSValueFantasy, CSSValueMonospace, CSSValueWebkitBody }) {
- if (equalIgnoringASCIICase(stripped, getValueName(propertyID))) {
- value = cssValuePool.createIdentifierValue(propertyID);
- break;
- }
- }
- if (!value)
- value = cssValuePool.createFontFamilyValue(stripped);
- valueList->append(value.releaseNonNull());
- }
-
- return WTFMove(valueList);
</del><ins>+ if (RefPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(propertyID, string, context.mode, nullptr))
+ return value;
+ CSSTokenizer tokenizer(string);
+ return CSSPropertyParser::parseSingleValue(propertyID, tokenizer.tokenRange(), context, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSParser::ParseResult CSSParser::parseValue(MutableStyleProperties& declaration, CSSPropertyID propertyID, const String& string, bool important, const CSSParserContext& context, StyleSheetContents* contextStyleSheet)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!string.isEmpty());
</span><del>- if (context.useNewParser) {
- RefPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(propertyID, string, context.mode, contextStyleSheet);
- if (value)
- return declaration.addParsedProperty(CSSProperty(propertyID, WTFMove(value), important)) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged;
- } else {
- // FIXME-NEWPARSER: Remove all this code when the old parser goes away.
- CSSParser::ParseResult result = parseSimpleLengthValue(declaration, propertyID, string, important, context.mode);
- if (result != ParseResult::Error)
- return result;
</del><ins>+ RefPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(propertyID, string, context.mode, contextStyleSheet);
+ if (value)
+ return declaration.addParsedProperty(CSSProperty(propertyID, WTFMove(value), important)) ? CSSParser::ParseResult::Changed : CSSParser::ParseResult::Unchanged;
</ins><span class="cx">
</span><del>- result = parseColorValue(declaration, propertyID, string, important, context.mode);
- if (result != ParseResult::Error)
- return result;
-
- result = parseKeywordValue(declaration, propertyID, string, important, context, contextStyleSheet);
- if (result != ParseResult::Error)
- return result;
-
- result = parseTranslateTransformValue(declaration, propertyID, string, important);
- if (result != ParseResult::Error)
- return result;
- }
-
</del><span class="cx"> CSSParser parser(context);
</span><del>- return parser.parseValue(declaration, propertyID, string, important, contextStyleSheet);
</del><ins>+ return parser.parseValue(declaration, propertyID, string, important);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-CSSParser::ParseResult CSSParser::parseCustomPropertyValue(MutableStyleProperties& declaration, const AtomicString& propertyName, const String& string, bool important, const CSSParserContext& context, StyleSheetContents* contextStyleSheet)
</del><ins>+CSSParser::ParseResult CSSParser::parseCustomPropertyValue(MutableStyleProperties& declaration, const AtomicString& propertyName, const String& string, bool important, const CSSParserContext& context)
</ins><span class="cx"> {
</span><del>- if (context.useNewParser)
- return CSSParserImpl::parseCustomPropertyValue(&declaration, propertyName, string, important, context);
-
- CSSParser parser(context);
- parser.setCustomPropertyName(propertyName);
- return parser.parseValue(declaration, CSSPropertyCustom, string, important, contextStyleSheet);
</del><ins>+ return CSSParserImpl::parseCustomPropertyValue(&declaration, propertyName, string, important, context);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-CSSParser::ParseResult CSSParser::parseValue(MutableStyleProperties& declaration, CSSPropertyID propertyID, const String& string, bool important, StyleSheetContents* contextStyleSheet)
</del><ins>+CSSParser::ParseResult CSSParser::parseValue(MutableStyleProperties& declaration, CSSPropertyID propertyID, const String& string, bool important)
</ins><span class="cx"> {
</span><del>- if (m_context.useNewParser)
- return CSSParserImpl::parseValue(&declaration, propertyID, string, important, m_context);
-
- setStyleSheet(contextStyleSheet);
-
- setupParser("@-webkit-value{", string, "} ");
-
- m_id = propertyID;
- m_important = important;
-
- cssyyparse(this);
-
- m_rule = nullptr;
-
- ParseResult result = ParseResult::Error;
-
- if (!m_parsedProperties.isEmpty()) {
- result = declaration.addParsedProperties(m_parsedProperties) ? ParseResult::Changed : ParseResult::Unchanged;
- clearProperties();
- }
-
- return result;
</del><ins>+ return CSSParserImpl::parseValue(&declaration, propertyID, string, important, m_context);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Color CSSParser::parseColor(const String& string, bool strict)
-{
- if (string.isEmpty())
- return Color();
-
- // First try creating a color specified by name, rgba(), rgb() or "#" syntax.
- Color color = fastParseColor(string, strict);
- if (color.isValid())
- return color;
-
- CSSParser parser(HTMLStandardMode);
-
- // In case the fast-path parser didn't understand the color, try the full parser.
- if (!parser.parseColorFromString(string))
- return Color();
-
- CSSValue& value = *parser.m_parsedProperties.first().value();
- if (!is<CSSPrimitiveValue>(value))
- return Color();
-
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(value);
- if (!primitiveValue.isRGBColor())
- return Color();
-
- return primitiveValue.color();
-}
-
-bool CSSParser::parseColorFromString(const String& string)
-{
- setupParser("@-webkit-decls{color:", string, "} ");
- cssyyparse(this);
- m_rule = nullptr;
-
- return !m_parsedProperties.isEmpty() && m_parsedProperties.first().id() == CSSPropertyColor;
-}
-
-Color CSSParser::parseSystemColor(const String& string, Document* document)
-{
- if (!document || !document->page())
- return Color();
-
- CSSParserString cssColor;
- cssColor.init(string);
- CSSValueID id = cssValueKeywordID(cssColor);
- if (!validPrimitiveValueColor(id))
- return Color();
-
- return document->page()->theme().systemColor(id);
-}
-
</del><span class="cx"> void CSSParser::parseSelector(const String& string, CSSSelectorList& selectorList)
</span><span class="cx"> {
</span><del>- if (m_context.useNewParser) {
- CSSTokenizer tokenizer(string);
- selectorList = CSSSelectorParser::parseSelector(tokenizer.tokenRange(), m_context, nullptr);
- return;
- }
-
- m_selectorListForParseSelector = &selectorList;
-
- setupParser("@-webkit-selector{", string, "}");
-
- cssyyparse(this);
-
- m_selectorListForParseSelector = nullptr;
</del><ins>+ CSSTokenizer tokenizer(string);
+ selectorList = CSSSelectorParser::parseSelector(tokenizer.tokenRange(), m_context, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<ImmutableStyleProperties> CSSParser::parseInlineStyleDeclaration(const String& string, Element* element)
</span><span class="lines">@@ -1473,393 +239,21 @@
</span><span class="cx"> {
</span><span class="cx"> CSSParserContext context(element->document());
</span><span class="cx"> context.mode = strictToCSSParserMode(element->isHTMLElement() && !element->document().inQuirksMode());
</span><del>-
- if (context.useNewParser)
- return CSSParserImpl::parseInlineStyleDeclaration(string, element);
-
- return CSSParser(context).parseDeclarationDeprecated(string, nullptr);
</del><ins>+ return CSSParserImpl::parseInlineStyleDeclaration(string, element);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<ImmutableStyleProperties> CSSParser::parseDeclarationDeprecated(const String& string, StyleSheetContents* contextStyleSheet)
</del><ins>+bool CSSParser::parseDeclaration(MutableStyleProperties& declaration, const String& string)
</ins><span class="cx"> {
</span><del>- ASSERT(!m_context.useNewParser);
-
- setStyleSheet(contextStyleSheet);
-
- setupParser("@-webkit-decls{", string, "} ");
- cssyyparse(this);
- m_rule = nullptr;
-
- Ref<ImmutableStyleProperties> style = createStyleProperties();
- clearProperties();
- return style;
</del><ins>+ return CSSParserImpl::parseDeclarationList(&declaration, string, m_context);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
-bool CSSParser::parseDeclaration(MutableStyleProperties& declaration, const String& string, RefPtr<CSSRuleSourceData>&& ruleSourceData, StyleSheetContents* contextStyleSheet)
-{
- if (m_context.useNewParser)
- return CSSParserImpl::parseDeclarationList(&declaration, string, m_context);
-
- // Length of the "@-webkit-decls{" prefix.
- static const unsigned prefixLength = 15;
-
- setStyleSheet(contextStyleSheet);
-
- if (ruleSourceData) {
- m_currentRuleDataStack = std::make_unique<RuleSourceDataList>();
- m_currentRuleDataStack->append(*ruleSourceData);
- }
-
- setupParser("@-webkit-decls{", string, "} ");
- cssyyparse(this);
- m_rule = nullptr;
-
- bool ok = false;
- if (!m_parsedProperties.isEmpty()) {
- ok = true;
- declaration.addParsedProperties(m_parsedProperties);
- clearProperties();
- }
-
- if (ruleSourceData) {
- ASSERT(m_currentRuleDataStack->size() == 1);
- ruleSourceData->ruleBodyRange.start = 0;
- ruleSourceData->ruleBodyRange.end = string.length();
- for (size_t i = 0, size = ruleSourceData->styleSourceData->propertyData.size(); i < size; ++i) {
- CSSPropertySourceData& propertyData = ruleSourceData->styleSourceData->propertyData.at(i);
- propertyData.range.start -= prefixLength;
- propertyData.range.end -= prefixLength;
- }
-
- fixUnparsedPropertyRanges(*ruleSourceData);
- m_currentRuleDataStack.reset();
- }
-
- return ok;
-}
-
</del><span class="cx"> void CSSParser::parseDeclarationForInspector(const CSSParserContext& context, const String& string, CSSParserObserver& observer)
</span><span class="cx"> {
</span><span class="cx"> CSSParserImpl::parseDeclarationListForInspector(string, context, observer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void filterProperties(bool important, const ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, std::bitset<numCSSProperties>& seenProperties, HashSet<AtomicString>& seenCustomProperties)
-{
- // Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found.
- for (int i = input.size() - 1; i >= 0; --i) {
- const CSSProperty& property = input[i];
- if (property.isImportant() != important)
- continue;
-
- if (property.id() == CSSPropertyCustom) {
- if (property.value()) {
- auto& name = downcast<CSSCustomPropertyValue>(*property.value()).name();
- if (!seenCustomProperties.add(name).isNewEntry)
- continue;
- output[--unusedEntries] = property;
- }
- continue;
- }
-
- const unsigned propertyIDIndex = property.id() - firstCSSProperty;
- ASSERT(propertyIDIndex < seenProperties.size());
- if (seenProperties[propertyIDIndex])
- continue;
- seenProperties.set(propertyIDIndex);
- output[--unusedEntries] = property;
- }
-}
-
-Ref<ImmutableStyleProperties> CSSParser::createStyleProperties()
-{
- std::bitset<numCSSProperties> seenProperties;
- size_t unusedEntries = m_parsedProperties.size();
- Vector<CSSProperty, 256> results(unusedEntries);
-
- // Important properties have higher priority, so add them first. Duplicate definitions can then be ignored when found.
- HashSet<AtomicString> seenCustomProperties;
- filterProperties(true, m_parsedProperties, results, unusedEntries, seenProperties, seenCustomProperties);
- filterProperties(false, m_parsedProperties, results, unusedEntries, seenProperties, seenCustomProperties);
- if (unusedEntries)
- results.remove(0, unusedEntries);
-
- return ImmutableStyleProperties::create(results.data(), results.size(), m_context.mode);
-}
-
-void CSSParser::addProperty(CSSPropertyID propId, RefPtr<CSSValue>&& value, bool important, bool implicit)
-{
- // This property doesn't belong to a shorthand or is a CSS variable (which will be resolved later).
- if (!m_currentShorthand) {
- m_parsedProperties.append(CSSProperty(propId, WTFMove(value), important, false, CSSPropertyInvalid, m_implicitShorthand || implicit));
- return;
- }
-
- auto shorthands = matchingShorthandsForLonghand(propId);
- if (shorthands.size() == 1)
- m_parsedProperties.append(CSSProperty(propId, WTFMove(value), important, true, CSSPropertyInvalid, m_implicitShorthand || implicit));
- else
- m_parsedProperties.append(CSSProperty(propId, WTFMove(value), important, true, indexOfShorthandForLonghand(m_currentShorthand, shorthands), m_implicitShorthand || implicit));
-}
-
-void CSSParser::rollbackLastProperties(int num)
-{
- ASSERT(num >= 0);
- ASSERT(m_parsedProperties.size() >= static_cast<unsigned>(num));
- m_parsedProperties.shrink(m_parsedProperties.size() - num);
-}
-
-void CSSParser::clearProperties()
-{
- m_parsedProperties.clear();
- m_numParsedPropertiesBeforeMarginBox = invalidParsedPropertiesCount;
-}
-
-URL CSSParser::completeURL(const CSSParserContext& context, const String& url)
-{
- return context.completeURL(url);
-}
-
-URL CSSParser::completeURL(const String& url) const
-{
- return m_context.completeURL(url);
-}
-
-bool CSSParser::validateCalculationUnit(ValueWithCalculation& valueWithCalculation, Units unitFlags)
-{
- bool mustBeNonNegative = unitFlags & FNonNeg;
-
- RefPtr<CSSCalcValue> calculation;
- if (valueWithCalculation.calculation()) {
- // The calculation value was already parsed so we reuse it. However, we may need to update its range.
- calculation = valueWithCalculation.calculation();
- calculation->setPermittedValueRange(mustBeNonNegative ? ValueRangeNonNegative : ValueRangeAll);
- } else {
- valueWithCalculation.setCalculation(parseCalculation(valueWithCalculation, mustBeNonNegative ? ValueRangeNonNegative : ValueRangeAll));
- calculation = valueWithCalculation.calculation();
- if (!calculation)
- return false;
- }
-
- bool isValid = false;
- switch (calculation->category()) {
- case CalcNumber:
- isValid = (unitFlags & FNumber);
- if (!isValid && (unitFlags & FInteger) && calculation->isInt())
- isValid = true;
- if (!isValid && (unitFlags & FPositiveInteger) && calculation->isInt() && calculation->isPositive())
- isValid = true;
- break;
- case CalcLength:
- isValid = (unitFlags & FLength);
- break;
- case CalcPercent:
- isValid = (unitFlags & FPercent);
- break;
- case CalcPercentLength:
- isValid = (unitFlags & FPercent) && (unitFlags & FLength);
- break;
- case CalcPercentNumber:
- isValid = (unitFlags & FPercent) && (unitFlags & FNumber);
- break;
- case CalcAngle:
- isValid = (unitFlags & FAngle);
- break;
- case CalcTime:
- isValid = (unitFlags & FTime);
- break;
- case CalcFrequency:
- isValid = (unitFlags & FFrequency);
- break;
- case CalcOther:
- break;
- }
-
- return isValid;
-}
-
-inline bool CSSParser::shouldAcceptUnitLessValues(CSSParserValue& value, Units unitFlags, CSSParserMode cssParserMode)
-{
- // Qirks mode and svg presentation attributes accept unit less values.
- return (unitFlags & (FLength | FAngle | FTime)) && (!value.fValue || cssParserMode == HTMLQuirksMode || cssParserMode == SVGAttributeMode);
-}
-
-bool CSSParser::validateUnit(ValueWithCalculation& valueWithCalculation, Units unitFlags, CSSParserMode cssParserMode)
-{
- if (isCalculation(valueWithCalculation))
- return validateCalculationUnit(valueWithCalculation, unitFlags);
-
- bool b = false;
- switch (valueWithCalculation.value().unit) {
- case CSSPrimitiveValue::CSS_NUMBER:
- b = (unitFlags & FNumber);
- if (!b && shouldAcceptUnitLessValues(valueWithCalculation, unitFlags, cssParserMode)) {
- valueWithCalculation.value().unit = (unitFlags & FLength) ? CSSPrimitiveValue::CSS_PX :
- ((unitFlags & FAngle) ? CSSPrimitiveValue::CSS_DEG : CSSPrimitiveValue::CSS_MS);
- b = true;
- }
- if (!b && (unitFlags & FInteger) && valueWithCalculation.value().isInt)
- b = true;
- if (!b && (unitFlags & FPositiveInteger) && valueWithCalculation.value().isInt && valueWithCalculation.value().fValue > 0)
- b = true;
- break;
- case CSSPrimitiveValue::CSS_PERCENTAGE:
- b = (unitFlags & FPercent);
- break;
- case CSSParserValue::Q_EMS:
- case CSSPrimitiveValue::CSS_EMS:
- case CSSPrimitiveValue::CSS_REMS:
- case CSSPrimitiveValue::CSS_CHS:
- case CSSPrimitiveValue::CSS_EXS:
- case CSSPrimitiveValue::CSS_PX:
- case CSSPrimitiveValue::CSS_CM:
- case CSSPrimitiveValue::CSS_MM:
- case CSSPrimitiveValue::CSS_IN:
- case CSSPrimitiveValue::CSS_PT:
- case CSSPrimitiveValue::CSS_PC:
- case CSSPrimitiveValue::CSS_VW:
- case CSSPrimitiveValue::CSS_VH:
- case CSSPrimitiveValue::CSS_VMIN:
- case CSSPrimitiveValue::CSS_VMAX:
- b = (unitFlags & FLength);
- break;
- case CSSPrimitiveValue::CSS_MS:
- case CSSPrimitiveValue::CSS_S:
- b = (unitFlags & FTime);
- break;
- case CSSPrimitiveValue::CSS_DEG:
- case CSSPrimitiveValue::CSS_RAD:
- case CSSPrimitiveValue::CSS_GRAD:
- case CSSPrimitiveValue::CSS_TURN:
- b = (unitFlags & FAngle);
- break;
-#if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY)
- case CSSPrimitiveValue::CSS_DPPX:
- case CSSPrimitiveValue::CSS_DPI:
- case CSSPrimitiveValue::CSS_DPCM:
- b = (unitFlags & FResolution);
- break;
-#endif
- case CSSPrimitiveValue::CSS_HZ:
- case CSSPrimitiveValue::CSS_KHZ:
- case CSSPrimitiveValue::CSS_DIMENSION:
- default:
- break;
- }
- if (b && unitFlags & FNonNeg && valueWithCalculation.value().fValue < 0)
- b = false;
- if (b && std::isinf(valueWithCalculation.value().fValue))
- b = false;
- return b;
-}
-
-inline Ref<CSSPrimitiveValue> CSSParser::createPrimitiveNumericValue(ValueWithCalculation& valueWithCalculation)
-{
- if (valueWithCalculation.calculation())
- return CSSPrimitiveValue::create(valueWithCalculation.calculation());
-
- CSSParserValue& value = valueWithCalculation;
-#if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY)
- ASSERT((value.unit >= CSSPrimitiveValue::CSS_NUMBER && value.unit <= CSSPrimitiveValue::CSS_KHZ)
- || (value.unit >= CSSPrimitiveValue::CSS_TURN && value.unit <= CSSPrimitiveValue::CSS_CHS)
- || (value.unit >= CSSPrimitiveValue::CSS_VW && value.unit <= CSSPrimitiveValue::CSS_VMAX)
- || (value.unit >= CSSPrimitiveValue::CSS_DPPX && value.unit <= CSSPrimitiveValue::CSS_DPCM));
-#else
- ASSERT((value.unit >= CSSPrimitiveValue::CSS_NUMBER && value.unit <= CSSPrimitiveValue::CSS_KHZ)
- || (value.unit >= CSSPrimitiveValue::CSS_TURN && value.unit <= CSSPrimitiveValue::CSS_CHS)
- || (value.unit >= CSSPrimitiveValue::CSS_VW && value.unit <= CSSPrimitiveValue::CSS_VMAX));
-#endif
- return CSSValuePool::singleton().createValue(value.fValue, static_cast<CSSPrimitiveValue::UnitTypes>(value.unit));
-}
-
-inline Ref<CSSPrimitiveValue> CSSParser::createPrimitiveStringValue(CSSParserValue& value)
-{
- ASSERT(value.unit == CSSPrimitiveValue::CSS_STRING || value.unit == CSSPrimitiveValue::CSS_IDENT);
- return CSSValuePool::singleton().createValue(value.string, CSSPrimitiveValue::CSS_STRING);
-}
-
-static inline bool isComma(CSSParserValue* value)
-{
- return value && value->unit == CSSParserValue::Operator && value->iValue == ',';
-}
-
-static inline bool isForwardSlashOperator(CSSParserValue& value)
-{
- return value.unit == CSSParserValue::Operator && value.iValue == '/';
-}
-
-bool CSSParser::isValidSize(ValueWithCalculation& valueWithCalculation)
-{
- int id = valueWithCalculation.value().id;
- if (id == CSSValueIntrinsic || id == CSSValueMinIntrinsic || id == CSSValueWebkitMinContent || id == CSSValueWebkitMaxContent || id == CSSValueWebkitFillAvailable || id == CSSValueWebkitFitContent)
- return true;
- return !id && validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg);
-}
-
-inline RefPtr<CSSPrimitiveValue> CSSParser::parseValidPrimitive(CSSValueID identifier, ValueWithCalculation& valueWithCalculation)
-{
- if (identifier)
- return CSSValuePool::singleton().createIdentifierValue(identifier);
-
- if (valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_STRING)
- return createPrimitiveStringValue(valueWithCalculation);
- if (valueWithCalculation.value().unit >= CSSPrimitiveValue::CSS_NUMBER && valueWithCalculation.value().unit <= CSSPrimitiveValue::CSS_KHZ)
- return createPrimitiveNumericValue(valueWithCalculation);
- if (valueWithCalculation.value().unit >= CSSPrimitiveValue::CSS_TURN && valueWithCalculation.value().unit <= CSSPrimitiveValue::CSS_CHS)
- return createPrimitiveNumericValue(valueWithCalculation);
- if (valueWithCalculation.value().unit >= CSSPrimitiveValue::CSS_VW && valueWithCalculation.value().unit <= CSSPrimitiveValue::CSS_VMAX)
- return createPrimitiveNumericValue(valueWithCalculation);
-#if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY)
- if (valueWithCalculation.value().unit >= CSSPrimitiveValue::CSS_DPPX && valueWithCalculation.value().unit <= CSSPrimitiveValue::CSS_DPCM)
- return createPrimitiveNumericValue(valueWithCalculation);
-#endif
- if (valueWithCalculation.value().unit >= CSSParserValue::Q_EMS)
- return CSSPrimitiveValue::createAllowingMarginQuirk(valueWithCalculation.value().fValue, CSSPrimitiveValue::CSS_EMS);
- if (valueWithCalculation.calculation())
- return CSSPrimitiveValue::create(valueWithCalculation.calculation());
-
- return nullptr;
-}
-
-void CSSParser::addExpandedPropertyForValue(CSSPropertyID propId, Ref<CSSValue>&& value, bool important)
-{
- const StylePropertyShorthand& shorthand = shorthandForProperty(propId);
- unsigned shorthandLength = shorthand.length();
- if (!shorthandLength) {
- addProperty(propId, WTFMove(value), important);
- return;
- }
-
- ShorthandScope scope(this, propId);
- const CSSPropertyID* longhands = shorthand.properties();
- for (unsigned i = 0; i < shorthandLength; ++i)
- addProperty(longhands[i], value.copyRef(), important);
-}
-
</del><span class="cx"> RefPtr<CSSValue> CSSParser::parseValueWithVariableReferences(CSSPropertyID propID, const CSSValue& value, const CustomPropertyValueMap& customProperties, TextDirection direction, WritingMode writingMode)
</span><span class="cx"> {
</span><del>- // FIXME-NEWPARSER: Remove this block when old parser goes away.
- if (value.isVariableDependentValue()) {
- const CSSVariableDependentValue& dependentValue = downcast<CSSVariableDependentValue>(value);
- m_valueList.reset(new CSSParserValueList());
- if (!dependentValue.valueList().buildParserValueListSubstitutingVariables(m_valueList.get(), customProperties))
- return nullptr;
-
- CSSPropertyID dependentValuePropertyID = dependentValue.propertyID();
- if (CSSProperty::isDirectionAwareProperty(dependentValuePropertyID))
- dependentValuePropertyID = CSSProperty::resolveDirectionAwareProperty(dependentValuePropertyID, direction, writingMode);
-
- if (!parseValue(dependentValuePropertyID, false))
- return nullptr;
-
- for (auto& property : m_parsedProperties) {
- if (property.id() == propID)
- return property.value();
- }
-
- return nullptr;
- }
-
</del><span class="cx"> if (value.isPendingSubstitutionValue()) {
</span><span class="cx"> // FIXME: Should have a resolvedShorthands cache to stop this from being done
</span><span class="cx"> // over and over for each longhand value.
</span><span class="lines">@@ -1902,11813 +296,23 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool isImageSetFunctionValue(const CSSParserValue& value)
-{
- return value.unit == CSSParserValue::Function && (equalLettersIgnoringASCIICase(value.function->name, "image-set(") || equalLettersIgnoringASCIICase(value.function->name, "-webkit-image-set("));
-}
-
-bool CSSParser::parseValue(CSSPropertyID propId, bool important)
-{
- if (!m_valueList || !m_valueList->current())
- return false;
-
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- CSSValueID id = valueWithCalculation.value().id;
-
- if (propId == CSSPropertyCustom)
- return parseCustomPropertyDeclaration(important, id);
-
- if (m_valueList->containsVariables()) {
- auto valueList = CSSValueList::createFromParserValueList(*m_valueList);
- addExpandedPropertyForValue(propId, CSSVariableDependentValue::create(WTFMove(valueList), propId), important);
- return true;
- }
-
- auto& cssValuePool = CSSValuePool::singleton();
- unsigned num = inShorthand() ? 1 : m_valueList->size();
-
- if (id == CSSValueInherit) {
- if (num != 1)
- return false;
- addExpandedPropertyForValue(propId, cssValuePool.createInheritedValue(), important);
- return true;
- }
- else if (id == CSSValueInitial) {
- if (num != 1)
- return false;
- addExpandedPropertyForValue(propId, cssValuePool.createExplicitInitialValue(), important);
- return true;
- } else if (id == CSSValueUnset) {
- if (num != 1)
- return false;
- addExpandedPropertyForValue(propId, cssValuePool.createUnsetValue(), important);
- return true;
- } else if (id == CSSValueRevert) {
- if (num != 1)
- return false;
- addExpandedPropertyForValue(propId, cssValuePool.createRevertValue(), important);
- return true;
- }
-
- if (propId == CSSPropertyAll)
- return false; // "all" doesn't allow you to specify anything other than inherit/initial/unset.
-
- if (isKeywordPropertyID(propId)) {
- if (!isValidKeywordPropertyAndValue(propId, id, m_context, m_styleSheet))
- return false;
- if (m_valueList->next() && !inShorthand())
- return false;
- addProperty(propId, cssValuePool.createIdentifierValue(id), important);
- return true;
- }
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
- if (inViewport())
- return parseViewportProperty(propId, important);
-#endif
-
- bool validPrimitive = false;
- RefPtr<CSSValue> parsedValue;
-
- switch (propId) {
- case CSSPropertySize: // <length>{1,2} | auto | [ <page-size> || [ portrait | landscape] ]
- return parseSize(propId, important);
-
- case CSSPropertyQuotes: // [<string> <string>]+ | none | inherit
- if (id == CSSValueNone)
- validPrimitive = true;
- else
- return parseQuotes(propId, important);
- break;
-
- case CSSPropertyContent: // [ <string> | <uri> | <counter> | attr(X) | open-quote |
- // close-quote | no-open-quote | no-close-quote ]+ | inherit
- return parseContent(propId, important);
-
- case CSSPropertyAlt: // [ <string> | attr(X) ]
- return parseAlt(propId, important);
-
- case CSSPropertyClip: // <shape> | auto | inherit
- if (id == CSSValueAuto)
- validPrimitive = true;
- else if (valueWithCalculation.value().unit == CSSParserValue::Function)
- return parseClipShape(propId, important);
- break;
-
- /* Start of supported CSS properties with validation. This is needed for parseShorthand to work
- * correctly and allows optimization in WebCore::applyRule(..)
- */
- case CSSPropertyOverflow: {
- ShorthandScope scope(this, propId);
- if (num != 1 || !parseValue(CSSPropertyOverflowY, important))
- return false;
-
- RefPtr<CSSValue> overflowXValue;
-
- // FIXME: -webkit-paged-x or -webkit-paged-y only apply to overflow-y. If this value has been
- // set using the shorthand, then for now overflow-x will default to auto, but once we implement
- // pagination controls, it should default to hidden. If the overflow-y value is anything but
- // paged-x or paged-y, then overflow-x and overflow-y should have the same value.
- if (id == CSSValueWebkitPagedX || id == CSSValueWebkitPagedY)
- overflowXValue = cssValuePool.createIdentifierValue(CSSValueAuto);
- else
- overflowXValue = m_parsedProperties.last().value();
- addProperty(CSSPropertyOverflowX, WTFMove(overflowXValue), important);
- return true;
- }
-
- case CSSPropertyFontWeight: { // normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | inherit
- if (m_valueList->size() != 1)
- return false;
- return parseFontWeight(important);
- }
-
- case CSSPropertyFontSynthesis: // none | [ weight || style ]
- return parseFontSynthesis(important);
-
- case CSSPropertyBorderSpacing: {
- if (num == 1) {
- ShorthandScope scope(this, CSSPropertyBorderSpacing);
- if (!parseValue(CSSPropertyWebkitBorderHorizontalSpacing, important))
- return false;
- CSSValue* value = m_parsedProperties.last().value();
- addProperty(CSSPropertyWebkitBorderVerticalSpacing, value, important);
- return true;
- }
- else if (num == 2) {
- ShorthandScope scope(this, CSSPropertyBorderSpacing);
- if (!parseValue(CSSPropertyWebkitBorderHorizontalSpacing, important) || !parseValue(CSSPropertyWebkitBorderVerticalSpacing, important))
- return false;
- return true;
- }
- return false;
- }
- case CSSPropertyWebkitBorderHorizontalSpacing:
- case CSSPropertyWebkitBorderVerticalSpacing:
- validPrimitive = validateUnit(valueWithCalculation, FLength | FNonNeg);
- break;
- case CSSPropertyOutlineColor: // <color> | invert | inherit
- // Outline color has "invert" as additional keyword.
- // Also, we want to allow the special focus color even in strict parsing mode.
- if (id == CSSValueInvert || id == CSSValueWebkitFocusRingColor) {
- validPrimitive = true;
- break;
- }
- FALLTHROUGH;
- case CSSPropertyBackgroundColor: // <color> | inherit
- case CSSPropertyBorderTopColor: // <color> | inherit
- case CSSPropertyBorderRightColor:
- case CSSPropertyBorderBottomColor:
- case CSSPropertyBorderLeftColor:
- case CSSPropertyWebkitBorderStartColor:
- case CSSPropertyWebkitBorderEndColor:
- case CSSPropertyWebkitBorderBeforeColor:
- case CSSPropertyWebkitBorderAfterColor:
- case CSSPropertyColor: // <color> | inherit
- case CSSPropertyTextLineThroughColor: // CSS3 text decoration colors
- case CSSPropertyTextUnderlineColor:
- case CSSPropertyTextOverlineColor:
- case CSSPropertyColumnRuleColor:
- case CSSPropertyWebkitTextDecorationColor:
- case CSSPropertyWebkitTextEmphasisColor:
- case CSSPropertyWebkitTextFillColor:
- case CSSPropertyWebkitTextStrokeColor:
- if (id == CSSValueWebkitText)
- validPrimitive = true; // Always allow this, even when strict parsing is on,
- // since we use this in our UA sheets.
- else if (id == CSSValueCurrentcolor)
- validPrimitive = true;
- else if (isValidSystemColorValue(id) || id == CSSValueMenu
- || (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && inQuirksMode())) {
- validPrimitive = true;
- } else {
- parsedValue = parseColor();
- if (parsedValue)
- m_valueList->next();
- }
- break;
-
- case CSSPropertyCursor: {
- // Grammar defined by CSS3 UI and modified by CSS4 images:
- // [ [<image> [<x> <y>]?,]*
- // [ auto | crosshair | default | pointer | progress | move | e-resize | ne-resize |
- // nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | ew-resize |
- // ns-resize | nesw-resize | nwse-resize | col-resize | row-resize | text | wait | help |
- // vertical-text | cell | context-menu | alias | copy | no-drop | not-allowed |
- // zoom-in | zoom-out | all-scroll | -webkit-grab | -webkit-grabbing | -webkit-zoom-in |
- // -webkit-zoom-out ] ] | inherit
- RefPtr<CSSValueList> list;
- CSSParserValue* value = &valueWithCalculation.value();
- while (value) {
- RefPtr<CSSValue> image;
- if (value->unit == CSSPrimitiveValue::CSS_URI) {
- String uri = value->string;
- if (!uri.isNull())
- image = CSSImageValue::create(completeURL(uri));
-#if ENABLE(MOUSE_CURSOR_SCALE)
- } else if (isImageSetFunctionValue(*value)) {
- image = parseImageSet();
- if (!image)
- break;
-#endif
- } else
- break;
-
- Vector<int> coords;
- value = m_valueList->next();
- while (value && value->unit == CSSPrimitiveValue::CSS_NUMBER) {
- coords.append(int(value->fValue));
- value = m_valueList->next();
- }
- bool hasHotSpot = false;
- IntPoint hotSpot(-1, -1);
- int nrcoords = coords.size();
- if (nrcoords > 0 && nrcoords != 2)
- return false;
- if (nrcoords == 2) {
- hasHotSpot = true;
- hotSpot = IntPoint(coords[0], coords[1]);
- }
-
- if (!list)
- list = CSSValueList::createCommaSeparated();
-
- if (image)
- list->append(CSSCursorImageValue::create(image.releaseNonNull(), hasHotSpot, hotSpot));
-
- if ((inStrictMode() && !value) || (value && !(value->unit == CSSParserValue::Operator && value->iValue == ',')))
- return false;
- value = m_valueList->next(); // comma
- }
- if (list) {
- if (!value) {
- // no value after url list (MSIE 5 compatibility)
- if (list->length() != 1)
- return false;
- } else if (inQuirksMode() && value->id == CSSValueHand) // MSIE 5 compatibility :/
- list->append(cssValuePool.createIdentifierValue(CSSValuePointer));
- else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone)
- list->append(cssValuePool.createIdentifierValue(value->id));
- m_valueList->next();
- parsedValue = WTFMove(list);
- break;
- } else if (value) {
- id = value->id;
- if (inQuirksMode() && value->id == CSSValueHand) {
- // MSIE 5 compatibility :/
- id = CSSValuePointer;
- validPrimitive = true;
- } else if ((value->id >= CSSValueAuto && value->id <= CSSValueWebkitZoomOut) || value->id == CSSValueCopy || value->id == CSSValueNone)
- validPrimitive = true;
- } else {
- ASSERT_NOT_REACHED();
- return false;
- }
- break;
- }
-
- case CSSPropertyBackgroundAttachment:
- case CSSPropertyBackgroundBlendMode:
- case CSSPropertyBackgroundClip:
- case CSSPropertyWebkitBackgroundClip:
- case CSSPropertyWebkitBackgroundComposite:
- case CSSPropertyBackgroundImage:
- case CSSPropertyBackgroundOrigin:
- case CSSPropertyWebkitBackgroundOrigin:
- case CSSPropertyBackgroundPosition:
- case CSSPropertyBackgroundPositionX:
- case CSSPropertyBackgroundPositionY:
- case CSSPropertyBackgroundSize:
- case CSSPropertyWebkitBackgroundSize:
- case CSSPropertyBackgroundRepeat:
- case CSSPropertyBackgroundRepeatX:
- case CSSPropertyBackgroundRepeatY:
- case CSSPropertyWebkitMaskClip:
- case CSSPropertyWebkitMaskComposite:
- case CSSPropertyWebkitMaskImage:
- case CSSPropertyWebkitMaskOrigin:
- case CSSPropertyWebkitMaskPosition:
- case CSSPropertyWebkitMaskPositionX:
- case CSSPropertyWebkitMaskPositionY:
- case CSSPropertyWebkitMaskSize:
- case CSSPropertyWebkitMaskSourceType:
- case CSSPropertyWebkitMaskRepeat:
- case CSSPropertyWebkitMaskRepeatX:
- case CSSPropertyWebkitMaskRepeatY:
- {
- RefPtr<CSSValue> val1;
- RefPtr<CSSValue> val2;
- CSSPropertyID propId1, propId2;
- bool result = false;
- if (parseFillProperty(propId, propId1, propId2, val1, val2)) {
- std::unique_ptr<ShorthandScope> shorthandScope;
- if (propId == CSSPropertyBackgroundPosition ||
- propId == CSSPropertyBackgroundRepeat ||
- propId == CSSPropertyWebkitMaskPosition ||
- propId == CSSPropertyWebkitMaskRepeat) {
- shorthandScope = std::make_unique<ShorthandScope>(this, propId);
- }
- addProperty(propId1, val1.releaseNonNull(), important);
- if (val2)
- addProperty(propId2, val2.releaseNonNull(), important);
- result = true;
- }
- return result;
- }
- case CSSPropertyListStyleImage: // <uri> | none | inherit
- case CSSPropertyBorderImageSource:
- case CSSPropertyWebkitMaskBoxImageSource:
- if (id == CSSValueNone) {
- parsedValue = cssValuePool.createIdentifierValue(CSSValueNone);
- m_valueList->next();
- } else if (valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_URI) {
- parsedValue = CSSImageValue::create(completeURL(valueWithCalculation.value().string));
- m_valueList->next();
- } else if (isGeneratedImageValue(valueWithCalculation)) {
- if (parseGeneratedImage(*m_valueList, parsedValue))
- m_valueList->next();
- else
- return false;
- } else if (isImageSetFunctionValue(valueWithCalculation.value())) {
- parsedValue = parseImageSet();
- if (!parsedValue)
- return false;
- m_valueList->next();
- }
- break;
-
- case CSSPropertyWebkitTextStrokeWidth:
- case CSSPropertyOutlineWidth: // <border-width> | inherit
- case CSSPropertyBorderTopWidth: //// <border-width> | inherit
- case CSSPropertyBorderRightWidth: // Which is defined as
- case CSSPropertyBorderBottomWidth: // thin | medium | thick | <length>
- case CSSPropertyBorderLeftWidth:
- case CSSPropertyWebkitBorderStartWidth:
- case CSSPropertyWebkitBorderEndWidth:
- case CSSPropertyWebkitBorderBeforeWidth:
- case CSSPropertyWebkitBorderAfterWidth:
- case CSSPropertyColumnRuleWidth:
- if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
- validPrimitive = true;
- else
- validPrimitive = validateUnit(valueWithCalculation, FLength | FNonNeg);
- break;
-
- case CSSPropertyLetterSpacing: // normal | <length> | inherit
- if (id == CSSValueNormal)
- validPrimitive = true;
- else
- validPrimitive = validateUnit(valueWithCalculation, FLength);
- break;
-
- case CSSPropertyWordSpacing: // normal | <length> | <percentage> | inherit
- if (id == CSSValueNormal)
- validPrimitive = true;
- else
- validPrimitive = validateUnit(valueWithCalculation, FLength | FPercent);
- break;
-
- case CSSPropertyTextIndent:
- parsedValue = parseTextIndent();
- break;
-
- case CSSPropertyPaddingTop: //// <padding-width> | inherit
- case CSSPropertyPaddingRight: // Which is defined as
- case CSSPropertyPaddingBottom: // <length> | <percentage>
- case CSSPropertyPaddingLeft: ////
- case CSSPropertyWebkitPaddingStart:
- case CSSPropertyWebkitPaddingEnd:
- case CSSPropertyWebkitPaddingBefore:
- case CSSPropertyWebkitPaddingAfter:
- validPrimitive = (!id && validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg));
- break;
-
- case CSSPropertyMaxWidth:
- case CSSPropertyWebkitMaxLogicalWidth:
- case CSSPropertyMaxHeight:
- case CSSPropertyWebkitMaxLogicalHeight:
- validPrimitive = (id == CSSValueNone || isValidSize(valueWithCalculation));
- break;
-
- case CSSPropertyMinWidth:
- case CSSPropertyWebkitMinLogicalWidth:
- case CSSPropertyMinHeight:
- case CSSPropertyWebkitMinLogicalHeight:
- validPrimitive = id == CSSValueAuto || isValidSize(valueWithCalculation);
- break;
-
- case CSSPropertyWidth:
- case CSSPropertyWebkitLogicalWidth:
- case CSSPropertyHeight:
- case CSSPropertyWebkitLogicalHeight:
- validPrimitive = (id == CSSValueAuto || isValidSize(valueWithCalculation));
- break;
-
- case CSSPropertyFontSize:
- return parseFontSize(important);
-
- case CSSPropertyVerticalAlign:
- // baseline | sub | super | top | text-top | middle | bottom | text-bottom |
- // <percentage> | <length> | inherit
-
- if (id >= CSSValueBaseline && id <= CSSValueWebkitBaselineMiddle)
- validPrimitive = true;
- else
- validPrimitive = (!id && validateUnit(valueWithCalculation, FLength | FPercent));
- break;
-
- case CSSPropertyBottom: // <length> | <percentage> | auto | inherit
- case CSSPropertyLeft: // <length> | <percentage> | auto | inherit
- case CSSPropertyRight: // <length> | <percentage> | auto | inherit
- case CSSPropertyTop: // <length> | <percentage> | auto | inherit
- case CSSPropertyMarginTop: //// <margin-width> | inherit
- case CSSPropertyMarginRight: // Which is defined as
- case CSSPropertyMarginBottom: // <length> | <percentage> | auto | inherit
- case CSSPropertyMarginLeft: ////
- case CSSPropertyWebkitMarginStart:
- case CSSPropertyWebkitMarginEnd:
- case CSSPropertyWebkitMarginBefore:
- case CSSPropertyWebkitMarginAfter:
- if (id == CSSValueAuto)
- validPrimitive = true;
- else
- validPrimitive = (!id && validateUnit(valueWithCalculation, FLength | FPercent));
- break;
-
- case CSSPropertyZIndex: // auto | <integer> | inherit
- if (id == CSSValueAuto)
- validPrimitive = true;
- else
- validPrimitive = (!id && validateUnit(valueWithCalculation, FInteger, HTMLQuirksMode));
- break;
-
- case CSSPropertyOrphans: // <integer> | inherit | auto (We've added support for auto for backwards compatibility)
- case CSSPropertyWidows: // <integer> | inherit | auto (Ditto)
- if (id == CSSValueAuto)
- validPrimitive = true;
- else
- validPrimitive = (!id && validateUnit(valueWithCalculation, FPositiveInteger, HTMLQuirksMode));
- break;
-
- case CSSPropertyLineHeight:
- return parseLineHeight(important);
- case CSSPropertyCounterIncrement: // [ <identifier> <integer>? ]+ | none | inherit
- if (id != CSSValueNone)
- return parseCounter(propId, 1, important);
- validPrimitive = true;
- break;
- case CSSPropertyCounterReset: // [ <identifier> <integer>? ]+ | none | inherit
- if (id != CSSValueNone)
- return parseCounter(propId, 0, important);
- validPrimitive = true;
- break;
- case CSSPropertyFontFamily:
- // [[ <family-name> | <generic-family> ],]* [<family-name> | <generic-family>] | inherit
- {
- parsedValue = parseFontFamily();
- break;
- }
-
- case CSSPropertyWebkitTextDecoration:
- // [ <text-decoration-line> || <text-decoration-style> || <text-decoration-color> ] | inherit
- return parseShorthand(CSSPropertyWebkitTextDecoration, webkitTextDecorationShorthand(), important);
-
- case CSSPropertyTextDecoration:
- case CSSPropertyWebkitTextDecorationsInEffect:
- case CSSPropertyWebkitTextDecorationLine:
- // none | [ underline || overline || line-through || blink ] | inherit
- return parseTextDecoration(propId, important);
-
- case CSSPropertyWebkitTextDecorationSkip:
- // none | [ objects || spaces || ink || edges || box-decoration ]
- return parseTextDecorationSkip(important);
-
- case CSSPropertyWebkitTextUnderlinePosition:
- // auto | alphabetic | under
- return parseTextUnderlinePosition(important);
-
- case CSSPropertyZoom:
- // normal | reset | document | <number> | <percentage> | inherit
- if (id == CSSValueNormal || id == CSSValueReset || id == CSSValueDocument)
- validPrimitive = true;
- else
- validPrimitive = (!id && validateUnit(valueWithCalculation, FNumber | FPercent | FNonNeg, HTMLStandardMode));
- break;
-
- case CSSPropertySrc: // Only used within @font-face and @-webkit-filter, so cannot use inherit | initial or be !important. This is a list of urls or local references.
- return parseFontFaceSrc();
-
- case CSSPropertyUnicodeRange:
- return parseFontFaceUnicodeRange();
-
- /* CSS3 properties */
-
- case CSSPropertyBorderImage: {
- RefPtr<CSSValue> result;
- return parseBorderImage(propId, result, important);
- }
- case CSSPropertyWebkitBorderImage:
- case CSSPropertyWebkitMaskBoxImage: {
- RefPtr<CSSValue> result;
- if (parseBorderImage(propId, result)) {
- addProperty(propId, WTFMove(result), important);
- return true;
- }
- break;
- }
- case CSSPropertyBorderImageOutset:
- case CSSPropertyWebkitMaskBoxImageOutset: {
- RefPtr<CSSPrimitiveValue> result;
- if (parseBorderImageOutset(result)) {
- addProperty(propId, WTFMove(result), important);
- return true;
- }
- break;
- }
- case CSSPropertyBorderImageRepeat:
- case CSSPropertyWebkitMaskBoxImageRepeat: {
- RefPtr<CSSValue> result;
- if (parseBorderImageRepeat(result)) {
- addProperty(propId, WTFMove(result), important);
- return true;
- }
- break;
- }
- case CSSPropertyBorderImageSlice:
- case CSSPropertyWebkitMaskBoxImageSlice: {
- RefPtr<CSSBorderImageSliceValue> result;
- if (parseBorderImageSlice(propId, result)) {
- addProperty(propId, WTFMove(result), important);
- return true;
- }
- break;
- }
- case CSSPropertyBorderImageWidth:
- case CSSPropertyWebkitMaskBoxImageWidth: {
- RefPtr<CSSPrimitiveValue> result;
- if (parseBorderImageWidth(result)) {
- addProperty(propId, WTFMove(result), important);
- return true;
- }
- break;
- }
- case CSSPropertyBorderTopRightRadius:
- case CSSPropertyBorderTopLeftRadius:
- case CSSPropertyBorderBottomLeftRadius:
- case CSSPropertyBorderBottomRightRadius: {
- if (num != 1 && num != 2)
- return false;
- validPrimitive = validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg);
- if (!validPrimitive)
- return false;
- auto parsedValue1 = createPrimitiveNumericValue(valueWithCalculation);
- RefPtr<CSSPrimitiveValue> parsedValue2;
- if (num == 2) {
- ValueWithCalculation nextValueWithCalculation(*m_valueList->next());
- validPrimitive = validateUnit(nextValueWithCalculation, FLength | FPercent | FNonNeg);
- if (!validPrimitive)
- return false;
- parsedValue2 = createPrimitiveNumericValue(nextValueWithCalculation);
- } else
- parsedValue2 = parsedValue1.ptr();
-
- addProperty(propId, createPrimitiveValuePair(WTFMove(parsedValue1), parsedValue2.releaseNonNull()), important);
- return true;
- }
- case CSSPropertyTabSize:
- validPrimitive = validateUnit(valueWithCalculation, FInteger | FNonNeg);
- break;
- case CSSPropertyWebkitAspectRatio:
- return parseAspectRatio(important);
- case CSSPropertyBorderRadius:
- case CSSPropertyWebkitBorderRadius:
- return parseBorderRadius(propId, important);
- case CSSPropertyOutlineOffset:
- validPrimitive = validateUnit(valueWithCalculation, FLength);
- break;
- case CSSPropertyTextShadow: // CSS2 property, dropped in CSS2.1, back in CSS3, so treat as CSS3
- case CSSPropertyBoxShadow:
- case CSSPropertyWebkitBoxShadow:
- if (id == CSSValueNone)
- validPrimitive = true;
- else {
- RefPtr<CSSValueList> shadowValueList = parseShadow(*m_valueList, propId);
- if (shadowValueList) {
- addProperty(propId, shadowValueList.releaseNonNull(), important);
- m_valueList->next();
- return true;
- }
- return false;
- }
- break;
- case CSSPropertyWebkitInitialLetter: {
- if (id == CSSValueNormal)
- validPrimitive = true;
- else {
- if (num != 1 && num != 2)
- return false;
- validPrimitive = validateUnit(valueWithCalculation, FPositiveInteger);
- if (!validPrimitive)
- return false;
- auto height = createPrimitiveNumericValue(valueWithCalculation);
- RefPtr<CSSPrimitiveValue> position;
- if (num == 2) {
- ValueWithCalculation nextValueWithCalculation(*m_valueList->next());
- validPrimitive = validateUnit(nextValueWithCalculation, FPositiveInteger);
- if (!validPrimitive)
- return false;
- position = createPrimitiveNumericValue(nextValueWithCalculation);
- } else
- position = height.ptr();
- addProperty(propId, createPrimitiveValuePair(position.releaseNonNull(), WTFMove(height)), important);
- return true;
- }
- break;
- }
- case CSSPropertyWebkitBoxReflect:
- if (id == CSSValueNone)
- validPrimitive = true;
- else
- return parseReflect(propId, important);
- break;
- case CSSPropertyOpacity:
- validPrimitive = validateUnit(valueWithCalculation, FNumber);
- break;
- case CSSPropertyWebkitBoxFlex:
- validPrimitive = validateUnit(valueWithCalculation, FNumber);
- break;
- case CSSPropertyWebkitBoxFlexGroup:
- validPrimitive = validateUnit(valueWithCalculation, FInteger | FNonNeg, HTMLStandardMode);
- break;
- case CSSPropertyWebkitBoxOrdinalGroup:
- validPrimitive = validateUnit(valueWithCalculation, FInteger | FNonNeg, HTMLStandardMode) && valueWithCalculation.value().fValue;
- break;
- case CSSPropertyFilter:
-#if ENABLE(FILTERS_LEVEL_2)
- case CSSPropertyWebkitBackdropFilter:
-#endif
- if (id == CSSValueNone)
- validPrimitive = true;
- else {
- RefPtr<CSSValueList> currValue;
- if (!parseFilter(*m_valueList, currValue))
- return false;
- addProperty(propId, WTFMove(currValue), important);
- return true;
- }
- break;
- case CSSPropertyFlex: {
- ShorthandScope scope(this, propId);
- if (id == CSSValueNone) {
- addProperty(CSSPropertyFlexGrow, cssValuePool.createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
- addProperty(CSSPropertyFlexShrink, cssValuePool.createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
- addProperty(CSSPropertyFlexBasis, cssValuePool.createIdentifierValue(CSSValueAuto), important);
- return true;
- }
- return parseFlex(*m_valueList, important);
- }
- case CSSPropertyFlexBasis:
- // FIXME: Support intrinsic dimensions too.
- if (id == CSSValueAuto)
- validPrimitive = true;
- else
- validPrimitive = (!id && validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg));
- break;
- case CSSPropertyFlexGrow:
- case CSSPropertyFlexShrink:
- validPrimitive = validateUnit(valueWithCalculation, FNumber | FNonNeg);
- break;
- case CSSPropertyOrder:
- if (validateUnit(valueWithCalculation, FInteger, HTMLStandardMode)) {
- // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set.
- double result = std::max<double>(std::numeric_limits<int>::min() + 2, parsedDouble(valueWithCalculation));
- parsedValue = cssValuePool.createValue(result, CSSPrimitiveValue::CSS_NUMBER);
- m_valueList->next();
- }
- break;
- case CSSPropertyWebkitMarquee:
- return parseShorthand(propId, webkitMarqueeShorthand(), important);
- case CSSPropertyWebkitMarqueeIncrement:
- if (id == CSSValueSmall || id == CSSValueLarge || id == CSSValueMedium)
- validPrimitive = true;
- else
- validPrimitive = validateUnit(valueWithCalculation, FLength | FPercent);
- break;
- case CSSPropertyWebkitMarqueeRepetition:
- if (id == CSSValueInfinite)
- validPrimitive = true;
- else
- validPrimitive = validateUnit(valueWithCalculation, FInteger | FNonNeg);
- break;
- case CSSPropertyWebkitMarqueeSpeed:
- if (id == CSSValueNormal || id == CSSValueSlow || id == CSSValueFast)
- validPrimitive = true;
- else
- validPrimitive = validateUnit(valueWithCalculation, FTime | FInteger | FNonNeg);
- break;
-#if ENABLE(CSS_REGIONS)
- case CSSPropertyWebkitFlowInto:
- return parseFlowThread(propId, important);
- case CSSPropertyWebkitFlowFrom:
- return parseRegionThread(propId, important);
-#endif
- case CSSPropertyTransform:
- if (id == CSSValueNone)
- validPrimitive = true;
- else {
- if (RefPtr<CSSValue> transformValue = parseTransform()) {
- addProperty(propId, transformValue.releaseNonNull(), important);
- return true;
- }
- return false;
- }
- break;
- case CSSPropertyTransformOrigin:
- case CSSPropertyTransformOriginX:
- case CSSPropertyTransformOriginY:
- case CSSPropertyTransformOriginZ: {
- RefPtr<CSSPrimitiveValue> val1;
- RefPtr<CSSPrimitiveValue> val2;
- RefPtr<CSSValue> val3;
- CSSPropertyID propId1, propId2, propId3;
- if (parseTransformOrigin(propId, propId1, propId2, propId3, val1, val2, val3)) {
- addProperty(propId1, WTFMove(val1), important);
- if (val2)
- addProperty(propId2, WTFMove(val2), important);
- if (val3)
- addProperty(propId3, WTFMove(val3), important);
- return true;
- }
- return false;
- }
- case CSSPropertyPerspective:
- if (id == CSSValueNone)
- validPrimitive = true;
- else {
- // Accepting valueless numbers is a quirk of the -webkit prefixed version of the property.
- if (validateUnit(valueWithCalculation, FNumber | FLength | FNonNeg)) {
- addProperty(propId, createPrimitiveNumericValue(valueWithCalculation), important);
- return true;
- }
- }
- break;
- case CSSPropertyPerspectiveOrigin:
- case CSSPropertyPerspectiveOriginX:
- case CSSPropertyPerspectiveOriginY: {
- RefPtr<CSSPrimitiveValue> val1;
- RefPtr<CSSPrimitiveValue> val2;
- CSSPropertyID propId1, propId2;
- if (parsePerspectiveOrigin(propId, propId1, propId2, val1, val2)) {
- addProperty(propId1, WTFMove(val1), important);
- if (val2)
- addProperty(propId2, WTFMove(val2), important);
- return true;
- }
- return false;
- }
- case CSSPropertyAnimationDelay:
- case CSSPropertyAnimationDirection:
- case CSSPropertyAnimationDuration:
- case CSSPropertyAnimationFillMode:
- case CSSPropertyAnimationName:
- case CSSPropertyAnimationPlayState:
- case CSSPropertyAnimationIterationCount:
- case CSSPropertyAnimationTimingFunction:
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
- case CSSPropertyWebkitAnimationTrigger:
-#endif
- case CSSPropertyTransitionDelay:
- case CSSPropertyTransitionDuration:
- case CSSPropertyTransitionTimingFunction:
- case CSSPropertyTransitionProperty: {
- RefPtr<CSSValue> val;
- AnimationParseContext context;
- if (parseAnimationProperty(propId, val, context)) {
- addProperty(propId, WTFMove(val), important);
- return true;
- }
- return false;
- }
-#if ENABLE(CSS_GRID_LAYOUT)
- case CSSPropertyJustifyContent:
- ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
- parsedValue = parseContentDistributionOverflowPosition();
- break;
- case CSSPropertyJustifySelf:
- if (!isCSSGridLayoutEnabled())
- return false;
- return parseItemPositionOverflowPosition(propId, important);
- case CSSPropertyJustifyItems:
- if (!isCSSGridLayoutEnabled())
- return false;
- if (parseLegacyPosition(propId, important))
- return true;
- m_valueList->setCurrentIndex(0);
- return parseItemPositionOverflowPosition(propId, important);
- case CSSPropertyGridAutoColumns:
- case CSSPropertyGridAutoRows:
- if (!isCSSGridLayoutEnabled())
- return false;
- parsedValue = parseGridTrackList(GridAuto);
- break;
-
- case CSSPropertyGridTemplateColumns:
- case CSSPropertyGridTemplateRows:
- if (!isCSSGridLayoutEnabled())
- return false;
- parsedValue = parseGridTrackList(GridTemplate);
- break;
-
- case CSSPropertyGridColumnStart:
- case CSSPropertyGridColumnEnd:
- case CSSPropertyGridRowStart:
- case CSSPropertyGridRowEnd:
- if (!isCSSGridLayoutEnabled())
- return false;
- parsedValue = parseGridPosition();
- break;
-
- case CSSPropertyGridColumnGap:
- case CSSPropertyGridRowGap:
- if (!isCSSGridLayoutEnabled())
- return false;
- validPrimitive = validateUnit(valueWithCalculation, FLength | FNonNeg);
- break;
-
- case CSSPropertyGridGap:
- if (!isCSSGridLayoutEnabled())
- return false;
- return parseGridGapShorthand(important);
-
- case CSSPropertyGridColumn:
- case CSSPropertyGridRow:
- if (!isCSSGridLayoutEnabled())
- return false;
- return parseGridItemPositionShorthand(propId, important);
-
- case CSSPropertyGridTemplate:
- if (!isCSSGridLayoutEnabled())
- return false;
- return parseGridTemplateShorthand(important);
-
- case CSSPropertyGrid:
- if (!isCSSGridLayoutEnabled())
- return false;
- return parseGridShorthand(important);
-
- case CSSPropertyGridArea:
- if (!isCSSGridLayoutEnabled())
- return false;
- return parseGridAreaShorthand(important);
-
- case CSSPropertyGridTemplateAreas:
- if (!isCSSGridLayoutEnabled())
- return false;
- parsedValue = parseGridTemplateAreas();
- break;
- case CSSPropertyGridAutoFlow:
- if (!isCSSGridLayoutEnabled())
- return false;
- parsedValue = parseGridAutoFlow(*m_valueList);
- break;
-#endif /* ENABLE(CSS_GRID_LAYOUT) */
- case CSSPropertyWebkitMarginCollapse: {
- if (num == 1) {
- ShorthandScope scope(this, CSSPropertyWebkitMarginCollapse);
- if (!parseValue(webkitMarginCollapseShorthand().properties()[0], important))
- return false;
- CSSValue* value = m_parsedProperties.last().value();
- addProperty(webkitMarginCollapseShorthand().properties()[1], value, important);
- return true;
- }
- else if (num == 2) {
- ShorthandScope scope(this, CSSPropertyWebkitMarginCollapse);
- if (!parseValue(webkitMarginCollapseShorthand().properties()[0], important) || !parseValue(webkitMarginCollapseShorthand().properties()[1], important))
- return false;
- return true;
- }
- return false;
- }
- case CSSPropertyTextLineThroughWidth:
- case CSSPropertyTextOverlineWidth:
- case CSSPropertyTextUnderlineWidth:
- if (id == CSSValueAuto || id == CSSValueNormal || id == CSSValueThin ||
- id == CSSValueMedium || id == CSSValueThick)
- validPrimitive = true;
- else
- validPrimitive = !id && validateUnit(valueWithCalculation, FNumber | FLength | FPercent);
- break;
- case CSSPropertyColumnCount:
- parsedValue = parseColumnCount();
- break;
- case CSSPropertyColumnGap: // normal | <length>
- if (id == CSSValueNormal)
- validPrimitive = true;
- else
- validPrimitive = validateUnit(valueWithCalculation, FLength | FNonNeg);
- break;
- case CSSPropertyColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
- if (id == CSSValueAll || id == CSSValueNone)
- validPrimitive = true;
- else if (validateUnit(valueWithCalculation, FNumber | FNonNeg) && parsedDouble(valueWithCalculation) == 1) {
- addProperty(CSSPropertyColumnSpan, cssValuePool.createValue(1, CSSPrimitiveValue::CSS_NUMBER), important);
- return true;
- }
- break;
- case CSSPropertyColumnWidth: // auto | <length>
- parsedValue = parseColumnWidth();
- break;
- case CSSPropertyObjectPosition: {
- RefPtr<CSSPrimitiveValue> val1;
- RefPtr<CSSPrimitiveValue> val2;
- parseFillPosition(*m_valueList, val1, val2);
- if (val1) {
- addProperty(CSSPropertyObjectPosition, createPrimitiveValuePair(val1.releaseNonNull(), WTFMove(val2)), important);
- return true;
- }
- return false;
- }
- // End of CSS3 properties
-
- case CSSPropertyWillChange: // auto | [scroll-position | contents | <custom-ident>]#
- if (id == CSSValueAuto)
- validPrimitive = true;
- else
- return parseWillChange(important);
- break;
-
- // Apple specific properties. These will never be standardized and are purely to
- // support custom WebKit-based Apple applications.
- case CSSPropertyWebkitLineClamp:
- // When specifying number of lines, don't allow 0 as a valid value
- // When specifying either type of unit, require non-negative integers
- validPrimitive = (!id && (valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_PERCENTAGE || valueWithCalculation.value().fValue) && validateUnit(valueWithCalculation, FInteger | FPercent | FNonNeg, HTMLQuirksMode));
- break;
-#if ENABLE(TEXT_AUTOSIZING)
- case CSSPropertyWebkitTextSizeAdjust:
- // FIXME: Support toggling the validation of this property via a runtime setting that is independent of
- // whether isTextAutosizingEnabled() is true. We want to enable this property on iOS, when simulating
- // a iOS device in Safari's responsive design mode and when optionally enabled in DRT/WTR. Otherwise,
- // this property should be disabled by default.
-#if !PLATFORM(IOS)
- if (!isTextAutosizingEnabled())
- return false;
-#endif
-
- if (id == CSSValueAuto || id == CSSValueNone)
- validPrimitive = true;
- else {
- // FIXME: Handle multilength case where we allow relative units.
- validPrimitive = (!id && validateUnit(valueWithCalculation, FPercent | FNonNeg, HTMLStandardMode));
- }
- break;
-#endif
-
- case CSSPropertyWebkitFontSizeDelta: // <length>
- validPrimitive = validateUnit(valueWithCalculation, FLength);
- break;
-
- case CSSPropertyWebkitHyphenateCharacter:
- if (id == CSSValueAuto || valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_STRING)
- validPrimitive = true;
- break;
-
- case CSSPropertyWebkitHyphenateLimitBefore:
- case CSSPropertyWebkitHyphenateLimitAfter:
- if (id == CSSValueAuto || validateUnit(valueWithCalculation, FInteger | FNonNeg, HTMLStandardMode))
- validPrimitive = true;
- break;
-
- case CSSPropertyWebkitHyphenateLimitLines:
- if (id == CSSValueNoLimit || validateUnit(valueWithCalculation, FInteger | FNonNeg, HTMLStandardMode))
- validPrimitive = true;
- break;
-
- case CSSPropertyWebkitLineGrid:
- if (id == CSSValueNone)
- validPrimitive = true;
- else if (valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_IDENT) {
- String lineGridValue = String(valueWithCalculation.value().string);
- if (!lineGridValue.isEmpty()) {
- addProperty(propId, cssValuePool.createValue(lineGridValue, CSSPrimitiveValue::CSS_STRING), important);
- return true;
- }
- }
- break;
- case CSSPropertyWebkitLocale:
- if (id == CSSValueAuto || valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_STRING)
- validPrimitive = true;
- break;
-
-#if ENABLE(DASHBOARD_SUPPORT)
- case CSSPropertyWebkitDashboardRegion: // <dashboard-region> | <dashboard-region>
- if (valueWithCalculation.value().unit == CSSParserValue::Function || id == CSSValueNone)
- return parseDashboardRegions(propId, important);
- break;
-#endif
-
-#if ENABLE(TOUCH_EVENTS)
- case CSSPropertyWebkitTapHighlightColor:
- if (isValidSystemColorValue(id) || id == CSSValueMenu
- || (id >= CSSValueWebkitFocusRingColor && id < CSSValueWebkitText && inQuirksMode())) {
- validPrimitive = true;
- } else {
- parsedValue = parseColor();
- if (parsedValue)
- m_valueList->next();
- }
- break;
-#endif
- // End Apple-specific properties
-
- /* shorthand properties */
- case CSSPropertyBackground: {
- // Position must come before color in this array because a plain old "0" is a legal color
- // in quirks mode but it's usually the X coordinate of a position.
- const CSSPropertyID properties[] = { CSSPropertyBackgroundImage, CSSPropertyBackgroundRepeat,
- CSSPropertyBackgroundAttachment, CSSPropertyBackgroundPosition, CSSPropertyBackgroundOrigin,
- CSSPropertyBackgroundClip, CSSPropertyBackgroundColor, CSSPropertyBackgroundSize };
- return parseFillShorthand(propId, properties, WTF_ARRAY_LENGTH(properties), important);
- }
- case CSSPropertyWebkitMask: {
- const CSSPropertyID properties[] = { CSSPropertyWebkitMaskImage, CSSPropertyWebkitMaskSourceType, CSSPropertyWebkitMaskRepeat,
- CSSPropertyWebkitMaskPosition, CSSPropertyWebkitMaskOrigin, CSSPropertyWebkitMaskClip, CSSPropertyWebkitMaskSize };
- return parseFillShorthand(propId, properties, WTF_ARRAY_LENGTH(properties), important);
- }
- case CSSPropertyBorder:
- // [ 'border-width' || 'border-style' || <color> ] | inherit
- {
- if (parseShorthand(propId, borderAbridgedShorthand(), important)) {
- // The CSS3 Borders and Backgrounds specification says that border also resets border-image. It's as
- // though a value of none was specified for the image.
- addExpandedPropertyForValue(CSSPropertyBorderImage, cssValuePool.createImplicitInitialValue(), important);
- return true;
- }
- return false;
- }
- case CSSPropertyBorderTop:
- // [ 'border-top-width' || 'border-style' || <color> ] | inherit
- return parseShorthand(propId, borderTopShorthand(), important);
- case CSSPropertyBorderRight:
- // [ 'border-right-width' || 'border-style' || <color> ] | inherit
- return parseShorthand(propId, borderRightShorthand(), important);
- case CSSPropertyBorderBottom:
- // [ 'border-bottom-width' || 'border-style' || <color> ] | inherit
- return parseShorthand(propId, borderBottomShorthand(), important);
- case CSSPropertyBorderLeft:
- // [ 'border-left-width' || 'border-style' || <color> ] | inherit
- return parseShorthand(propId, borderLeftShorthand(), important);
- case CSSPropertyWebkitBorderStart:
- return parseShorthand(propId, webkitBorderStartShorthand(), important);
- case CSSPropertyWebkitBorderEnd:
- return parseShorthand(propId, webkitBorderEndShorthand(), important);
- case CSSPropertyWebkitBorderBefore:
- return parseShorthand(propId, webkitBorderBeforeShorthand(), important);
- case CSSPropertyWebkitBorderAfter:
- return parseShorthand(propId, webkitBorderAfterShorthand(), important);
- case CSSPropertyOutline:
- // [ 'outline-color' || 'outline-style' || 'outline-width' ] | inherit
- return parseShorthand(propId, outlineShorthand(), important);
- case CSSPropertyBorderColor:
- // <color>{1,4} | inherit
- return parse4Values(propId, borderColorShorthand().properties(), important);
- case CSSPropertyBorderWidth:
- // <border-width>{1,4} | inherit
- return parse4Values(propId, borderWidthShorthand().properties(), important);
- case CSSPropertyBorderStyle:
- // <border-style>{1,4} | inherit
- return parse4Values(propId, borderStyleShorthand().properties(), important);
- case CSSPropertyMargin:
- // <margin-width>{1,4} | inherit
- return parse4Values(propId, marginShorthand().properties(), important);
- case CSSPropertyPadding:
- // <padding-width>{1,4} | inherit
- return parse4Values(propId, paddingShorthand().properties(), important);
- case CSSPropertyFlexFlow:
- return parseShorthand(propId, flexFlowShorthand(), important);
- case CSSPropertyFont:
- // [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]?
- // 'font-family' ] | caption | icon | menu | message-box | small-caption | status-bar | inherit
- if (num == 1 && id >= CSSValueCaption && id <= CSSValueStatusBar) {
- parseSystemFont(important);
- return true;
- }
- return parseFont(important);
- case CSSPropertyListStyle:
- return parseShorthand(propId, listStyleShorthand(), important);
- case CSSPropertyColumns:
- return parseColumnsShorthand(important);
- case CSSPropertyColumnRule:
- return parseShorthand(propId, columnRuleShorthand(), important);
- case CSSPropertyWebkitTextStroke:
- return parseShorthand(propId, webkitTextStrokeShorthand(), important);
- case CSSPropertyAnimation:
- return parseAnimationShorthand(propId, important);
- case CSSPropertyTransition:
- return parseTransitionShorthand(propId, important);
- case CSSPropertyInvalid:
- return false;
- case CSSPropertyPage:
- return parsePage(propId, important);
- case CSSPropertyTextLineThrough:
- case CSSPropertyTextOverline:
- case CSSPropertyTextUnderline:
- return false;
- // CSS Text Layout Module Level 3: Vertical writing support
- case CSSPropertyWebkitTextEmphasis:
- return parseShorthand(propId, webkitTextEmphasisShorthand(), important);
-
- case CSSPropertyWebkitTextEmphasisStyle:
- return parseTextEmphasisStyle(important);
-
- case CSSPropertyWebkitTextEmphasisPosition:
- return parseTextEmphasisPosition(important);
-
- case CSSPropertyHangingPunctuation:
- return parseHangingPunctuation(important);
- case CSSPropertyWebkitLineBoxContain:
- if (id == CSSValueNone)
- validPrimitive = true;
- else
- return parseLineBoxContain(important);
- break;
- case CSSPropertyFontFeatureSettings:
- if (id == CSSValueNormal)
- validPrimitive = true;
- else
- return parseFontFeatureSettings(important);
- break;
-#if ENABLE(VARIATION_FONTS)
- case CSSPropertyFontVariationSettings:
- if (m_context.variationFontsEnabled) {
- if (id == CSSValueNormal)
- validPrimitive = true;
- else
- return parseFontVariationSettings(important);
- }
- break;
-#endif
- case CSSPropertyFontVariantLigatures:
- if (id == CSSValueNormal || id == CSSValueNone)
- validPrimitive = true;
- else
- return parseFontVariantLigatures(important, true, false);
- break;
- case CSSPropertyFontVariantNumeric:
- if (id == CSSValueNormal)
- validPrimitive = true;
- else
- return parseFontVariantNumeric(important, true, false);
- break;
- case CSSPropertyFontVariantEastAsian:
- if (id == CSSValueNormal)
- validPrimitive = true;
- else
- return parseFontVariantEastAsian(important, true, false);
- break;
- case CSSPropertyFontVariant:
- if (id == CSSValueNormal) {
- ShorthandScope scope(this, CSSPropertyFontVariant);
- addProperty(CSSPropertyFontVariantLigatures, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
- addProperty(CSSPropertyFontVariantPosition, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
- addProperty(CSSPropertyFontVariantNumeric, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
- addProperty(CSSPropertyFontVariantAlternates, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
- addProperty(CSSPropertyFontVariantEastAsian, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
- return true;
- }
- if (id == CSSValueNone) {
- ShorthandScope scope(this, CSSPropertyFontVariant);
- addProperty(CSSPropertyFontVariantLigatures, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important, true);
- return true;
- }
- return parseFontVariant(important);
-
- case CSSPropertyWebkitClipPath:
- parsedValue = parseClipPath();
- break;
- case CSSPropertyShapeOutside:
- parsedValue = parseShapeProperty(propId);
- break;
- case CSSPropertyShapeMargin:
- validPrimitive = !id && validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg);
- break;
- case CSSPropertyShapeImageThreshold:
- validPrimitive = !id && validateUnit(valueWithCalculation, FNumber);
- break;
-#if ENABLE(CSS_IMAGE_ORIENTATION)
- case CSSPropertyImageOrientation:
- validPrimitive = !id && validateUnit(valueWithCalculation, FAngle);
- break;
-#endif
-#if ENABLE(CSS_IMAGE_RESOLUTION)
- case CSSPropertyImageResolution:
- parsedValue = parseImageResolution();
- break;
-#endif
-#if ENABLE(CSS_GRID_LAYOUT)
- case CSSPropertyAlignContent:
- ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
- parsedValue = parseContentDistributionOverflowPosition();
- break;
- case CSSPropertyAlignSelf:
- ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
- return parseItemPositionOverflowPosition(propId, important);
-
- case CSSPropertyAlignItems:
- ASSERT(RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled());
- return parseItemPositionOverflowPosition(propId, important);
-#endif
-#if ENABLE(CSS_DEVICE_ADAPTATION)
- // Properties bellow are validated inside parseViewportProperty, because we
- // check for parser state inViewportScope. We need to invalidate if someone
- // adds them outside a @viewport rule.
- case CSSPropertyMaxZoom:
- case CSSPropertyMinZoom:
- case CSSPropertyOrientation:
- case CSSPropertyUserZoom:
- validPrimitive = false;
- break;
-#endif
-#if ENABLE(CSS_SCROLL_SNAP)
- case CSSPropertyWebkitScrollSnapPointsX:
- case CSSPropertyWebkitScrollSnapPointsY:
- if (id == CSSValueElements) {
- validPrimitive = true;
- break;
- }
- return parseNonElementSnapPoints(propId, important);
- case CSSPropertyWebkitScrollSnapDestination: // <length>{2}
- return parseScrollSnapDestination(propId, important);
- case CSSPropertyWebkitScrollSnapCoordinate:
- return parseScrollSnapCoordinate(propId, important);
-#endif
-
- default:
- return parseSVGValue(propId, important);
- }
-
- if (validPrimitive) {
- parsedValue = parseValidPrimitive(id, valueWithCalculation);
- m_valueList->next();
- }
-
- if (parsedValue && (!m_valueList->current() || inShorthand())) {
- addProperty(propId, parsedValue.releaseNonNull(), important);
- return true;
- }
- return false;
-}
-
-void CSSParser::addFillValue(RefPtr<CSSValue>& lval, Ref<CSSValue>&& rval)
-{
- if (!lval) {
- lval = WTFMove(rval);
- return;
- }
-
- if (lval->isBaseValueList()) {
- downcast<CSSValueList>(*lval).append(WTFMove(rval));
- return;
- }
-
- auto list = CSSValueList::createCommaSeparated();
- list.get().append(lval.releaseNonNull());
- list.get().append(WTFMove(rval));
- lval = WTFMove(list);
-}
-
-static bool isContentDistributionKeyword(CSSValueID id)
-{
- return id == CSSValueSpaceBetween || id == CSSValueSpaceAround
- || id == CSSValueSpaceEvenly || id == CSSValueStretch;
-}
-
-static bool isContentPositionKeyword(CSSValueID id)
-{
- return id == CSSValueStart || id == CSSValueEnd || id == CSSValueCenter
- || id == CSSValueFlexStart || id == CSSValueFlexEnd
- || id == CSSValueLeft || id == CSSValueRight;
-}
-
-static inline bool isBaselinePositionKeyword(CSSValueID id)
-{
- return id == CSSValueBaseline || id == CSSValueLastBaseline;
-}
-
-static bool isAlignmentOverflowKeyword(CSSValueID id)
-{
- return id == CSSValueUnsafe || id == CSSValueSafe;
-}
-
-static bool isItemPositionKeyword(CSSValueID id)
-{
- return id == CSSValueStart || id == CSSValueEnd || id == CSSValueCenter
- || id == CSSValueSelfStart || id == CSSValueSelfEnd || id == CSSValueFlexStart
- || id == CSSValueFlexEnd || id == CSSValueLeft || id == CSSValueRight;
-}
-
-bool CSSParser::parseLegacyPosition(CSSPropertyID propId, bool important)
-{
- // [ legacy && [ left | right | center ]
-
- CSSParserValue* value = m_valueList->current();
- if (!value)
- return false;
-
- if (value->id == CSSValueLegacy) {
- value = m_valueList->next();
- if (!value)
- return false;
- if (value->id != CSSValueCenter && value->id != CSSValueLeft && value->id != CSSValueRight)
- return false;
- } else if (value->id == CSSValueCenter || value->id == CSSValueLeft || value->id == CSSValueRight) {
- if (!m_valueList->next() || m_valueList->current()->id != CSSValueLegacy)
- return false;
- } else
- return false;
-
- auto& cssValuePool = CSSValuePool::singleton();
- addProperty(propId, createPrimitiveValuePair(cssValuePool.createIdentifierValue(CSSValueLegacy), cssValuePool.createIdentifierValue(value->id)), important);
- return !m_valueList->next();
-}
-
-RefPtr<CSSContentDistributionValue> CSSParser::parseContentDistributionOverflowPosition()
-{
- // normal | <baseline-position> | <content-distribution> || [ <overflow-position>? && <content-position> ]
- // <baseline-position> = baseline | last-baseline;
- // <content-distribution> = space-between | space-around | space-evenly | stretch;
- // <content-position> = center | start | end | flex-start | flex-end | left | right;
- // <overflow-position> = unsafe | safe
-
- CSSParserValue* value = m_valueList->current();
- if (!value)
- return nullptr;
-
- // auto | <baseline-position>
- if (value->id == CSSValueNormal || isBaselinePositionKeyword(value->id)) {
- m_valueList->next();
- return CSSContentDistributionValue::create(CSSValueInvalid, value->id, CSSValueInvalid);
- }
-
- CSSValueID distribution = CSSValueInvalid;
- CSSValueID position = CSSValueInvalid;
- CSSValueID overflow = CSSValueInvalid;
- while (value) {
- if (isContentDistributionKeyword(value->id)) {
- if (distribution != CSSValueInvalid)
- return nullptr;
- distribution = value->id;
- } else if (isContentPositionKeyword(value->id)) {
- if (position != CSSValueInvalid)
- return nullptr;
- position = value->id;
- } else if (isAlignmentOverflowKeyword(value->id)) {
- if (overflow != CSSValueInvalid)
- return nullptr;
- overflow = value->id;
- } else
- return nullptr;
- value = m_valueList->next();
- }
-
- // The grammar states that we should have at least <content-distribution> or
- // <content-position> ( <content-distribution> || <content-position> ).
- if (position == CSSValueInvalid && distribution == CSSValueInvalid)
- return nullptr;
-
- // The grammar states that <overflow-position> must be associated to <content-position>.
- if (overflow != CSSValueInvalid && position == CSSValueInvalid)
- return nullptr;
-
- return CSSContentDistributionValue::create(distribution, position, overflow);
-}
-
-bool CSSParser::parseItemPositionOverflowPosition(CSSPropertyID propId, bool important)
-{
- // auto | normal | stretch | <baseline-position> | [<item-position> && <overflow-position>? ]
- // <baseline-position> = baseline | last-baseline;
- // <item-position> = center | start | end | self-start | self-end | flex-start | flex-end | left | right;
- // <overflow-position> = unsafe | safe
-
- CSSParserValue* value = m_valueList->current();
- if (!value)
- return false;
-
- if (value->id == CSSValueAuto || value->id == CSSValueNormal || value->id == CSSValueStretch || isBaselinePositionKeyword(value->id)) {
- // align-items property does not allow the 'auto' value.
- if (value->id == CSSValueAuto && propId == CSSPropertyAlignItems)
- return false;
- if (m_valueList->next())
- return false;
-
- addProperty(propId, CSSValuePool::singleton().createIdentifierValue(value->id), important);
- return true;
- }
-
- RefPtr<CSSPrimitiveValue> position;
- RefPtr<CSSPrimitiveValue> overflowAlignmentKeyword;
- if (isItemPositionKeyword(value->id)) {
- position = CSSValuePool::singleton().createIdentifierValue(value->id);
- value = m_valueList->next();
- if (value) {
- if (value->id != CSSValueUnsafe && value->id != CSSValueSafe)
- return false;
- overflowAlignmentKeyword = CSSValuePool::singleton().createIdentifierValue(value->id);
- }
- } else if (isAlignmentOverflowKeyword(value->id)) {
- overflowAlignmentKeyword = CSSValuePool::singleton().createIdentifierValue(value->id);
- value = m_valueList->next();
- if (value && isItemPositionKeyword(value->id))
- position = CSSValuePool::singleton().createIdentifierValue(value->id);
- else
- return false;
- } else
- return false;
-
- if (m_valueList->next())
- return false;
-
- ASSERT(position);
- if (overflowAlignmentKeyword)
- addProperty(propId, createPrimitiveValuePair(position.releaseNonNull(), overflowAlignmentKeyword.releaseNonNull()), important);
- else
- addProperty(propId, position.releaseNonNull(), important);
-
- return true;
-}
-
-static bool parseBackgroundClip(CSSParserValue& parserValue, RefPtr<CSSValue>& cssValue)
-{
- if (parserValue.id == CSSValueBorderBox || parserValue.id == CSSValuePaddingBox
- || parserValue.id == CSSValueContentBox || parserValue.id == CSSValueWebkitText) {
- cssValue = CSSValuePool::singleton().createIdentifierValue(parserValue.id);
- return true;
- }
- return false;
-}
-
-bool CSSParser::useLegacyBackgroundSizeShorthandBehavior() const
-{
- return m_context.useLegacyBackgroundSizeShorthandBehavior;
-}
-
-#if ENABLE(CSS_SCROLL_SNAP)
-bool CSSParser::parseNonElementSnapPoints(CSSPropertyID propId, bool important)
-{
- auto values = CSSValueList::createSpaceSeparated();
- while (CSSParserValue* value = m_valueList->current()) {
- ValueWithCalculation valueWithCalculation(*value);
- if (validateUnit(valueWithCalculation, FPercent | FLength))
- values->append(createPrimitiveNumericValue(valueWithCalculation));
- else if (value->unit == CSSParserValue::Function
- && value->function->args
- && value->function->args->size() == 1
- && equalLettersIgnoringASCIICase(value->function->name, "repeat(")) {
- ValueWithCalculation argumentWithCalculation(*value->function->args.get()->current());
- if (validateUnit(argumentWithCalculation, FLength | FPercent | FNonNeg)) {
- values->append(CSSValuePool::singleton().createValue(LengthRepeat::create(createPrimitiveNumericValue(argumentWithCalculation))));
- m_valueList->next();
- if (m_valueList->current())
- return false;
- break;
- }
- } else
- return false;
- m_valueList->next();
- }
- if (values->length()) {
- addProperty(propId, WTFMove(values), important);
- m_valueList->next();
- return true;
- }
- return false;
-}
-
-bool CSSParser::parseScrollSnapPositions(RefPtr<CSSValue>& cssValueX, RefPtr<CSSValue>& cssValueY)
-{
- cssValueX = parsePositionX(*m_valueList);
- if (!cssValueX)
- return false;
-
- // Don't accept odd-length lists of positions (must always have an X and a Y):
- if (!m_valueList->next())
- return false;
-
- cssValueY = parsePositionY(*m_valueList);
- if (!cssValueY)
- return false;
-
- return true;
-}
-
-bool CSSParser::parseScrollSnapDestination(CSSPropertyID propId, bool important)
-{
- auto position = CSSValueList::createSpaceSeparated();
- if (m_valueList->size() != 2)
- return false;
-
- RefPtr<CSSValue> cssValueX, cssValueY;
- if (!parseScrollSnapPositions(cssValueX, cssValueY))
- return false;
-
- position->append(cssValueX.releaseNonNull());
- position->append(cssValueY.releaseNonNull());
- addProperty(propId, WTFMove(position), important);
- m_valueList->next();
- return true;
-}
-
-bool CSSParser::parseScrollSnapCoordinate(CSSPropertyID propId, bool important)
-{
- auto positions = CSSValueList::createSpaceSeparated();
- while (m_valueList->current()) {
- RefPtr<CSSValue> cssValueX, cssValueY;
- if (!parseScrollSnapPositions(cssValueX, cssValueY))
- return false;
-
- positions->append(cssValueX.releaseNonNull());
- positions->append(cssValueY.releaseNonNull());
- m_valueList->next();
- }
-
- if (positions->length()) {
- addProperty(propId, WTFMove(positions), important);
- return true;
- }
- return false;
-}
-#endif
-
-const int cMaxFillProperties = 9;
-
-bool CSSParser::parseFillShorthand(CSSPropertyID propId, const CSSPropertyID* properties, int numProperties, bool important)
-{
- ASSERT(numProperties <= cMaxFillProperties);
- if (numProperties > cMaxFillProperties)
- return false;
-
- ShorthandScope scope(this, propId);
- SetForScope<bool> change(m_implicitShorthand);
-
- bool parsedProperty[cMaxFillProperties] = { false };
- RefPtr<CSSValue> values[cMaxFillProperties];
- RefPtr<CSSValue> clipValue;
- RefPtr<CSSValue> positionYValue;
- RefPtr<CSSValue> repeatYValue;
- bool foundClip = false;
- int i;
- bool foundPositionCSSProperty = false;
-
- auto& cssValuePool = CSSValuePool::singleton();
- while (m_valueList->current()) {
- CSSParserValue& currentValue = *m_valueList->current();
- if (currentValue.unit == CSSParserValue::Operator && currentValue.iValue == ',') {
- // We hit the end. Fill in all remaining values with the initial value.
- m_valueList->next();
- for (i = 0; i < numProperties; ++i) {
- if (properties[i] == CSSPropertyBackgroundColor && parsedProperty[i])
- // Color is not allowed except as the last item in a list for backgrounds.
- // Reject the entire property.
- return false;
-
- if (!parsedProperty[i] && properties[i] != CSSPropertyBackgroundColor) {
- addFillValue(values[i], cssValuePool.createImplicitInitialValue());
- if (properties[i] == CSSPropertyBackgroundPosition || properties[i] == CSSPropertyWebkitMaskPosition)
- addFillValue(positionYValue, cssValuePool.createImplicitInitialValue());
- if (properties[i] == CSSPropertyBackgroundRepeat || properties[i] == CSSPropertyWebkitMaskRepeat)
- addFillValue(repeatYValue, cssValuePool.createImplicitInitialValue());
- if ((properties[i] == CSSPropertyBackgroundOrigin || properties[i] == CSSPropertyWebkitMaskOrigin) && !parsedProperty[i]) {
- // If background-origin wasn't present, then reset background-clip also.
- addFillValue(clipValue, cssValuePool.createImplicitInitialValue());
- }
- }
- parsedProperty[i] = false;
- }
- if (!m_valueList->current())
- break;
- }
-
- bool sizeCSSPropertyExpected = false;
- if (isForwardSlashOperator(currentValue) && foundPositionCSSProperty) {
- sizeCSSPropertyExpected = true;
- m_valueList->next();
- }
-
- foundPositionCSSProperty = false;
- bool found = false;
- for (i = 0; !found && i < numProperties; ++i) {
-
- if (sizeCSSPropertyExpected && (properties[i] != CSSPropertyBackgroundSize && properties[i] != CSSPropertyWebkitMaskSize))
- continue;
- if (!sizeCSSPropertyExpected && (properties[i] == CSSPropertyBackgroundSize || properties[i] == CSSPropertyWebkitMaskSize))
- continue;
-
- if (!parsedProperty[i]) {
- RefPtr<CSSValue> val1;
- RefPtr<CSSValue> val2;
- CSSPropertyID propId1, propId2;
- CSSParserValue& parserValue = *m_valueList->current();
-
- if (parseFillProperty(properties[i], propId1, propId2, val1, val2)) {
- parsedProperty[i] = found = true;
- addFillValue(values[i], val1.releaseNonNull());
- if (properties[i] == CSSPropertyBackgroundPosition || properties[i] == CSSPropertyWebkitMaskPosition)
- addFillValue(positionYValue, val2.releaseNonNull());
- if (properties[i] == CSSPropertyBackgroundRepeat || properties[i] == CSSPropertyWebkitMaskRepeat)
- addFillValue(repeatYValue, val2.releaseNonNull());
- if (properties[i] == CSSPropertyBackgroundOrigin || properties[i] == CSSPropertyWebkitMaskOrigin) {
- // Reparse the value as a clip, and see if we succeed.
- if (parseBackgroundClip(parserValue, val1))
- addFillValue(clipValue, val1.releaseNonNull()); // The property parsed successfully.
- else
- addFillValue(clipValue, cssValuePool.createImplicitInitialValue()); // Some value was used for origin that is not supported by clip. Just reset clip instead.
- }
- if (properties[i] == CSSPropertyBackgroundClip || properties[i] == CSSPropertyWebkitMaskClip)
- foundClip = true;
- if (properties[i] == CSSPropertyBackgroundPosition || properties[i] == CSSPropertyWebkitMaskPosition)
- foundPositionCSSProperty = true;
- }
- }
- }
-
- // if we didn't find at least one match, this is an
- // invalid shorthand and we have to ignore it
- if (!found)
- return false;
- }
-
- // Now add all of the properties we found.
- for (i = 0; i < numProperties; ++i) {
- // Fill in any remaining properties with the initial value.
- if (!parsedProperty[i]) {
- addFillValue(values[i], cssValuePool.createImplicitInitialValue());
- if (properties[i] == CSSPropertyBackgroundPosition || properties[i] == CSSPropertyWebkitMaskPosition)
- addFillValue(positionYValue, cssValuePool.createImplicitInitialValue());
- if (properties[i] == CSSPropertyBackgroundRepeat || properties[i] == CSSPropertyWebkitMaskRepeat)
- addFillValue(repeatYValue, cssValuePool.createImplicitInitialValue());
- if (properties[i] == CSSPropertyBackgroundOrigin || properties[i] == CSSPropertyWebkitMaskOrigin) {
- // If background-origin wasn't present, then reset background-clip also.
- addFillValue(clipValue, cssValuePool.createImplicitInitialValue());
- }
- }
- if (properties[i] == CSSPropertyBackgroundPosition) {
- addProperty(CSSPropertyBackgroundPositionX, WTFMove(values[i]), important);
- // it's OK to call WTFMove(positionYValue) since we only see CSSPropertyBackgroundPosition once
- addProperty(CSSPropertyBackgroundPositionY, WTFMove(positionYValue), important);
- } else if (properties[i] == CSSPropertyWebkitMaskPosition) {
- addProperty(CSSPropertyWebkitMaskPositionX, WTFMove(values[i]), important);
- // it's OK to call WTFMove(positionYValue) since we only see CSSPropertyWebkitMaskPosition once
- addProperty(CSSPropertyWebkitMaskPositionY, WTFMove(positionYValue), important);
- } else if (properties[i] == CSSPropertyBackgroundRepeat) {
- addProperty(CSSPropertyBackgroundRepeatX, WTFMove(values[i]), important);
- // it's OK to call WTFMove(repeatYValue) since we only see CSSPropertyBackgroundPosition once
- addProperty(CSSPropertyBackgroundRepeatY, WTFMove(repeatYValue), important);
- } else if (properties[i] == CSSPropertyWebkitMaskRepeat) {
- addProperty(CSSPropertyWebkitMaskRepeatX, WTFMove(values[i]), important);
- // it's OK to call WTFMove(repeatYValue) since we only see CSSPropertyBackgroundPosition once
- addProperty(CSSPropertyWebkitMaskRepeatY, WTFMove(repeatYValue), important);
- } else if ((properties[i] == CSSPropertyBackgroundClip || properties[i] == CSSPropertyWebkitMaskClip) && !foundClip)
- // Value is already set while updating origin
- continue;
- else if (properties[i] == CSSPropertyBackgroundSize && !parsedProperty[i] && useLegacyBackgroundSizeShorthandBehavior())
- continue;
- else
- addProperty(properties[i], WTFMove(values[i]), important);
-
- // Add in clip values when we hit the corresponding origin property.
- if (properties[i] == CSSPropertyBackgroundOrigin && !foundClip)
- addProperty(CSSPropertyBackgroundClip, WTFMove(clipValue), important);
- else if (properties[i] == CSSPropertyWebkitMaskOrigin && !foundClip)
- addProperty(CSSPropertyWebkitMaskClip, WTFMove(clipValue), important);
- }
-
- return true;
-}
-
-void CSSParser::addAnimationValue(RefPtr<CSSValue>& lval, Ref<CSSValue>&& rval)
-{
- if (!lval) {
- lval = WTFMove(rval);
- return;
- }
-
- if (is<CSSValueList>(*lval)) {
- downcast<CSSValueList>(*lval).append(WTFMove(rval));
- return;
- }
-
- auto list = CSSValueList::createCommaSeparated();
- list->append(lval.releaseNonNull());
- list->append(WTFMove(rval));
- lval = WTFMove(list);
-}
-
-bool CSSParser::parseAnimationShorthand(CSSPropertyID propId, bool important)
-{
- ASSERT(propId == CSSPropertyAnimation);
-
- const unsigned numProperties = 8;
- const StylePropertyShorthand& shorthand = animationShorthandForParsing();
-
- // The list of properties in the shorthand should be the same
- // length as the list with animation name in last position, even though they are
- // in a different order.
- ASSERT(numProperties == shorthand.length());
- ASSERT(numProperties == animationShorthand().length());
-
- ShorthandScope scope(this, propId);
-
- bool parsedProperty[numProperties] = { false };
- AnimationParseContext context;
- RefPtr<CSSValue> values[numProperties];
-
- auto& cssValuePool = CSSValuePool::singleton();
- unsigned i;
- while (m_valueList->current()) {
- CSSParserValue* val = m_valueList->current();
- if (val->unit == CSSParserValue::Operator && val->iValue == ',') {
- // We hit the end. Fill in all remaining values with the initial value.
- m_valueList->next();
- for (i = 0; i < numProperties; ++i) {
- if (!parsedProperty[i])
- addAnimationValue(values[i], cssValuePool.createImplicitInitialValue());
- parsedProperty[i] = false;
- }
- if (!m_valueList->current())
- break;
- context.commitFirstAnimation();
- }
-
- bool found = false;
- for (i = 0; i < numProperties; ++i) {
- if (!parsedProperty[i]) {
- RefPtr<CSSValue> val;
- if (parseAnimationProperty(shorthand.properties()[i], val, context)) {
- parsedProperty[i] = found = true;
- addAnimationValue(values[i], val.releaseNonNull());
- break;
- }
- }
-
- // There are more values to process but 'none' or 'all' were already defined as the animation property, the declaration becomes invalid.
- if (!context.animationPropertyKeywordAllowed() && context.hasCommittedFirstAnimation())
- return false;
- }
-
- // if we didn't find at least one match, this is an
- // invalid shorthand and we have to ignore it
- if (!found)
- return false;
- }
-
- // Fill in any remaining properties with the initial value.
- for (i = 0; i < numProperties; ++i) {
- if (!parsedProperty[i])
- addAnimationValue(values[i], cssValuePool.createImplicitInitialValue());
- }
-
- // Now add all of the properties we found.
- // In this case we have to explicitly set the variant form as well,
- // to make sure that a shorthand clears all existing prefixed and
- // unprefixed values.
- for (i = 0; i < numProperties; ++i)
- addProperty(shorthand.properties()[i], WTFMove(values[i]), important);
-
- return true;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseColumnWidth()
-{
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- CSSValueID id = valueWithCalculation.value().id;
- // Always parse this property in strict mode, since it would be ambiguous otherwise when used in the 'columns' shorthand property.
- if (id != CSSValueAuto && !(validateUnit(valueWithCalculation, FLength | FNonNeg, HTMLStandardMode) && parsedDouble(valueWithCalculation)))
- return nullptr;
-
- auto parsedValue = parseValidPrimitive(id, valueWithCalculation);
- m_valueList->next();
- return parsedValue;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseColumnCount()
-{
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- CSSValueID id = valueWithCalculation.value().id;
-
- if (id != CSSValueAuto && !validateUnit(valueWithCalculation, FPositiveInteger, HTMLQuirksMode))
- return nullptr;
-
- auto parsedValue = parseValidPrimitive(id, valueWithCalculation);
- m_valueList->next();
- return parsedValue;
-}
-
-bool CSSParser::parseColumnsShorthand(bool important)
-{
- RefPtr<CSSValue> columnWidth;
- RefPtr<CSSValue> columnCount;
- bool hasPendingExplicitAuto = false;
-
- for (unsigned propertiesParsed = 0; CSSParserValue* value = m_valueList->current(); ++propertiesParsed) {
- if (propertiesParsed >= 2)
- return false; // Too many values for this shorthand. Invalid declaration.
- if (!propertiesParsed && value->id == CSSValueAuto) {
- // 'auto' is a valid value for any of the two longhands, and at this point
- // we don't know which one(s) it is meant for. We need to see if there are other values first.
- m_valueList->next();
- hasPendingExplicitAuto = true;
- } else {
- if (!columnWidth) {
- if ((columnWidth = parseColumnWidth()))
- continue;
- }
- if (!columnCount) {
- if ((columnCount = parseColumnCount()))
- continue;
- }
- // If we didn't find at least one match, this is an invalid shorthand and we have to ignore it.
- return false;
- }
- }
-
- // Any unassigned property at this point will become implicit 'auto'.
- if (columnWidth)
- addProperty(CSSPropertyColumnWidth, WTFMove(columnWidth), important);
- else {
- addProperty(CSSPropertyColumnWidth, CSSValuePool::singleton().createIdentifierValue(CSSValueAuto), important, !hasPendingExplicitAuto /* implicit */);
- hasPendingExplicitAuto = false;
- }
-
- if (columnCount)
- addProperty(CSSPropertyColumnCount, WTFMove(columnCount), important);
- else
- addProperty(CSSPropertyColumnCount, CSSValuePool::singleton().createIdentifierValue(CSSValueAuto), important, !hasPendingExplicitAuto /* implicit */);
-
- return true;
-}
-
-bool CSSParser::parseTransitionShorthand(CSSPropertyID propId, bool important)
-{
- const unsigned numProperties = 4;
- const StylePropertyShorthand& shorthand = shorthandForProperty(propId);
- ASSERT(numProperties == shorthand.length());
-
- ShorthandScope scope(this, propId);
-
- bool parsedProperty[numProperties] = { false };
- AnimationParseContext context;
- RefPtr<CSSValue> values[numProperties];
-
- auto& cssValuePool = CSSValuePool::singleton();
- unsigned i;
- while (m_valueList->current()) {
- CSSParserValue* val = m_valueList->current();
- if (val->unit == CSSParserValue::Operator && val->iValue == ',') {
- // We hit the end. Fill in all remaining values with the initial value.
- m_valueList->next();
- for (i = 0; i < numProperties; ++i) {
- if (!parsedProperty[i])
- addAnimationValue(values[i], cssValuePool.createImplicitInitialValue());
- parsedProperty[i] = false;
- }
- if (!m_valueList->current())
- break;
- context.commitFirstAnimation();
- }
-
- bool found = false;
- for (i = 0; !found && i < numProperties; ++i) {
- if (!parsedProperty[i]) {
- RefPtr<CSSValue> val;
- if (parseAnimationProperty(shorthand.properties()[i], val, context)) {
- parsedProperty[i] = found = true;
- addAnimationValue(values[i], val.releaseNonNull());
- }
-
- // There are more values to process but 'none' or 'all' were already defined as the animation property, the declaration becomes invalid.
- if (!context.animationPropertyKeywordAllowed() && context.hasCommittedFirstAnimation())
- return false;
- }
- }
-
- // if we didn't find at least one match, this is an
- // invalid shorthand and we have to ignore it
- if (!found)
- return false;
- }
-
- // Fill in any remaining properties with the initial value.
- for (i = 0; i < numProperties; ++i) {
- if (!parsedProperty[i])
- addAnimationValue(values[i], cssValuePool.createImplicitInitialValue());
- }
-
- // Now add all of the properties we found.
- // In this case we have to explicitly set the variant form as well,
- // to make sure that a shorthand clears all existing prefixed and
- // unprefixed values.
- for (i = 0; i < numProperties; ++i)
- addProperty(shorthand.properties()[i], WTFMove(values[i]), important);
-
- return true;
-}
-
-bool CSSParser::parseShorthand(CSSPropertyID propId, const StylePropertyShorthand& shorthand, bool important)
-{
- // We try to match as many properties as possible
- // We set up an array of booleans to mark which property has been found,
- // and we try to search for properties until it makes no longer any sense.
- ShorthandScope scope(this, propId);
-
- bool found = false;
- unsigned propertiesParsed = 0;
- bool propertyFound[6]= { false, false, false, false, false, false }; // 6 is enough size.
-
- while (m_valueList->current()) {
- found = false;
- for (unsigned propIndex = 0; !found && propIndex < shorthand.length(); ++propIndex) {
- if (!propertyFound[propIndex] && parseValue(shorthand.properties()[propIndex], important)) {
- propertyFound[propIndex] = found = true;
- propertiesParsed++;
- }
- }
-
- // if we didn't find at least one match, this is an
- // invalid shorthand and we have to ignore it
- if (!found)
- return false;
- }
-
- if (propertiesParsed == shorthand.length())
- return true;
-
- // Fill in any remaining properties with the initial value.
- auto& cssValuePool = CSSValuePool::singleton();
- SetForScope<bool> change(m_implicitShorthand, true);
- const StylePropertyShorthand* propertiesForInitialization = shorthand.propertiesForInitialization();
- for (unsigned i = 0; i < shorthand.length(); ++i) {
- if (propertyFound[i])
- continue;
-
- if (propertiesForInitialization) {
- const StylePropertyShorthand& initProperties = propertiesForInitialization[i];
- for (unsigned propIndex = 0; propIndex < initProperties.length(); ++propIndex)
- addProperty(initProperties.properties()[propIndex], cssValuePool.createImplicitInitialValue(), important);
- } else
- addProperty(shorthand.properties()[i], cssValuePool.createImplicitInitialValue(), important);
- }
-
- return true;
-}
-
-bool CSSParser::parse4Values(CSSPropertyID propId, const CSSPropertyID *properties, bool important)
-{
- /* From the CSS 2 specs, 8.3
- * If there is only one value, it applies to all sides. If there are two values, the top and
- * bottom margins are set to the first value and the right and left margins are set to the second.
- * If there are three values, the top is set to the first value, the left and right are set to the
- * second, and the bottom is set to the third. If there are four values, they apply to the top,
- * right, bottom, and left, respectively.
- */
-
- unsigned num = inShorthand() ? 1 : m_valueList->size();
-
- ShorthandScope scope(this, propId);
-
- // the order is top, right, bottom, left
- switch (num) {
- case 1: {
- if (!parseValue(properties[0], important))
- return false;
- CSSValue* value = m_parsedProperties.last().value();
- SetForScope<bool> change(m_implicitShorthand, true);
- addProperty(properties[1], value, important);
- addProperty(properties[2], value, important);
- addProperty(properties[3], value, important);
- break;
- }
- case 2: {
- if (!parseValue(properties[0], important) || !parseValue(properties[1], important))
- return false;
- CSSValue* value = m_parsedProperties[m_parsedProperties.size() - 2].value();
- SetForScope<bool> change(m_implicitShorthand, true);
- addProperty(properties[2], value, important);
- value = m_parsedProperties[m_parsedProperties.size() - 2].value();
- addProperty(properties[3], value, important);
- break;
- }
- case 3: {
- if (!parseValue(properties[0], important) || !parseValue(properties[1], important) || !parseValue(properties[2], important))
- return false;
- CSSValue* value = m_parsedProperties[m_parsedProperties.size() - 2].value();
- SetForScope<bool> change(m_implicitShorthand, true);
- addProperty(properties[3], value, important);
- break;
- }
- case 4: {
- if (!parseValue(properties[0], important) || !parseValue(properties[1], important) ||
- !parseValue(properties[2], important) || !parseValue(properties[3], important))
- return false;
- break;
- }
- default: {
- return false;
- }
- }
-
- return true;
-}
-
-// auto | <identifier>
-bool CSSParser::parsePage(CSSPropertyID propId, bool important)
-{
- ASSERT(propId == CSSPropertyPage);
-
- if (m_valueList->size() != 1)
- return false;
-
- CSSParserValue* value = m_valueList->current();
- if (!value)
- return false;
-
- if (value->id == CSSValueAuto) {
- addProperty(propId, CSSValuePool::singleton().createIdentifierValue(value->id), important);
- return true;
- } else if (value->id == 0 && value->unit == CSSPrimitiveValue::CSS_IDENT) {
- addProperty(propId, createPrimitiveStringValue(*value), important);
- return true;
- }
- return false;
-}
-
-// <length>{1,2} | auto | [ <page-size> || [ portrait | landscape] ]
-bool CSSParser::parseSize(CSSPropertyID propId, bool important)
-{
- ASSERT(propId == CSSPropertySize);
-
- if (m_valueList->size() > 2)
- return false;
-
- CSSParserValue* value = m_valueList->current();
- if (!value)
- return false;
-
- auto parsedValues = CSSValueList::createSpaceSeparated();
-
- // First parameter.
- SizeParameterType paramType = parseSizeParameter(parsedValues, *value, None);
- if (paramType == None)
- return false;
-
- // Second parameter, if any.
- value = m_valueList->next();
- if (value) {
- paramType = parseSizeParameter(parsedValues, *value, paramType);
- if (paramType == None)
- return false;
- }
-
- addProperty(propId, WTFMove(parsedValues), important);
- return true;
-}
-
-CSSParser::SizeParameterType CSSParser::parseSizeParameter(CSSValueList& parsedValues, CSSParserValue& value, SizeParameterType prevParamType)
-{
- switch (value.id) {
- case CSSValueAuto:
- if (prevParamType == None) {
- parsedValues.append(CSSValuePool::singleton().createIdentifierValue(value.id));
- return Auto;
- }
- return None;
- case CSSValueLandscape:
- case CSSValuePortrait:
- if (prevParamType == None || prevParamType == PageSize) {
- parsedValues.append(CSSValuePool::singleton().createIdentifierValue(value.id));
- return Orientation;
- }
- return None;
- case CSSValueA3:
- case CSSValueA4:
- case CSSValueA5:
- case CSSValueB4:
- case CSSValueB5:
- case CSSValueLedger:
- case CSSValueLegal:
- case CSSValueLetter:
- if (prevParamType == None || prevParamType == Orientation) {
- // Normalize to Page Size then Orientation order by prepending.
- // This is not specified by the CSS3 Paged Media specification, but for simpler processing later (StyleResolver::applyPageSizeProperty).
- parsedValues.prepend(CSSValuePool::singleton().createIdentifierValue(value.id));
- return PageSize;
- }
- return None;
- case CSSValueInvalid: {
- ValueWithCalculation valueWithCalculation(value);
- if (validateUnit(valueWithCalculation, FLength | FNonNeg) && (prevParamType == None || prevParamType == Length)) {
- parsedValues.append(createPrimitiveNumericValue(valueWithCalculation));
- return Length;
- }
- return None;
- }
- default:
- return None;
- }
-}
-
-// [ <string> <string> ]+ | inherit | none
-// inherit and none are handled in parseValue.
-bool CSSParser::parseQuotes(CSSPropertyID propId, bool important)
-{
- auto values = CSSValueList::createCommaSeparated();
- while (CSSParserValue* value = m_valueList->current()) {
- if (value->unit != CSSPrimitiveValue::CSS_STRING)
- break;
- values->append(CSSPrimitiveValue::create(value->string, CSSPrimitiveValue::CSS_STRING));
- m_valueList->next();
- }
- if (values->length()) {
- addProperty(propId, WTFMove(values), important);
- m_valueList->next();
- return true;
- }
- return false;
-}
-
-bool CSSParser::parseAlt(CSSPropertyID propID, bool important)
-{
- CSSParserValue& currentValue = *m_valueList->current();
- RefPtr<CSSValue> parsedValue;
-
- if (currentValue.unit == CSSPrimitiveValue::CSS_STRING)
- parsedValue = createPrimitiveStringValue(currentValue);
- else if (currentValue.unit == CSSParserValue::Function) {
- CSSParserValueList* args = currentValue.function->args.get();
- if (!args)
- return false;
- if (equalLettersIgnoringASCIICase(currentValue.function->name, "attr("))
- parsedValue = parseAttr(*args);
- }
-
- if (parsedValue) {
- addProperty(propID, parsedValue.releaseNonNull(), important);
- m_valueList->next();
- return true;
- }
-
- return false;
-}
-
-bool CSSParser::parseCustomPropertyDeclaration(bool important, CSSValueID id)
-{
- if (m_customPropertyName.isEmpty() || !m_valueList)
- return false;
-
- auto& cssValuePool = CSSValuePool::singleton();
- RefPtr<CSSValue> value;
- if (id == CSSValueInherit)
- value = cssValuePool.createInheritedValue();
- else if (id == CSSValueInitial)
- value = cssValuePool.createExplicitInitialValue();
- else if (id == CSSValueUnset)
- value = cssValuePool.createUnsetValue();
- else if (id == CSSValueRevert)
- value = cssValuePool.createRevertValue();
- else {
- auto valueList = CSSValueList::createFromParserValueList(*m_valueList);
- if (m_valueList->containsVariables())
- value = CSSVariableDependentValue::create(WTFMove(valueList), CSSPropertyCustom);
- else
- value = WTFMove(valueList);
- }
-
- addProperty(CSSPropertyCustom, CSSCustomPropertyValue::create(m_customPropertyName, value.releaseNonNull()), important, false);
- return true;
-}
-
-// [ <string> | <uri> | <counter> | attr(X) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit
-// in CSS 2.1 this got somewhat reduced:
-// [ <string> | attr(X) | open-quote | close-quote | no-open-quote | no-close-quote ]+ | inherit
-bool CSSParser::parseContent(CSSPropertyID propId, bool important)
-{
- auto values = CSSValueList::createCommaSeparated();
-
- while (CSSParserValue* value = m_valueList->current()) {
- RefPtr<CSSValue> parsedValue;
- if (value->unit == CSSPrimitiveValue::CSS_URI) {
- // url
- parsedValue = CSSImageValue::create(completeURL(value->string));
- } else if (value->unit == CSSParserValue::Function) {
- // attr(X) | counter(X [,Y]) | counters(X, Y, [,Z]) | -webkit-gradient(...)
- CSSParserValueList* args = value->function->args.get();
- if (!args)
- return false;
- if (equalLettersIgnoringASCIICase(value->function->name, "attr(")) {
- parsedValue = parseAttr(*args);
- if (!parsedValue)
- return false;
- } else if (equalLettersIgnoringASCIICase(value->function->name, "counter(")) {
- parsedValue = parseCounterContent(*args, false);
- if (!parsedValue)
- return false;
- } else if (equalLettersIgnoringASCIICase(value->function->name, "counters(")) {
- parsedValue = parseCounterContent(*args, true);
- if (!parsedValue)
- return false;
- } else if (isImageSetFunctionValue(*value)) {
- parsedValue = parseImageSet();
- if (!parsedValue)
- return false;
- } else if (isGeneratedImageValue(*value)) {
- if (!parseGeneratedImage(*m_valueList, parsedValue))
- return false;
- } else
- return false;
- } else if (value->unit == CSSPrimitiveValue::CSS_IDENT) {
- // open-quote
- // close-quote
- // no-open-quote
- // no-close-quote
- // inherit
- // FIXME: These are not yet implemented (http://bugs.webkit.org/show_bug.cgi?id=6503).
- // none
- // normal
- switch (value->id) {
- case CSSValueOpenQuote:
- case CSSValueCloseQuote:
- case CSSValueNoOpenQuote:
- case CSSValueNoCloseQuote:
- case CSSValueNone:
- case CSSValueNormal:
- parsedValue = CSSValuePool::singleton().createIdentifierValue(value->id);
- break;
- default:
- break;
- }
- } else if (value->unit == CSSPrimitiveValue::CSS_STRING) {
- parsedValue = createPrimitiveStringValue(*value);
- }
- if (!parsedValue)
- break;
- values->append(parsedValue.releaseNonNull());
- m_valueList->next();
- }
-
- if (values->length()) {
- addProperty(propId, WTFMove(values), important);
- m_valueList->next();
- return true;
- }
-
- return false;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseAttr(CSSParserValueList& args)
-{
- if (args.size() != 1)
- return nullptr;
-
- CSSParserValue& argument = *args.current();
-
- if (argument.unit != CSSPrimitiveValue::CSS_IDENT)
- return nullptr;
-
- ASSERT(argument.string.length());
-
- // CSS allows identifiers with "-" at the start, like "-webkit-mask-image".
- // But HTML attribute names can't have those characters, and we should not
- // even parse them inside attr().
- if (argument.string[0] == '-')
- return nullptr;
-
- if (m_context.isHTMLDocument)
- argument.string.convertToASCIILowercaseInPlace();
-
- // FIXME: Is there some small benefit to creating an AtomicString here instead of a String?
- return CSSValuePool::singleton().createValue(String(argument.string), CSSPrimitiveValue::CSS_ATTR);
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseBackgroundColor()
-{
- CSSValueID id = m_valueList->current()->id;
- if (id == CSSValueWebkitText || isValidSystemColorValue(id) || id == CSSValueMenu || id == CSSValueCurrentcolor
- || (id >= CSSValueGrey && id < CSSValueWebkitText && inQuirksMode()))
- return CSSValuePool::singleton().createIdentifierValue(id);
- return parseColor();
-}
-
-bool CSSParser::parseFillImage(CSSParserValueList& valueList, RefPtr<CSSValue>& value)
-{
- if (valueList.current()->id == CSSValueNone) {
- value = CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
- return true;
- }
- if (valueList.current()->unit == CSSPrimitiveValue::CSS_URI) {
- value = CSSImageValue::create(completeURL(valueList.current()->string));
- return true;
- }
-
- if (isGeneratedImageValue(*valueList.current()))
- return parseGeneratedImage(valueList, value);
-
- if (isImageSetFunctionValue(*valueList.current())) {
- value = parseImageSet();
- if (value)
- return true;
- }
-
- return false;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parsePositionX(CSSParserValueList& valueList)
-{
- int id = valueList.current()->id;
- if (id == CSSValueLeft || id == CSSValueRight || id == CSSValueCenter) {
- int percent = 0;
- if (id == CSSValueRight)
- percent = 100;
- else if (id == CSSValueCenter)
- percent = 50;
- return CSSValuePool::singleton().createValue(percent, CSSPrimitiveValue::CSS_PERCENTAGE);
- }
- ValueWithCalculation valueWithCalculation(*valueList.current());
- if (validateUnit(valueWithCalculation, FPercent | FLength))
- return createPrimitiveNumericValue(valueWithCalculation);
- return nullptr;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parsePositionY(CSSParserValueList& valueList)
-{
- int id = valueList.current()->id;
- if (id == CSSValueTop || id == CSSValueBottom || id == CSSValueCenter) {
- int percent = 0;
- if (id == CSSValueBottom)
- percent = 100;
- else if (id == CSSValueCenter)
- percent = 50;
- return CSSValuePool::singleton().createValue(percent, CSSPrimitiveValue::CSS_PERCENTAGE);
- }
- ValueWithCalculation valueWithCalculation(*valueList.current());
- if (validateUnit(valueWithCalculation, FPercent | FLength))
- return createPrimitiveNumericValue(valueWithCalculation);
- return nullptr;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseFillPositionComponent(CSSParserValueList& valueList, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillPositionParsingMode parsingMode)
-{
- CSSValueID id = valueList.current()->id;
- if (id == CSSValueLeft || id == CSSValueTop || id == CSSValueRight || id == CSSValueBottom || id == CSSValueCenter) {
- int percent = 0;
- if (id == CSSValueLeft || id == CSSValueRight) {
- if (cumulativeFlags & XFillPosition)
- return nullptr;
- cumulativeFlags |= XFillPosition;
- individualFlag = XFillPosition;
- if (id == CSSValueRight)
- percent = 100;
- }
- else if (id == CSSValueTop || id == CSSValueBottom) {
- if (cumulativeFlags & YFillPosition)
- return nullptr;
- cumulativeFlags |= YFillPosition;
- individualFlag = YFillPosition;
- if (id == CSSValueBottom)
- percent = 100;
- } else if (id == CSSValueCenter) {
- // Center is ambiguous, so we're not sure which position we've found yet, an x or a y.
- percent = 50;
- cumulativeFlags |= AmbiguousFillPosition;
- individualFlag = AmbiguousFillPosition;
- }
-
- if (parsingMode == ResolveValuesAsKeyword)
- return CSSValuePool::singleton().createIdentifierValue(id);
-
- return CSSValuePool::singleton().createValue(percent, CSSPrimitiveValue::CSS_PERCENTAGE);
- }
- ValueWithCalculation valueWithCalculation(*valueList.current());
- if (!validateUnit(valueWithCalculation, FPercent | FLength))
- return nullptr;
-
- if (!cumulativeFlags) {
- cumulativeFlags |= XFillPosition;
- individualFlag = XFillPosition;
- } else if (cumulativeFlags & (XFillPosition | AmbiguousFillPosition)) {
- cumulativeFlags |= YFillPosition;
- individualFlag = YFillPosition;
- } else
- return nullptr;
- return createPrimitiveNumericValue(valueWithCalculation);
-}
-
-static bool isValueConflictingWithCurrentEdge(int value1, int value2)
-{
- if ((value1 == CSSValueLeft || value1 == CSSValueRight) && (value2 == CSSValueLeft || value2 == CSSValueRight))
- return true;
-
- if ((value1 == CSSValueTop || value1 == CSSValueBottom) && (value2 == CSSValueTop || value2 == CSSValueBottom))
- return true;
-
- return false;
-}
-
-static bool isFillPositionKeyword(CSSValueID value)
-{
- return value == CSSValueLeft || value == CSSValueTop || value == CSSValueBottom || value == CSSValueRight || value == CSSValueCenter;
-}
-
-void CSSParser::parse4ValuesFillPosition(CSSParserValueList& valueList, RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2, Ref<CSSPrimitiveValue>&& parsedValue1, Ref<CSSPrimitiveValue>&& parsedValue2)
-{
- // [ left | right ] [ <percentage] | <length> ] && [ top | bottom ] [ <percentage> | <length> ]
- // In the case of 4 values <position> requires the second value to be a length or a percentage.
- if (isFillPositionKeyword(parsedValue2->valueID()))
- return;
-
- unsigned cumulativeFlags = 0;
- FillPositionFlag value3Flag = InvalidFillPosition;
- auto value3 = parseFillPositionComponent(valueList, cumulativeFlags, value3Flag, ResolveValuesAsKeyword);
- if (!value3)
- return;
-
- CSSValueID ident1 = parsedValue1->valueID();
- CSSValueID ident3 = value3->valueID();
-
- if (ident1 == CSSValueCenter)
- return;
-
- if (!isFillPositionKeyword(ident3) || ident3 == CSSValueCenter)
- return;
-
- // We need to check if the values are not conflicting, e.g. they are not on the same edge. It is
- // needed as the second call to parseFillPositionComponent was on purpose not checking it. In the
- // case of two values top 20px is invalid but in the case of 4 values it becomes valid.
- if (isValueConflictingWithCurrentEdge(ident1, ident3))
- return;
-
- valueList.next();
-
- cumulativeFlags = 0;
- FillPositionFlag value4Flag = InvalidFillPosition;
- auto value4 = parseFillPositionComponent(valueList, cumulativeFlags, value4Flag, ResolveValuesAsKeyword);
- if (!value4)
- return;
-
- // 4th value must be a length or a percentage.
- if (isFillPositionKeyword(value4->valueID()))
- return;
-
- value1 = createPrimitiveValuePair(WTFMove(parsedValue1), WTFMove(parsedValue2));
- value2 = createPrimitiveValuePair(value3.releaseNonNull(), value4.releaseNonNull());
-
- if (ident1 == CSSValueTop || ident1 == CSSValueBottom)
- value1.swap(value2);
-
- valueList.next();
-}
-
-void CSSParser::parse3ValuesFillPosition(CSSParserValueList& valueList, RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2, Ref<CSSPrimitiveValue>&& parsedValue1, Ref<CSSPrimitiveValue>&& parsedValue2)
-{
- unsigned cumulativeFlags = 0;
- FillPositionFlag value3Flag = InvalidFillPosition;
- auto value3 = parseFillPositionComponent(valueList, cumulativeFlags, value3Flag, ResolveValuesAsKeyword);
-
- // value3 is not an expected value, we return.
- if (!value3)
- return;
-
- valueList.next();
-
- bool swapNeeded = false;
- CSSValueID ident1 = parsedValue1->valueID();
- CSSValueID ident2 = parsedValue2->valueID();
- CSSValueID ident3 = value3->valueID();
-
- CSSValueID firstPositionKeyword;
- CSSValueID secondPositionKeyword;
-
- auto& cssValuePool = CSSValuePool::singleton();
- if (ident1 == CSSValueCenter) {
- // <position> requires the first 'center' to be followed by a keyword.
- if (!isFillPositionKeyword(ident2))
- return;
-
- // If 'center' is the first keyword then the last one needs to be a length.
- if (isFillPositionKeyword(ident3))
- return;
-
- firstPositionKeyword = CSSValueLeft;
- if (ident2 == CSSValueLeft || ident2 == CSSValueRight) {
- firstPositionKeyword = CSSValueTop;
- swapNeeded = true;
- }
- value1 = createPrimitiveValuePair(cssValuePool.createIdentifierValue(firstPositionKeyword), cssValuePool.createValue(50, CSSPrimitiveValue::CSS_PERCENTAGE));
- value2 = createPrimitiveValuePair(WTFMove(parsedValue2), value3.copyRef());
- } else if (ident3 == CSSValueCenter) {
- if (isFillPositionKeyword(ident2))
- return;
-
- secondPositionKeyword = CSSValueTop;
- if (ident1 == CSSValueTop || ident1 == CSSValueBottom) {
- secondPositionKeyword = CSSValueLeft;
- swapNeeded = true;
- }
- value1 = createPrimitiveValuePair(WTFMove(parsedValue1), parsedValue2.copyRef());
- value2 = createPrimitiveValuePair(cssValuePool.createIdentifierValue(secondPositionKeyword), cssValuePool.createValue(50, CSSPrimitiveValue::CSS_PERCENTAGE));
- } else {
- RefPtr<CSSPrimitiveValue> firstPositionValue;
- RefPtr<CSSPrimitiveValue> secondPositionValue;
-
- if (isFillPositionKeyword(ident2)) {
- // To match CSS grammar, we should only accept: [ center | left | right | bottom | top ] [ left | right | top | bottom ] [ <percentage> | <length> ].
- ASSERT(ident2 != CSSValueCenter);
-
- if (isFillPositionKeyword(ident3))
- return;
-
- secondPositionValue = value3;
- secondPositionKeyword = ident2;
- firstPositionValue = cssValuePool.createValue(0, CSSPrimitiveValue::CSS_PERCENTAGE);
- } else {
- // Per CSS, we should only accept: [ right | left | top | bottom ] [ <percentage> | <length> ] [ center | left | right | bottom | top ].
- if (!isFillPositionKeyword(ident3))
- return;
-
- firstPositionValue = parsedValue2.ptr();
- secondPositionKeyword = ident3;
- secondPositionValue = cssValuePool.createValue(0, CSSPrimitiveValue::CSS_PERCENTAGE);
- }
-
- if (isValueConflictingWithCurrentEdge(ident1, secondPositionKeyword))
- return;
-
- value1 = createPrimitiveValuePair(WTFMove(parsedValue1), firstPositionValue.releaseNonNull());
- value2 = createPrimitiveValuePair(cssValuePool.createIdentifierValue(secondPositionKeyword), secondPositionValue.releaseNonNull());
- }
-
- if (ident1 == CSSValueTop || ident1 == CSSValueBottom || swapNeeded)
- value1.swap(value2);
-
-#ifndef NDEBUG
- CSSPrimitiveValue& first = *value1;
- CSSPrimitiveValue& second = *value2;
- ident1 = first.pairValue()->first()->valueID();
- ident2 = second.pairValue()->first()->valueID();
- ASSERT(ident1 == CSSValueLeft || ident1 == CSSValueRight);
- ASSERT(ident2 == CSSValueBottom || ident2 == CSSValueTop);
-#endif
-}
-
-inline bool CSSParser::isPotentialPositionValue(CSSParserValue& value)
-{
- if (isFillPositionKeyword(value.id))
- return true;
- ValueWithCalculation valueWithCalculation(value);
- return validateUnit(valueWithCalculation, FPercent | FLength);
-}
-
-void CSSParser::parseFillPosition(CSSParserValueList& valueList, RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2)
-{
- unsigned numberOfValues = 0;
- for (unsigned i = valueList.currentIndex(); i < valueList.size(); ++i, ++numberOfValues) {
- CSSParserValue* current = valueList.valueAt(i);
- if (!current || isComma(current) || isForwardSlashOperator(*current) || !isPotentialPositionValue(*current))
- break;
- }
-
- if (numberOfValues > 4)
- return;
-
- // If we are parsing two values, we can safely call the CSS 2.1 parsing function and return.
- if (numberOfValues <= 2) {
- parse2ValuesFillPosition(valueList, value1, value2);
- return;
- }
-
- ASSERT(numberOfValues > 2 && numberOfValues <= 4);
-
- CSSParserValue* value = valueList.current();
-
- // <position> requires the first value to be a background keyword.
- if (!isFillPositionKeyword(value->id))
- return;
-
- // Parse the first value. We're just making sure that it is one of the valid keywords or a percentage/length.
- unsigned cumulativeFlags = 0;
- FillPositionFlag value1Flag = InvalidFillPosition;
- FillPositionFlag value2Flag = InvalidFillPosition;
- value1 = parseFillPositionComponent(valueList, cumulativeFlags, value1Flag, ResolveValuesAsKeyword);
- if (!value1)
- return;
-
- value = valueList.next();
-
- // In case we are parsing more than two values, relax the check inside of parseFillPositionComponent. top 20px is
- // a valid start for <position>.
- cumulativeFlags = AmbiguousFillPosition;
- value2 = parseFillPositionComponent(valueList, cumulativeFlags, value2Flag, ResolveValuesAsKeyword);
- if (value2)
- valueList.next();
- else {
- value1 = nullptr;
- return;
- }
-
- auto parsedValue1 = value1.releaseNonNull();
- auto parsedValue2 = value2.releaseNonNull();
-
- // Per CSS3 syntax, <position> can't have 'center' as its second keyword as we have more arguments to follow.
- if (parsedValue2->valueID() == CSSValueCenter)
- return;
-
- if (numberOfValues == 3)
- parse3ValuesFillPosition(valueList, value1, value2, WTFMove(parsedValue1), WTFMove(parsedValue2));
- else
- parse4ValuesFillPosition(valueList, value1, value2, WTFMove(parsedValue1), WTFMove(parsedValue2));
-}
-
-void CSSParser::parse2ValuesFillPosition(CSSParserValueList& valueList, RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2)
-{
- CSSParserValue* value = valueList.current();
-
- // Parse the first value. We're just making sure that it is one of the valid keywords or a percentage/length.
- unsigned cumulativeFlags = 0;
- FillPositionFlag value1Flag = InvalidFillPosition;
- FillPositionFlag value2Flag = InvalidFillPosition;
- value1 = parseFillPositionComponent(valueList, cumulativeFlags, value1Flag);
- if (!value1)
- return;
-
- // It only takes one value for background-position to be correctly parsed if it was specified in a shorthand (since we
- // can assume that any other values belong to the rest of the shorthand). If we're not parsing a shorthand, though, the
- // value was explicitly specified for our property.
- value = valueList.next();
-
- // First check for the comma. If so, we are finished parsing this value or value pair.
- if (isComma(value))
- value = nullptr;
-
- if (value) {
- value2 = parseFillPositionComponent(valueList, cumulativeFlags, value2Flag);
- if (value2)
- valueList.next();
- else {
- if (!inShorthand()) {
- value1 = nullptr;
- return;
- }
- }
- }
-
- if (!value2)
- // Only one value was specified. If that value was not a keyword, then it sets the x position, and the y position
- // is simply 50%. This is our default.
- // For keywords, the keyword was either an x-keyword (left/right), a y-keyword (top/bottom), or an ambiguous keyword (center).
- // For left/right/center, the default of 50% in the y is still correct.
- value2 = CSSValuePool::singleton().createValue(50, CSSPrimitiveValue::CSS_PERCENTAGE);
-
- if (value1Flag == YFillPosition || value2Flag == XFillPosition)
- value1.swap(value2);
-}
-
-void CSSParser::parseFillRepeat(RefPtr<CSSValue>& value1, RefPtr<CSSValue>& value2)
-{
- CSSValueID id = m_valueList->current()->id;
- if (id == CSSValueRepeatX) {
- m_implicitShorthand = true;
- value1 = CSSValuePool::singleton().createIdentifierValue(CSSValueRepeat);
- value2 = CSSValuePool::singleton().createIdentifierValue(CSSValueNoRepeat);
- m_valueList->next();
- return;
- }
- if (id == CSSValueRepeatY) {
- m_implicitShorthand = true;
- value1 = CSSValuePool::singleton().createIdentifierValue(CSSValueNoRepeat);
- value2 = CSSValuePool::singleton().createIdentifierValue(CSSValueRepeat);
- m_valueList->next();
- return;
- }
- if (id == CSSValueRepeat || id == CSSValueNoRepeat || id == CSSValueRound || id == CSSValueSpace)
- value1 = CSSValuePool::singleton().createIdentifierValue(id);
- else {
- value1 = nullptr;
- return;
- }
-
- CSSParserValue* value = m_valueList->next();
-
- // Parse the second value if one is available
- if (value && !isComma(value)) {
- id = value->id;
- if (id == CSSValueRepeat || id == CSSValueNoRepeat || id == CSSValueRound || id == CSSValueSpace) {
- value2 = CSSValuePool::singleton().createIdentifierValue(id);
- m_valueList->next();
- return;
- }
- }
-
- // If only one value was specified, value2 is the same as value1.
- m_implicitShorthand = true;
- value2 = CSSValuePool::singleton().createIdentifierValue(downcast<CSSPrimitiveValue>(*value1).valueID());
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseFillSize(CSSPropertyID propId, bool& allowComma)
-{
- allowComma = true;
- CSSParserValue* value = m_valueList->current();
-
- if (value->id == CSSValueContain || value->id == CSSValueCover)
- return CSSValuePool::singleton().createIdentifierValue(value->id);
-
- RefPtr<CSSPrimitiveValue> parsedValue1;
-
- if (value->id == CSSValueAuto)
- parsedValue1 = CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
- else {
- ValueWithCalculation valueWithCalculation(*value);
- if (!validateUnit(valueWithCalculation, FLength | FPercent))
- return nullptr;
- parsedValue1 = createPrimitiveNumericValue(valueWithCalculation);
- }
-
- RefPtr<CSSPrimitiveValue> parsedValue2;
- if ((value = m_valueList->next())) {
- if (value->unit == CSSParserValue::Operator && value->iValue == ',')
- allowComma = false;
- else if (value->id != CSSValueAuto) {
- ValueWithCalculation valueWithCalculation(*value);
- if (!validateUnit(valueWithCalculation, FLength | FPercent)) {
- if (!inShorthand())
- return nullptr;
- // We need to rewind the value list, so that when it is advanced we'll end up back at this value.
- m_valueList->previous();
- } else
- parsedValue2 = createPrimitiveNumericValue(valueWithCalculation);
- }
- } else if (!parsedValue2 && propId == CSSPropertyWebkitBackgroundSize) {
- // For backwards compatibility we set the second value to the first if it is omitted.
- // We only need to do this for -webkit-background-size. It should be safe to let masks match
- // the real property.
- parsedValue2 = parsedValue1;
- }
-
- if (!parsedValue2)
- return parsedValue1;
- return createPrimitiveValuePair(parsedValue1.releaseNonNull(), parsedValue2.releaseNonNull(), propId == CSSPropertyWebkitBackgroundSize ? Pair::IdenticalValueEncoding::Coalesce : Pair::IdenticalValueEncoding::DoNotCoalesce);
-}
-
-bool CSSParser::parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2,
- RefPtr<CSSValue>& retValue1, RefPtr<CSSValue>& retValue2)
-{
- RefPtr<CSSValueList> values;
- RefPtr<CSSValueList> values2;
- CSSParserValue* currentValue;
- RefPtr<CSSValue> value;
- RefPtr<CSSValue> value2;
-
- bool allowComma = false;
-
- retValue1 = retValue2 = nullptr;
- propId1 = propId;
- propId2 = propId;
- if (propId == CSSPropertyBackgroundPosition) {
- propId1 = CSSPropertyBackgroundPositionX;
- propId2 = CSSPropertyBackgroundPositionY;
- } else if (propId == CSSPropertyWebkitMaskPosition) {
- propId1 = CSSPropertyWebkitMaskPositionX;
- propId2 = CSSPropertyWebkitMaskPositionY;
- } else if (propId == CSSPropertyBackgroundRepeat) {
- propId1 = CSSPropertyBackgroundRepeatX;
- propId2 = CSSPropertyBackgroundRepeatY;
- } else if (propId == CSSPropertyWebkitMaskRepeat) {
- propId1 = CSSPropertyWebkitMaskRepeatX;
- propId2 = CSSPropertyWebkitMaskRepeatY;
- }
-
- while ((currentValue = m_valueList->current())) {
- RefPtr<CSSValue> currValue;
- RefPtr<CSSValue> currValue2;
-
- if (allowComma) {
- if (!isComma(currentValue))
- return false;
- m_valueList->next();
- allowComma = false;
- } else {
- allowComma = true;
- switch (propId) {
- case CSSPropertyBackgroundColor:
- currValue = parseBackgroundColor();
- if (currValue)
- m_valueList->next();
- break;
- case CSSPropertyBackgroundAttachment:
- if (currentValue->id == CSSValueScroll || currentValue->id == CSSValueFixed || currentValue->id == CSSValueLocal) {
- currValue = CSSValuePool::singleton().createIdentifierValue(currentValue->id);
- m_valueList->next();
- }
- break;
- case CSSPropertyBackgroundImage:
- case CSSPropertyWebkitMaskImage:
- if (parseFillImage(*m_valueList, currValue))
- m_valueList->next();
- break;
- case CSSPropertyWebkitBackgroundClip:
- case CSSPropertyWebkitBackgroundOrigin:
- case CSSPropertyWebkitMaskClip:
- case CSSPropertyWebkitMaskOrigin:
- // The first three values here are deprecated and do not apply to the version of the property that has
- // the -webkit- prefix removed.
- if (currentValue->id == CSSValueBorder || currentValue->id == CSSValuePadding || currentValue->id == CSSValueContent
- || currentValue->id == CSSValueBorderBox || currentValue->id == CSSValuePaddingBox || currentValue->id == CSSValueContentBox
- || ((propId == CSSPropertyWebkitBackgroundClip || propId == CSSPropertyWebkitMaskClip)
- && (currentValue->id == CSSValueText || currentValue->id == CSSValueWebkitText))) {
- currValue = CSSValuePool::singleton().createIdentifierValue(currentValue->id);
- m_valueList->next();
- }
- break;
- case CSSPropertyBackgroundClip:
- if (parseBackgroundClip(*currentValue, currValue))
- m_valueList->next();
- break;
- case CSSPropertyBackgroundOrigin:
- if (currentValue->id == CSSValueBorderBox || currentValue->id == CSSValuePaddingBox || currentValue->id == CSSValueContentBox) {
- currValue = CSSValuePool::singleton().createIdentifierValue(currentValue->id);
- m_valueList->next();
- }
- break;
- case CSSPropertyBackgroundPosition:
- case CSSPropertyWebkitMaskPosition: {
- RefPtr<CSSPrimitiveValue> value1;
- RefPtr<CSSPrimitiveValue> value2;
- parseFillPosition(*m_valueList, value1, value2);
- currValue = WTFMove(value1);
- currValue2 = WTFMove(value2);
- // parseFillPosition advances the m_valueList pointer.
- break;
- }
- case CSSPropertyBackgroundPositionX:
- case CSSPropertyWebkitMaskPositionX: {
- currValue = parsePositionX(*m_valueList);
- if (currValue)
- m_valueList->next();
- break;
- }
- case CSSPropertyBackgroundPositionY:
- case CSSPropertyWebkitMaskPositionY: {
- currValue = parsePositionY(*m_valueList);
- if (currValue)
- m_valueList->next();
- break;
- }
- case CSSPropertyWebkitBackgroundComposite:
- case CSSPropertyWebkitMaskComposite:
- if (currentValue->id >= CSSValueClear && currentValue->id <= CSSValuePlusLighter) {
- currValue = CSSValuePool::singleton().createIdentifierValue(currentValue->id);
- m_valueList->next();
- }
- break;
- case CSSPropertyBackgroundBlendMode:
- if (currentValue->id == CSSValueNormal || currentValue->id == CSSValueMultiply
- || currentValue->id == CSSValueScreen || currentValue->id == CSSValueOverlay || currentValue->id == CSSValueDarken
- || currentValue->id == CSSValueLighten || currentValue->id == CSSValueColorDodge || currentValue->id == CSSValueColorBurn
- || currentValue->id == CSSValueHardLight || currentValue->id == CSSValueSoftLight || currentValue->id == CSSValueDifference
- || currentValue->id == CSSValueExclusion) {
- currValue = CSSValuePool::singleton().createIdentifierValue(currentValue->id);
- m_valueList->next();
- }
- break;
- case CSSPropertyBackgroundRepeat:
- case CSSPropertyWebkitMaskRepeat:
- parseFillRepeat(currValue, currValue2);
- // parseFillRepeat advances the m_valueList pointer
- break;
- case CSSPropertyBackgroundSize:
- case CSSPropertyWebkitBackgroundSize:
- case CSSPropertyWebkitMaskSize: {
- currValue = parseFillSize(propId, allowComma);
- if (currValue)
- m_valueList->next();
- break;
- }
- case CSSPropertyWebkitMaskSourceType: {
- if (currentValue->id == CSSValueAuto || currentValue->id == CSSValueAlpha || currentValue->id == CSSValueLuminance) {
- currValue = CSSValuePool::singleton().createIdentifierValue(currentValue->id);
- m_valueList->next();
- } else
- currValue = nullptr;
- break;
- }
- default:
- break;
- }
- if (!currValue)
- return false;
-
- if (value && !values) {
- values = CSSValueList::createCommaSeparated();
- values->append(value.releaseNonNull());
- }
-
- if (value2 && !values2) {
- values2 = CSSValueList::createCommaSeparated();
- values2->append(value2.releaseNonNull());
- }
-
- if (values)
- values->append(currValue.releaseNonNull());
- else
- value = WTFMove(currValue);
- if (currValue2) {
- if (values2)
- values2->append(currValue2.releaseNonNull());
- else
- value2 = WTFMove(currValue2);
- }
- }
-
- // When parsing any fill shorthand property, we let it handle building up the lists for all
- // properties.
- if (inShorthand())
- break;
- }
-
- if (values && values->length()) {
- retValue1 = WTFMove(values);
- if (values2 && values2->length())
- retValue2 = WTFMove(values2);
- return true;
- }
- if (value) {
- retValue1 = WTFMove(value);
- retValue2 = WTFMove(value2);
- return true;
- }
- return false;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseAnimationDelay()
-{
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- if (validateUnit(valueWithCalculation, FTime))
- return createPrimitiveNumericValue(valueWithCalculation);
- return nullptr;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseAnimationDirection()
-{
- CSSParserValue* value = m_valueList->current();
- if (value->id == CSSValueNormal || value->id == CSSValueAlternate || value->id == CSSValueReverse || value->id == CSSValueAlternateReverse)
- return CSSValuePool::singleton().createIdentifierValue(value->id);
- return nullptr;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseAnimationDuration()
-{
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- if (validateUnit(valueWithCalculation, FTime | FNonNeg))
- return createPrimitiveNumericValue(valueWithCalculation);
- return nullptr;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseAnimationFillMode()
-{
- CSSParserValue* value = m_valueList->current();
- if (value->id == CSSValueNone || value->id == CSSValueForwards || value->id == CSSValueBackwards || value->id == CSSValueBoth)
- return CSSValuePool::singleton().createIdentifierValue(value->id);
- return nullptr;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseAnimationIterationCount()
-{
- CSSParserValue& value = *m_valueList->current();
- if (value.id == CSSValueInfinite)
- return CSSValuePool::singleton().createIdentifierValue(value.id);
- ValueWithCalculation valueWithCalculation(value);
- if (validateUnit(valueWithCalculation, FNumber | FNonNeg))
- return createPrimitiveNumericValue(valueWithCalculation);
- return nullptr;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseAnimationName()
-{
- CSSParserValue& value = *m_valueList->current();
- if (value.unit == CSSPrimitiveValue::CSS_STRING || value.unit == CSSPrimitiveValue::CSS_IDENT) {
- if (value.id == CSSValueNone || (value.unit == CSSPrimitiveValue::CSS_STRING && equalLettersIgnoringASCIICase(value, "none"))) {
- return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
- }
- return createPrimitiveStringValue(value);
- }
- return nullptr;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseAnimationPlayState()
-{
- CSSParserValue& value = *m_valueList->current();
- if (value.id == CSSValueRunning || value.id == CSSValuePaused)
- return CSSValuePool::singleton().createIdentifierValue(value.id);
- return nullptr;
-}
-
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
-RefPtr<CSSValue> CSSParser::parseAnimationTrigger()
-{
- CSSParserValue* value = m_valueList->current();
- if (value->id == CSSValueAuto)
- return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
-
- if (value->unit != CSSParserValue::Function)
- return nullptr;
-
- CSSParserValueList* args = value->function->args.get();
-
- if (equalLettersIgnoringASCIICase(value->function->name, "container-scroll(")) {
- if (!args || (args->size() != 1 && args->size() != 3))
- return nullptr;
-
- CSSParserValue* argument = args->current();
- ValueWithCalculation firstArgumentWithCalculation(*argument);
- if (!validateUnit(firstArgumentWithCalculation, FLength))
- return nullptr;
-
- auto startValue = createPrimitiveNumericValue(firstArgumentWithCalculation);
-
- argument = args->next();
-
- if (!argument)
- return CSSAnimationTriggerScrollValue::create(WTFMove(startValue));
-
- if (!isComma(argument))
- return nullptr;
-
- argument = args->next();
- ValueWithCalculation secondArgumentWithCalculation(*argument);
- if (!validateUnit(secondArgumentWithCalculation, FLength))
- return nullptr;
-
- auto endValue = createPrimitiveNumericValue(secondArgumentWithCalculation);
-
- return CSSAnimationTriggerScrollValue::create(WTFMove(startValue), WTFMove(endValue));
- }
-
- return nullptr;
-}
-#endif
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseAnimationProperty(AnimationParseContext& context)
-{
- CSSParserValue& value = *m_valueList->current();
- if (value.unit != CSSPrimitiveValue::CSS_IDENT)
- return nullptr;
- CSSPropertyID result = cssPropertyID(value.string);
- if (result && result != CSSPropertyAll) // "all" value in animation is not equivalent to the all property.
- return CSSValuePool::singleton().createIdentifierValue(result);
- if (equalLettersIgnoringASCIICase(value, "all")) {
- context.sawAnimationPropertyKeyword();
- return CSSValuePool::singleton().createIdentifierValue(CSSValueAll);
- }
- if (equalLettersIgnoringASCIICase(value, "none")) {
- context.commitAnimationPropertyKeyword();
- context.sawAnimationPropertyKeyword();
- return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
- }
- return nullptr;
-}
-
-/* static */
</del><span class="cx"> std::unique_ptr<Vector<double>> CSSParser::parseKeyframeKeyList(const String& selector)
</span><span class="cx"> {
</span><span class="cx"> return CSSParserImpl::parseKeyframeKeyList(selector);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseTransformOriginShorthand(RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2, RefPtr<CSSValue>& value3)
</del><ins>+RefPtr<CSSValue> CSSParser::parseFontFaceDescriptor(CSSPropertyID propertyID, const String& propertyValue, const CSSParserContext& context)
</ins><span class="cx"> {
</span><del>- parse2ValuesFillPosition(*m_valueList, value1, value2);
-
- // now get z
- if (m_valueList->current()) {
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- if (validateUnit(valueWithCalculation, FLength)) {
- value3 = createPrimitiveNumericValue(valueWithCalculation);
- m_valueList->next();
- return true;
- }
- return false;
- }
- value3 = CSSValuePool::singleton().createImplicitInitialValue();
- return true;
-}
-
-bool CSSParser::isSpringTimingFunctionEnabled() const
-{
- return m_context.springTimingFunctionEnabled;
-}
-
-std::optional<double> CSSParser::parseCubicBezierTimingFunctionValue(CSSParserValueList& args)
-{
- ValueWithCalculation argumentWithCalculation(*args.current());
- if (!validateUnit(argumentWithCalculation, FNumber))
- return std::nullopt;
- std::optional<double> result = parsedDouble(argumentWithCalculation);
- CSSParserValue* nextValue = args.next();
- if (!nextValue) {
- // The last number in the function has no comma after it, so we're done.
- return result;
- }
- if (!isComma(nextValue))
- return std::nullopt;
- args.next();
- return result;
-}
-
-std::optional<double> CSSParser::parseSpringTimingFunctionValue(CSSParserValueList& args)
-{
- ValueWithCalculation argumentWithCalculation(*args.current());
- if (!validateUnit(argumentWithCalculation, FNumber))
- return std::nullopt;
- std::optional<double> result = parsedDouble(argumentWithCalculation);
- args.next();
- return result;
-}
-
-RefPtr<CSSValue> CSSParser::parseAnimationTimingFunction()
-{
- CSSParserValue& value = *m_valueList->current();
- if (value.id == CSSValueEase || value.id == CSSValueLinear || value.id == CSSValueEaseIn || value.id == CSSValueEaseOut
- || value.id == CSSValueEaseInOut || value.id == CSSValueStepStart || value.id == CSSValueStepEnd)
- return CSSValuePool::singleton().createIdentifierValue(value.id);
-
- // We must be a function.
- if (value.unit != CSSParserValue::Function)
- return nullptr;
-
- CSSParserValueList* args = value.function->args.get();
-
- if (equalLettersIgnoringASCIICase(value.function->name, "steps(")) {
- // For steps, 1 or 2 params must be specified (comma-separated)
- if (!args || (args->size() != 1 && args->size() != 3))
- return nullptr;
-
- // There are two values.
- int numSteps;
- bool stepAtStart = false;
-
- CSSParserValue* argument = args->current();
- ValueWithCalculation argumentWithCalculation(*argument);
- if (!validateUnit(argumentWithCalculation, FInteger))
- return nullptr;
- numSteps = clampToInteger(parsedDouble(argumentWithCalculation));
- if (numSteps < 1)
- return nullptr;
- argument = args->next();
-
- if (argument) {
- // There is a comma so we need to parse the second value
- if (!isComma(argument))
- return nullptr;
- argument = args->next();
- if (argument->id != CSSValueStart && argument->id != CSSValueEnd)
- return nullptr;
- stepAtStart = argument->id == CSSValueStart;
- }
-
- return CSSStepsTimingFunctionValue::create(numSteps, stepAtStart);
- }
-
- if (equalLettersIgnoringASCIICase(value.function->name, "cubic-bezier(")) {
- // For cubic bezier, 4 values must be specified (comma-separated).
- if (!args || args->size() != 7)
- return nullptr;
-
- // There are two points specified. The x values must be between 0 and 1 but the y values can exceed this range.
-
- auto x1 = parseCubicBezierTimingFunctionValue(*args);
- if (!x1 || x1.value() < 0 || x1.value() > 1)
- return nullptr;
-
- auto y1 = parseCubicBezierTimingFunctionValue(*args);
- if (!y1)
- return nullptr;
-
- auto x2 = parseCubicBezierTimingFunctionValue(*args);
- if (!x2 || x2.value() < 0 || x2.value() > 1)
- return nullptr;
-
- auto y2 = parseCubicBezierTimingFunctionValue(*args);
- if (!y2)
- return nullptr;
-
- return CSSCubicBezierTimingFunctionValue::create(x1.value(), y1.value(), x2.value(), y2.value());
- }
-
- if (isSpringTimingFunctionEnabled() && equalLettersIgnoringASCIICase(value.function->name, "spring(")) {
- // For a spring, 4 values must be specified (space-separated).
- // FIXME: Make the arguments all optional.
- if (!args || args->size() != 4)
- return nullptr;
-
- // Mass must be greater than 0.
- auto mass = parseSpringTimingFunctionValue(*args);
- if (!mass || mass.value() <= 0)
- return nullptr;
-
- // Stiffness must be greater than 0.
- auto stiffness = parseSpringTimingFunctionValue(*args);
- if (!stiffness || stiffness.value() <= 0)
- return nullptr;
-
- // Damping coefficient must be greater than or equal to 0.
- auto damping = parseSpringTimingFunctionValue(*args);
- if (!damping || damping.value() < 0)
- return nullptr;
-
- // Initial velocity may have any value.
- auto initialVelocity = parseSpringTimingFunctionValue(*args);
- if (!initialVelocity)
- return nullptr;
-
- return CSSSpringTimingFunctionValue::create(mass.value(), stiffness.value(), damping.value(), initialVelocity.value());
- }
-
- return nullptr;
-}
-
-bool CSSParser::parseAnimationProperty(CSSPropertyID propId, RefPtr<CSSValue>& result, AnimationParseContext& context)
-{
- RefPtr<CSSValueList> values;
- CSSParserValue* val;
- RefPtr<CSSValue> value;
- bool allowComma = false;
-
- result = nullptr;
-
- while ((val = m_valueList->current())) {
- RefPtr<CSSValue> currValue;
- if (allowComma) {
- if (!isComma(val))
- return false;
- m_valueList->next();
- allowComma = false;
- }
- else {
- switch (propId) {
- case CSSPropertyAnimationDelay:
- case CSSPropertyTransitionDelay:
- currValue = parseAnimationDelay();
- if (currValue)
- m_valueList->next();
- break;
- case CSSPropertyAnimationDirection:
- currValue = parseAnimationDirection();
- if (currValue)
- m_valueList->next();
- break;
- case CSSPropertyAnimationDuration:
- case CSSPropertyTransitionDuration:
- currValue = parseAnimationDuration();
- if (currValue)
- m_valueList->next();
- break;
- case CSSPropertyAnimationFillMode:
- currValue = parseAnimationFillMode();
- if (currValue)
- m_valueList->next();
- break;
- case CSSPropertyAnimationIterationCount:
- currValue = parseAnimationIterationCount();
- if (currValue)
- m_valueList->next();
- break;
- case CSSPropertyAnimationName:
- currValue = parseAnimationName();
- if (currValue)
- m_valueList->next();
- break;
- case CSSPropertyAnimationPlayState:
- currValue = parseAnimationPlayState();
- if (currValue)
- m_valueList->next();
- break;
- case CSSPropertyTransitionProperty:
- currValue = parseAnimationProperty(context);
- if (value && !context.animationPropertyKeywordAllowed())
- return false;
- if (currValue)
- m_valueList->next();
- break;
- case CSSPropertyAnimationTimingFunction:
- case CSSPropertyTransitionTimingFunction:
- currValue = parseAnimationTimingFunction();
- if (currValue)
- m_valueList->next();
- break;
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
- case CSSPropertyWebkitAnimationTrigger:
- currValue = parseAnimationTrigger();
- if (currValue)
- m_valueList->next();
- break;
-#endif
- default:
- ASSERT_NOT_REACHED();
- return false;
- }
-
- if (!currValue)
- return false;
-
- if (value && !values) {
- values = CSSValueList::createCommaSeparated();
- values->append(value.releaseNonNull());
- }
-
- if (values)
- values->append(currValue.releaseNonNull());
- else
- value = WTFMove(currValue);
-
- allowComma = true;
- }
-
- // When parsing the 'transition' shorthand property, we let it handle building up the lists for all
- // properties.
- if (inShorthand())
- break;
- }
-
- if (values && values->length()) {
- result = WTFMove(values);
- return true;
- }
- if (value) {
- result = WTFMove(value);
- return true;
- }
- return false;
-}
-
-#if ENABLE(CSS_GRID_LAYOUT)
-static inline bool isValidGridPositionCustomIdent(const CSSParserValue& value)
-{
- return value.unit == CSSPrimitiveValue::CSS_IDENT && value.id != CSSValueSpan && value.id != CSSValueAuto;
-}
-
-// The function parses [ <integer> || <custom-ident> ] in <grid-line> (which can be stand alone or with 'span').
-bool CSSParser::parseIntegerOrCustomIdentFromGridPosition(RefPtr<CSSPrimitiveValue>& numericValue, RefPtr<CSSPrimitiveValue>& gridLineName)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- if (validateUnit(valueWithCalculation, FInteger) && valueWithCalculation.value().fValue) {
- numericValue = createPrimitiveNumericValue(valueWithCalculation);
- CSSParserValue* nextValue = m_valueList->next();
- if (nextValue && isValidGridPositionCustomIdent(*nextValue)) {
- gridLineName = createPrimitiveStringValue(*nextValue);
- m_valueList->next();
- }
- return true;
- }
-
- if (isValidGridPositionCustomIdent(valueWithCalculation)) {
- gridLineName = createPrimitiveStringValue(valueWithCalculation);
- if (CSSParserValue* nextValue = m_valueList->next()) {
- ValueWithCalculation nextValueWithCalculation(*nextValue);
- if (validateUnit(nextValueWithCalculation, FInteger) && nextValueWithCalculation.value().fValue) {
- numericValue = createPrimitiveNumericValue(nextValueWithCalculation);
- m_valueList->next();
- }
- }
- return true;
- }
-
- return false;
-}
-
-RefPtr<CSSValue> CSSParser::parseGridPosition()
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- CSSParserValue* value = m_valueList->current();
- if (value->id == CSSValueAuto) {
- m_valueList->next();
- return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
- }
-
- RefPtr<CSSPrimitiveValue> numericValue;
- RefPtr<CSSPrimitiveValue> gridLineName;
- bool hasSeenSpanKeyword = false;
-
- if (value->id == CSSValueSpan) {
- hasSeenSpanKeyword = true;
- if (auto* nextValue = m_valueList->next()) {
- if (!isForwardSlashOperator(*nextValue) && !parseIntegerOrCustomIdentFromGridPosition(numericValue, gridLineName))
- return nullptr;
- }
- } else if (parseIntegerOrCustomIdentFromGridPosition(numericValue, gridLineName)) {
- value = m_valueList->current();
- if (value && value->id == CSSValueSpan) {
- hasSeenSpanKeyword = true;
- m_valueList->next();
- }
- }
-
- // Check that we have consumed all the value list. For shorthands, the parser will pass
- // the whole value list (including the opposite position).
- if (m_valueList->current() && !isForwardSlashOperator(*m_valueList->current()))
- return nullptr;
-
- // If we didn't parse anything, this is not a valid grid position.
- if (!hasSeenSpanKeyword && !gridLineName && !numericValue)
- return nullptr;
-
- // If we have "span" keyword alone is invalid.
- if (hasSeenSpanKeyword && !gridLineName && !numericValue)
- return nullptr;
-
- // Negative numbers are not allowed for span (but are for <integer>).
- if (hasSeenSpanKeyword && numericValue && numericValue->intValue() < 0)
- return nullptr;
-
- // For the <custom-ident> case.
- if (gridLineName && !numericValue && !hasSeenSpanKeyword)
- return CSSValuePool::singleton().createValue(gridLineName->stringValue(), CSSPrimitiveValue::CSS_STRING);
-
- auto values = CSSValueList::createSpaceSeparated();
- if (hasSeenSpanKeyword)
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueSpan));
- if (numericValue)
- values->append(numericValue.releaseNonNull());
- if (gridLineName)
- values->append(gridLineName.releaseNonNull());
- ASSERT(values->length());
- return WTFMove(values);
-}
-
-static Ref<CSSValue> gridMissingGridPositionValue(CSSValue& value)
-{
- if (is<CSSPrimitiveValue>(value) && downcast<CSSPrimitiveValue>(value).isString())
- return value;
-
- return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
-}
-
-bool CSSParser::parseGridItemPositionShorthand(CSSPropertyID shorthandId, bool important)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- ShorthandScope scope(this, shorthandId);
- const StylePropertyShorthand& shorthand = shorthandForProperty(shorthandId);
- ASSERT(shorthand.length() == 2);
-
- RefPtr<CSSValue> startValue = parseGridPosition();
- if (!startValue)
- return false;
-
- RefPtr<CSSValue> endValue;
- if (m_valueList->current()) {
- if (!isForwardSlashOperator(*m_valueList->current()))
- return false;
-
- if (!m_valueList->next())
- return false;
-
- endValue = parseGridPosition();
- if (!endValue || m_valueList->current())
- return false;
- } else
- endValue = gridMissingGridPositionValue(*startValue);
-
- addProperty(shorthand.properties()[0], startValue.releaseNonNull(), important);
- addProperty(shorthand.properties()[1], endValue.releaseNonNull(), important);
- return true;
-}
-
-bool CSSParser::parseGridGapShorthand(bool important)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- ShorthandScope scope(this, CSSPropertyGridGap);
- ASSERT(shorthandForProperty(CSSPropertyGridGap).length() == 2);
-
- CSSParserValue* value = m_valueList->current();
- if (!value)
- return false;
-
- ValueWithCalculation rowValueWithCalculation(*value);
- if (!validateUnit(rowValueWithCalculation, FLength | FNonNeg))
- return false;
-
- auto rowGap = createPrimitiveNumericValue(rowValueWithCalculation);
-
- value = m_valueList->next();
- if (!value) {
- addProperty(CSSPropertyGridColumnGap, rowGap.copyRef(), important);
- addProperty(CSSPropertyGridRowGap, WTFMove(rowGap), important);
- return true;
- }
-
- ValueWithCalculation columnValueWithCalculation(*value);
- if (!validateUnit(columnValueWithCalculation, FLength | FNonNeg))
- return false;
-
- if (m_valueList->next())
- return false;
-
- auto columnGap = createPrimitiveNumericValue(columnValueWithCalculation);
-
- addProperty(CSSPropertyGridRowGap, WTFMove(rowGap), important);
- addProperty(CSSPropertyGridColumnGap, WTFMove(columnGap), important);
-
- return true;
-}
-
-RefPtr<CSSValue> CSSParser::parseGridTemplateColumns(TrackListType trackListType)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- if (!(m_valueList->current() && isForwardSlashOperator(*m_valueList->current()) && m_valueList->next()))
- return nullptr;
- if (auto columnsValue = parseGridTrackList(trackListType)) {
- if (m_valueList->current())
- return nullptr;
- return columnsValue;
- }
-
- return nullptr;
-}
-
-bool CSSParser::parseGridTemplateRowsAndAreasAndColumns(bool important)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- // At least template-areas strings must be defined.
- if (!m_valueList->current() || isForwardSlashOperator(*m_valueList->current()))
- return false;
-
- NamedGridAreaMap gridAreaMap;
- unsigned rowCount = 0;
- unsigned columnCount = 0;
- bool trailingIdentWasAdded = false;
- auto templateRows = CSSValueList::createSpaceSeparated();
-
- while (m_valueList->current() && !isForwardSlashOperator(*m_valueList->current())) {
- // Handle leading <custom-ident>*.
- if (m_valueList->current()->unit == CSSParserValue::ValueList) {
- if (trailingIdentWasAdded) {
- // A row's trailing ident must be concatenated with the next row's leading one.
- parseGridLineNames(*m_valueList, templateRows, downcast<CSSGridLineNamesValue>(templateRows->item(templateRows->length() - 1)));
- } else
- parseGridLineNames(*m_valueList, templateRows);
- }
-
- // Handle a template-area's row.
- if (!parseGridTemplateAreasRow(gridAreaMap, rowCount, columnCount))
- return false;
- ++rowCount;
-
- // Handle template-rows's track-size.
- if (m_valueList->current() && m_valueList->current()->unit != CSSParserValue::Operator && m_valueList->current()->unit != CSSParserValue::ValueList && m_valueList->current()->unit != CSSPrimitiveValue::CSS_STRING) {
- RefPtr<CSSValue> value = parseGridTrackSize(*m_valueList);
- if (!value)
- return false;
- templateRows->append(value.releaseNonNull());
- } else
- templateRows->append(CSSValuePool::singleton().createIdentifierValue(CSSValueAuto));
-
- // This will handle the trailing/leading <custom-ident>* in the grammar.
- trailingIdentWasAdded = false;
- if (m_valueList->current() && m_valueList->current()->unit == CSSParserValue::ValueList)
- trailingIdentWasAdded = parseGridLineNames(*m_valueList, templateRows);
- }
-
- // [/ <explicit-track-list> ]?
- RefPtr<CSSValue> templateColumns;
- if (m_valueList->current()) {
- ASSERT(isForwardSlashOperator(*m_valueList->current()));
- templateColumns = parseGridTemplateColumns(GridTemplateNoRepeat);
- if (!templateColumns)
- return false;
- // The template-columns <track-list> can't be 'none'.
- if (templateColumns->isPrimitiveValue() && downcast<CSSPrimitiveValue>(*templateColumns).valueID() == CSSValueNone)
- return false;
- }
-
- addProperty(CSSPropertyGridTemplateRows, WTFMove(templateRows), important);
- if (templateColumns)
- addProperty(CSSPropertyGridTemplateColumns, templateColumns.releaseNonNull(), important);
- else
- addProperty(CSSPropertyGridTemplateColumns, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- addProperty(CSSPropertyGridTemplateAreas, CSSGridTemplateAreasValue::create(gridAreaMap, rowCount, columnCount), important);
-
- return true;
-}
-
-bool CSSParser::parseGridTemplateShorthand(bool important)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- ShorthandScope scope(this, CSSPropertyGridTemplate);
- ASSERT(shorthandForProperty(CSSPropertyGridTemplate).length() == 3);
-
- // At least "none" must be defined.
- if (!m_valueList->current())
- return false;
-
- bool firstValueIsNone = m_valueList->current()->id == CSSValueNone;
-
- // 1- 'none' case.
- if (firstValueIsNone && !m_valueList->next()) {
- addProperty(CSSPropertyGridTemplateColumns, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- addProperty(CSSPropertyGridTemplateRows, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- addProperty(CSSPropertyGridTemplateAreas, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- return true;
- }
-
- // 2- <grid-template-rows> / <grid-template-columns> syntax.
- RefPtr<CSSValue> rowsValue;
- if (firstValueIsNone)
- rowsValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
- else
- rowsValue = parseGridTrackList(GridTemplate);
-
- if (rowsValue) {
- auto columnsValue = parseGridTemplateColumns();
- if (!columnsValue)
- return false;
-
- addProperty(CSSPropertyGridTemplateColumns, columnsValue.releaseNonNull(), important);
- addProperty(CSSPropertyGridTemplateRows, rowsValue.releaseNonNull(), important);
- addProperty(CSSPropertyGridTemplateAreas, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- return true;
- }
-
-
- // 3- [<line-names>? <string> <track-size>? <line-names>? ]+ syntax.
- // It requires to rewind parsing due to previous syntax failures.
- m_valueList->setCurrentIndex(0);
- return parseGridTemplateRowsAndAreasAndColumns(important);
-}
-
-static RefPtr<CSSValue> parseImplicitAutoFlow(CSSParserValueList& inputList, Ref<CSSPrimitiveValue>&& flowDirection)
-{
- // [ auto-flow && dense? ]
- auto value = inputList.current();
- if (!value)
- return nullptr;
- auto list = CSSValueList::createSpaceSeparated();
- list->append(WTFMove(flowDirection));
- if (value->id == CSSValueAutoFlow) {
- value = inputList.next();
- if (value && value->id == CSSValueDense) {
- list->append(CSSValuePool::singleton().createIdentifierValue(CSSValueDense));
- inputList.next();
- }
- } else {
- if (value->id != CSSValueDense)
- return nullptr;
- value = inputList.next();
- if (!value || value->id != CSSValueAutoFlow)
- return nullptr;
- list->append(CSSValuePool::singleton().createIdentifierValue(CSSValueDense));
- inputList.next();
- }
-
- return WTFMove(list);
-}
-
-bool CSSParser::parseGridShorthand(bool important)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- ShorthandScope scope(this, CSSPropertyGrid);
- ASSERT(shorthandForProperty(CSSPropertyGrid).length() == 8);
-
- // 1- <grid-template>
- if (parseGridTemplateShorthand(important)) {
- // It can only be specified the explicit or the implicit grid properties in a single grid declaration.
- // The sub-properties not specified are set to their initial value, as normal for shorthands.
- addProperty(CSSPropertyGridAutoFlow, CSSValuePool::singleton().createImplicitInitialValue(), important);
- addProperty(CSSPropertyGridAutoColumns, CSSValuePool::singleton().createImplicitInitialValue(), important);
- addProperty(CSSPropertyGridAutoRows, CSSValuePool::singleton().createImplicitInitialValue(), important);
- addProperty(CSSPropertyGridColumnGap, CSSValuePool::singleton().createImplicitInitialValue(), important);
- addProperty(CSSPropertyGridRowGap, CSSValuePool::singleton().createImplicitInitialValue(), important);
- return true;
- }
-
- // Need to rewind parsing to explore the alternative syntax of this shorthand.
- m_valueList->setCurrentIndex(0);
- auto value = m_valueList->current();
- if (!value)
- return false;
-
- RefPtr<CSSValue> autoColumnsValue;
- RefPtr<CSSValue> autoRowsValue;
- RefPtr<CSSValue> templateRows;
- RefPtr<CSSValue> templateColumns;
- RefPtr<CSSValue> gridAutoFlow;
- if (value->id == CSSValueDense || value->id == CSSValueAutoFlow) {
- // 2- [ auto-flow && dense? ] <grid-auto-rows>? / <grid-template-columns>
- gridAutoFlow = parseImplicitAutoFlow(*m_valueList, CSSValuePool::singleton().createIdentifierValue(CSSValueRow));
- if (!gridAutoFlow)
- return false;
- if (!m_valueList->current())
- return false;
- if (isForwardSlashOperator(*m_valueList->current()))
- autoRowsValue = CSSValuePool::singleton().createImplicitInitialValue();
- else {
- autoRowsValue = parseGridTrackList(GridAuto);
- if (!autoRowsValue)
- return false;
- if (!(m_valueList->current() && isForwardSlashOperator(*m_valueList->current())))
- return false;
- }
- if (!m_valueList->next())
- return false;
- templateColumns = parseGridTrackList(GridTemplate);
- if (!templateColumns)
- return false;
- templateRows = CSSValuePool::singleton().createImplicitInitialValue();
- autoColumnsValue = CSSValuePool::singleton().createImplicitInitialValue();
- } else {
- // 3- <grid-template-rows> / [ auto-flow && dense? ] <grid-auto-columns>?
- templateRows = parseGridTrackList(GridTemplate);
- if (!templateRows)
- return false;
- if (!(m_valueList->current() && isForwardSlashOperator(*m_valueList->current())))
- return false;
- if (!m_valueList->next())
- return false;
- gridAutoFlow = parseImplicitAutoFlow(*m_valueList, CSSValuePool::singleton().createIdentifierValue(CSSValueColumn));
- if (!gridAutoFlow)
- return false;
- if (!m_valueList->current())
- autoColumnsValue = CSSValuePool::singleton().createImplicitInitialValue();
- else {
- autoColumnsValue = parseGridTrackList(GridAuto);
- if (!autoColumnsValue)
- return false;
- }
- templateColumns = CSSValuePool::singleton().createImplicitInitialValue();
- autoRowsValue = CSSValuePool::singleton().createImplicitInitialValue();
- }
-
- if (m_valueList->current())
- return false;
-
- // It can only be specified the explicit or the implicit grid properties in a single grid declaration.
- // The sub-properties not specified are set to their initial value, as normal for shorthands.
- addProperty(CSSPropertyGridTemplateColumns, templateColumns.releaseNonNull(), important);
- addProperty(CSSPropertyGridTemplateRows, templateRows.releaseNonNull(), important);
- addProperty(CSSPropertyGridTemplateAreas, CSSValuePool::singleton().createImplicitInitialValue(), important);
- addProperty(CSSPropertyGridAutoFlow, gridAutoFlow.releaseNonNull(), important);
- addProperty(CSSPropertyGridAutoColumns, autoColumnsValue.releaseNonNull(), important);
- addProperty(CSSPropertyGridAutoRows, autoRowsValue.releaseNonNull(), important);
- addProperty(CSSPropertyGridColumnGap, CSSValuePool::singleton().createImplicitInitialValue(), important);
- addProperty(CSSPropertyGridRowGap, CSSValuePool::singleton().createImplicitInitialValue(), important);
-
- return true;
-}
-
-bool CSSParser::parseGridAreaShorthand(bool important)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- ShorthandScope scope(this, CSSPropertyGridArea);
- ASSERT(shorthandForProperty(CSSPropertyGridArea).length() == 4);
-
- RefPtr<CSSValue> rowStartValue = parseGridPosition();
- if (!rowStartValue)
- return false;
-
- RefPtr<CSSValue> columnStartValue;
- if (!parseSingleGridAreaLonghand(columnStartValue))
- return false;
-
- RefPtr<CSSValue> rowEndValue;
- if (!parseSingleGridAreaLonghand(rowEndValue))
- return false;
-
- RefPtr<CSSValue> columnEndValue;
- if (!parseSingleGridAreaLonghand(columnEndValue))
- return false;
-
- if (!columnStartValue)
- columnStartValue = gridMissingGridPositionValue(*rowStartValue);
-
- if (!rowEndValue)
- rowEndValue = gridMissingGridPositionValue(*rowStartValue);
-
- if (!columnEndValue)
- columnEndValue = gridMissingGridPositionValue(*columnStartValue);
-
- addProperty(CSSPropertyGridRowStart, rowStartValue.releaseNonNull(), important);
- addProperty(CSSPropertyGridColumnStart, columnStartValue.releaseNonNull(), important);
- addProperty(CSSPropertyGridRowEnd, rowEndValue.releaseNonNull(), important);
- addProperty(CSSPropertyGridColumnEnd, columnEndValue.releaseNonNull(), important);
- return true;
-}
-
-bool CSSParser::parseSingleGridAreaLonghand(RefPtr<CSSValue>& property)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- if (!m_valueList->current())
- return true;
-
- if (!isForwardSlashOperator(*m_valueList->current()))
- return false;
-
- if (!m_valueList->next())
- return false;
-
- property = parseGridPosition();
- return true;
-}
-
-bool CSSParser::parseGridLineNames(CSSParserValueList& inputList, CSSValueList& valueList, CSSGridLineNamesValue* previousNamedAreaTrailingLineNames)
-{
- ASSERT(isCSSGridLayoutEnabled());
- ASSERT(inputList.current() && inputList.current()->unit == CSSParserValue::ValueList);
-
- CSSParserValueList& identList = *inputList.current()->valueList;
- if (!identList.size()) {
- inputList.next();
- return false;
- }
-
- // Need to ensure the identList is at the heading index, since the parserList might have been rewound.
- identList.setCurrentIndex(0);
- Ref<CSSGridLineNamesValue> lineNames = previousNamedAreaTrailingLineNames ? Ref<CSSGridLineNamesValue>(*previousNamedAreaTrailingLineNames) : CSSGridLineNamesValue::create();
- while (CSSParserValue* identValue = identList.current()) {
- ASSERT(identValue->unit == CSSPrimitiveValue::CSS_IDENT);
- lineNames->append(createPrimitiveStringValue(*identValue));
- identList.next();
- }
- if (!previousNamedAreaTrailingLineNames)
- valueList.append(WTFMove(lineNames));
-
- inputList.next();
- return true;
-}
-
-static bool isGridTrackFixedSized(const CSSPrimitiveValue& value)
-{
- CSSValueID valueID = value.valueID();
- if (valueID == CSSValueWebkitMinContent || valueID == CSSValueWebkitMaxContent || valueID == CSSValueAuto || value.isFlex())
- return false;
-
- ASSERT(value.isLength() || value.isPercentage() || value.isCalculated());
- return true;
-}
-
-static bool isGridTrackFixedSized(const CSSValue& value)
-{
- if (value.isPrimitiveValue())
- return isGridTrackFixedSized(downcast<CSSPrimitiveValue>(value));
-
- ASSERT(value.isFunctionValue());
- auto& arguments = *downcast<CSSFunctionValue>(value).arguments();
- // fit-content
- if (arguments.length() == 1)
- return false;
-
- ASSERT(arguments.length() == 2);
- auto& min = downcast<CSSPrimitiveValue>(*arguments.itemWithoutBoundsCheck(0));
- auto& max = downcast<CSSPrimitiveValue>(*arguments.itemWithoutBoundsCheck(1));
- return isGridTrackFixedSized(min) || isGridTrackFixedSized(max);
-}
-
-RefPtr<CSSValue> CSSParser::parseGridTrackList(TrackListType trackListType)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- CSSParserValue* value = m_valueList->current();
- if (value->id == CSSValueNone) {
- if (trackListType == GridAuto)
- return nullptr;
- m_valueList->next();
- return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
- }
-
- auto values = CSSValueList::createSpaceSeparated();
- // Handle leading <custom-ident>*.
- value = m_valueList->current();
- bool allowGridLineNames = trackListType != GridAuto;
- if (value && value->unit == CSSParserValue::ValueList) {
- if (!allowGridLineNames)
- return nullptr;
- parseGridLineNames(*m_valueList, values);
- }
-
- bool seenTrackSizeOrRepeatFunction = false;
- bool seenAutoRepeat = false;
- bool allTracksAreFixedSized = true;
- bool repeatAllowed = trackListType == GridTemplate;
- while (CSSParserValue* currentValue = m_valueList->current()) {
- if (isForwardSlashOperator(*currentValue))
- break;
- if (currentValue->unit == CSSParserValue::Function && equalLettersIgnoringASCIICase(currentValue->function->name, "repeat(")) {
- if (!repeatAllowed)
- return nullptr;
- bool isAutoRepeat;
- if (!parseGridTrackRepeatFunction(values, isAutoRepeat, allTracksAreFixedSized))
- return nullptr;
- if (isAutoRepeat && seenAutoRepeat)
- return nullptr;
- seenAutoRepeat = seenAutoRepeat || isAutoRepeat;
- } else {
- RefPtr<CSSValue> value = parseGridTrackSize(*m_valueList);
- if (!value)
- return nullptr;
-
- allTracksAreFixedSized = allTracksAreFixedSized && isGridTrackFixedSized(*value);
- values->append(value.releaseNonNull());
- }
- seenTrackSizeOrRepeatFunction = true;
-
- if (seenAutoRepeat && !allTracksAreFixedSized)
- return nullptr;
-
- // This will handle the trailing <custom-ident>* in the grammar.
- value = m_valueList->current();
- if (value && value->unit == CSSParserValue::ValueList) {
- if (!allowGridLineNames)
- return nullptr;
- parseGridLineNames(*m_valueList, values);
- }
- }
-
- if (!seenTrackSizeOrRepeatFunction)
- return nullptr;
-
- return WTFMove(values);
-}
-
-bool CSSParser::parseGridTrackRepeatFunction(CSSValueList& list, bool& isAutoRepeat, bool& allTracksAreFixedSized)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- CSSParserValueList* arguments = m_valueList->current()->function->args.get();
- if (!arguments || arguments->size() < 3 || !isComma(arguments->valueAt(1)))
- return false;
-
- ValueWithCalculation firstValueWithCalculation(*arguments->valueAt(0));
- CSSValueID firstValueID = firstValueWithCalculation.value().id;
- isAutoRepeat = firstValueID == CSSValueAutoFill || firstValueID == CSSValueAutoFit;
- if (!isAutoRepeat && !validateUnit(firstValueWithCalculation, FPositiveInteger))
- return false;
-
- // If arguments->valueAt(0)->fValue > SIZE_MAX then repetitions becomes 0 during the type casting, that's why we
- // clamp it down to kGridMaxTracks before the type casting.
- // The number of repetitions for <auto-repeat> is not important at parsing level
- // because it will be computed later, let's set it to 1.
- unsigned repetitions = isAutoRepeat ? 1 : clampTo<unsigned>(parsedDouble(firstValueWithCalculation), 0, kGridMaxTracks);
-
- Ref<CSSValueList> repeatedValues = isAutoRepeat ? Ref<CSSValueList>(CSSGridAutoRepeatValue::create(firstValueID)) : CSSValueList::createSpaceSeparated();
- arguments->next(); // Skip the repetition count.
- arguments->next(); // Skip the comma.
-
- // Handle leading <custom-ident>*.
- CSSParserValue* currentValue = arguments->current();
- if (currentValue && currentValue->unit == CSSParserValue::ValueList)
- parseGridLineNames(*arguments, repeatedValues);
-
- unsigned numberOfTracks = 0;
- while (arguments->current()) {
- RefPtr<CSSValue> trackSize = parseGridTrackSize(*arguments);
- if (!trackSize)
- return false;
-
- allTracksAreFixedSized = allTracksAreFixedSized && isGridTrackFixedSized(*trackSize);
- repeatedValues->append(trackSize.releaseNonNull());
- ++numberOfTracks;
-
- // This takes care of any trailing <custom-ident>* in the grammar.
- currentValue = arguments->current();
- if (currentValue && currentValue->unit == CSSParserValue::ValueList)
- parseGridLineNames(*arguments, repeatedValues);
- }
-
- // We should have found at least one <track-size>, otherwise the declaration is invalid.
- if (!numberOfTracks)
- return false;
-
- // We clamp the number of repetitions to a multiple of the repeat() track list's size, while staying below the max
- // grid size.
- repetitions = std::min(repetitions, kGridMaxTracks / numberOfTracks);
-
- if (isAutoRepeat)
- list.append(WTFMove(repeatedValues));
- else {
- for (unsigned i = 0; i < repetitions; ++i) {
- for (unsigned j = 0; j < repeatedValues->length(); ++j)
- list.append(*repeatedValues->itemWithoutBoundsCheck(j));
- }
- }
-
- m_valueList->next();
- return true;
-}
-
-RefPtr<CSSValue> CSSParser::parseGridTrackSize(CSSParserValueList& inputList)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- CSSParserValue& currentValue = *inputList.current();
- inputList.next();
-
- if (currentValue.id == CSSValueAuto)
- return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
-
- if (currentValue.unit == CSSParserValue::Function && equalLettersIgnoringASCIICase(currentValue.function->name, "fit-content(")) {
- CSSParserValueList* arguments = currentValue.function->args.get();
- if (!arguments || arguments->size() != 1)
- return nullptr;
- ValueWithCalculation valueWithCalculation(*arguments->valueAt(0));
- if (!validateUnit(valueWithCalculation, FNonNeg | FLength | FPercent))
- return nullptr;
- RefPtr<CSSPrimitiveValue> trackBreadth = createPrimitiveNumericValue(valueWithCalculation);
- if (!trackBreadth)
- return nullptr;
- auto parsedArguments = CSSValueList::createCommaSeparated();
- parsedArguments->append(trackBreadth.releaseNonNull());
- return CSSFunctionValue::create("fit-content(", WTFMove(parsedArguments));
- }
-
- if (currentValue.unit == CSSParserValue::Function && equalLettersIgnoringASCIICase(currentValue.function->name, "minmax(")) {
- // The spec defines the following grammar: minmax( <track-breadth> , <track-breadth> )
- CSSParserValueList* arguments = currentValue.function->args.get();
- if (!arguments || arguments->size() != 3 || !isComma(arguments->valueAt(1)))
- return nullptr;
-
- RefPtr<CSSPrimitiveValue> minTrackBreadth = parseGridBreadth(*arguments->valueAt(0));
- if (!minTrackBreadth || minTrackBreadth->isFlex())
- return nullptr;
-
- RefPtr<CSSPrimitiveValue> maxTrackBreadth = parseGridBreadth(*arguments->valueAt(2));
- if (!maxTrackBreadth)
- return nullptr;
-
- auto parsedArguments = CSSValueList::createCommaSeparated();
- parsedArguments->append(minTrackBreadth.releaseNonNull());
- parsedArguments->append(maxTrackBreadth.releaseNonNull());
- return CSSFunctionValue::create("minmax(", WTFMove(parsedArguments));
- }
-
- return parseGridBreadth(currentValue);
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseGridBreadth(CSSParserValue& value)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- if (value.id == CSSValueWebkitMinContent || value.id == CSSValueWebkitMaxContent || value.id == CSSValueAuto)
- return CSSValuePool::singleton().createIdentifierValue(value.id);
-
- if (value.unit == CSSPrimitiveValue::CSS_FR) {
- double flexValue = value.fValue;
-
- // Fractional unit is a non-negative dimension.
- if (flexValue <= 0)
- return nullptr;
-
- return CSSValuePool::singleton().createValue(flexValue, CSSPrimitiveValue::CSS_FR);
- }
-
- ValueWithCalculation valueWithCalculation(value);
- if (!validateUnit(valueWithCalculation, FNonNeg | FLength | FPercent))
- return nullptr;
-
- return createPrimitiveNumericValue(valueWithCalculation);
-}
-
-static inline bool isValidGridAutoFlowId(CSSValueID id)
-{
- return (id == CSSValueRow || id == CSSValueColumn || id == CSSValueDense);
-}
-
-RefPtr<CSSValue> CSSParser::parseGridAutoFlow(CSSParserValueList& inputList)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- // [ row | column ] || dense
- CSSParserValue* value = inputList.current();
- if (!value)
- return nullptr;
-
- auto parsedValues = CSSValueList::createSpaceSeparated();
-
- // First parameter.
- CSSValueID firstId = value->id;
- if (!isValidGridAutoFlowId(firstId))
- return nullptr;
-
- // Second parameter, if any.
- // If second parameter is not valid we should process anyway the first one as we can be inside the "grid" shorthand.
- value = inputList.next();
- if (!value || !isValidGridAutoFlowId(value->id)) {
- if (firstId == CSSValueDense)
- parsedValues->append(CSSValuePool::singleton().createIdentifierValue(CSSValueRow));
-
- parsedValues->append(CSSValuePool::singleton().createIdentifierValue(firstId));
- return WTFMove(parsedValues);
- }
-
- switch (firstId) {
- case CSSValueRow:
- case CSSValueColumn:
- parsedValues->append(CSSValuePool::singleton().createIdentifierValue(firstId));
- if (value->id == CSSValueDense) {
- parsedValues->append(CSSValuePool::singleton().createIdentifierValue(value->id));
- inputList.next();
- }
- break;
- case CSSValueDense:
- if (value->id == CSSValueRow || value->id == CSSValueColumn) {
- parsedValues->append(CSSValuePool::singleton().createIdentifierValue(value->id));
- inputList.next();
- }
- parsedValues->append(CSSValuePool::singleton().createIdentifierValue(firstId));
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
-
- return WTFMove(parsedValues);
-}
-#endif /* ENABLE(CSS_GRID_LAYOUT) */
-
-#if ENABLE(DASHBOARD_SUPPORT)
-
-static const int dashboardRegionParameterCount = 6;
-static const int dashboardRegionShortParameterCount = 2;
-
-static CSSParserValue* skipCommaInDashboardRegion(CSSParserValueList *args)
-{
- if (args->size() == (dashboardRegionParameterCount * 2 - 1) || args->size() == (dashboardRegionShortParameterCount * 2 - 1)) {
- CSSParserValue& current = *args->current();
- if (current.unit == CSSParserValue::Operator && current.iValue == ',')
- return args->next();
- }
- return args->current();
-}
-
-bool CSSParser::parseDashboardRegions(CSSPropertyID propId, bool important)
-{
- bool valid = true;
-
- CSSParserValue* value = m_valueList->current();
-
- if (value->id == CSSValueNone) {
- if (m_valueList->next())
- return false;
- addProperty(propId, CSSValuePool::singleton().createIdentifierValue(value->id), important);
- return valid;
- }
-
- auto firstRegion = DashboardRegion::create();
- DashboardRegion* region = nullptr;
-
- while (value) {
- if (!region) {
- region = firstRegion.ptr();
- } else {
- auto nextRegion = DashboardRegion::create();
- region->m_next = nextRegion.copyRef();
- region = nextRegion.ptr();
- }
-
- if (value->unit != CSSParserValue::Function) {
- valid = false;
- break;
- }
-
- // Commas count as values, so allow (function name is dashboard-region for DASHBOARD_SUPPORT feature):
- // dashboard-region(label, type, t, r, b, l) or dashboard-region(label type t r b l)
- // dashboard-region(label, type, t, r, b, l) or dashboard-region(label type t r b l)
- // also allow
- // dashboard-region(label, type) or dashboard-region(label type)
- // dashboard-region(label, type) or dashboard-region(label type)
- CSSParserValueList* args = value->function->args.get();
- if (!equalLettersIgnoringASCIICase(value->function->name, "dashboard-region(") || !args) {
- valid = false;
- break;
- }
-
- int numArgs = args->size();
- if ((numArgs != dashboardRegionParameterCount && numArgs != (dashboardRegionParameterCount*2-1))
- && (numArgs != dashboardRegionShortParameterCount && numArgs != (dashboardRegionShortParameterCount*2-1))) {
- valid = false;
- break;
- }
-
- // First arg is a label.
- CSSParserValue* arg = args->current();
- if (arg->unit != CSSPrimitiveValue::CSS_IDENT) {
- valid = false;
- break;
- }
-
- region->m_label = arg->string;
-
- // Second arg is a type.
- arg = args->next();
- arg = skipCommaInDashboardRegion(args);
- if (arg->unit != CSSPrimitiveValue::CSS_IDENT) {
- valid = false;
- break;
- }
-
- if (equalLettersIgnoringASCIICase(*arg, "circle"))
- region->m_isCircle = true;
- else if (equalLettersIgnoringASCIICase(*arg, "rectangle"))
- region->m_isRectangle = true;
- else {
- valid = false;
- break;
- }
-
- region->m_geometryType = arg->string;
-
- if (numArgs == dashboardRegionShortParameterCount || numArgs == (dashboardRegionShortParameterCount*2-1)) {
- // This originally used CSSValueInvalid by accident. It might be more logical to use something else.
- RefPtr<CSSPrimitiveValue> amount = CSSValuePool::singleton().createIdentifierValue(CSSValueInvalid);
-
- region->setTop(amount.copyRef());
- region->setRight(amount.copyRef());
- region->setBottom(amount.copyRef());
- region->setLeft(WTFMove(amount));
- } else {
- // Next four arguments must be offset numbers
- for (int i = 0; i < 4; ++i) {
- arg = args->next();
- arg = skipCommaInDashboardRegion(args);
-
- ValueWithCalculation argWithCalculation(*arg);
- valid = arg->id == CSSValueAuto || validateUnit(argWithCalculation, FLength);
- if (!valid)
- break;
-
- RefPtr<CSSPrimitiveValue> amount = arg->id == CSSValueAuto ? CSSValuePool::singleton().createIdentifierValue(CSSValueAuto) : createPrimitiveNumericValue(argWithCalculation);
-
- if (i == 0)
- region->setTop(WTFMove(amount));
- else if (i == 1)
- region->setRight(WTFMove(amount));
- else if (i == 2)
- region->setBottom(WTFMove(amount));
- else
- region->setLeft(WTFMove(amount));
- }
- }
-
- if (args->next())
- return false;
-
- value = m_valueList->next();
- }
-
- if (valid)
- addProperty(propId, CSSValuePool::singleton().createValue(RefPtr<DashboardRegion>(WTFMove(firstRegion))), important);
-
- return valid;
-}
-
-#endif /* ENABLE(DASHBOARD_SUPPORT) */
-
-#if ENABLE(CSS_GRID_LAYOUT)
-static Vector<String> parseGridTemplateAreasColumnNames(const String& gridRowNames)
-{
- ASSERT(!gridRowNames.isEmpty());
- Vector<String> columnNames;
- // Using StringImpl to avoid checks and indirection in every call to String::operator[].
- StringImpl& text = *gridRowNames.impl();
- unsigned length = text.length();
- unsigned index = 0;
- while (index < length) {
- if (text[index] != ' ' && text[index] != '.') {
- unsigned gridAreaStart = index;
- while (index < length && text[index] != ' ' && text[index] != '.')
- ++index;
- columnNames.append(text.substring(gridAreaStart, index - gridAreaStart));
- continue;
- }
-
- if (text[index] == '.') {
- while (index < length && text[index] == '.')
- ++index;
- columnNames.append(".");
- continue;
- }
-
- ++index;
- }
-
- return columnNames;
-}
-
-bool CSSParser::parseGridTemplateAreasRow(NamedGridAreaMap& gridAreaMap, const unsigned rowCount, unsigned& columnCount)
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- CSSParserValue* currentValue = m_valueList->current();
- if (!currentValue || currentValue->unit != CSSPrimitiveValue::CSS_STRING)
- return false;
-
- String gridRowNames = currentValue->string;
- if (gridRowNames.containsOnlyWhitespace())
- return false;
-
- Vector<String> columnNames = parseGridTemplateAreasColumnNames(gridRowNames);
- if (!columnCount) {
- columnCount = columnNames.size();
- ASSERT(columnCount);
- } else if (columnCount != columnNames.size()) {
- // The declaration is invalid is all the rows don't have the number of columns.
- return false;
- }
-
- for (unsigned currentColumn = 0; currentColumn < columnCount; ++currentColumn) {
- const String& gridAreaName = columnNames[currentColumn];
-
- // Unamed areas are always valid (we consider them to be 1x1).
- if (gridAreaName == ".")
- continue;
-
- // We handle several grid areas with the same name at once to simplify the validation code.
- unsigned lookAheadColumn;
- for (lookAheadColumn = currentColumn + 1; lookAheadColumn < columnCount; ++lookAheadColumn) {
- if (columnNames[lookAheadColumn] != gridAreaName)
- break;
- }
-
- auto gridAreaIterator = gridAreaMap.find(gridAreaName);
- if (gridAreaIterator == gridAreaMap.end())
- gridAreaMap.add(gridAreaName, GridArea(GridSpan::translatedDefiniteGridSpan(rowCount, rowCount + 1), GridSpan::translatedDefiniteGridSpan(currentColumn, lookAheadColumn)));
- else {
- GridArea& gridArea = gridAreaIterator->value;
-
- // The following checks test that the grid area is a single filled-in rectangle.
- // 1. The new row is adjacent to the previously parsed row.
- if (rowCount != gridArea.rows.endLine())
- return false;
-
- // 2. The new area starts at the same position as the previously parsed area.
- if (currentColumn != gridArea.columns.startLine())
- return false;
-
- // 3. The new area ends at the same position as the previously parsed area.
- if (lookAheadColumn != gridArea.columns.endLine())
- return false;
-
- gridArea.rows = GridSpan::translatedDefiniteGridSpan(gridArea.rows.startLine(), gridArea.rows.endLine() + 1);
- }
- currentColumn = lookAheadColumn - 1;
- }
-
- m_valueList->next();
- return true;
-}
-
-RefPtr<CSSValue> CSSParser::parseGridTemplateAreas()
-{
- ASSERT(isCSSGridLayoutEnabled());
-
- if (m_valueList->current() && m_valueList->current()->id == CSSValueNone) {
- m_valueList->next();
- return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
- }
-
- NamedGridAreaMap gridAreaMap;
- unsigned rowCount = 0;
- unsigned columnCount = 0;
-
- while (m_valueList->current()) {
- if (!parseGridTemplateAreasRow(gridAreaMap, rowCount, columnCount))
- return nullptr;
- ++rowCount;
- }
-
- if (!rowCount || !columnCount)
- return nullptr;
-
- return CSSGridTemplateAreasValue::create(gridAreaMap, rowCount, columnCount);
-}
-#endif /* ENABLE(CSS_GRID_LAYOUT) */
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseCounterContent(CSSParserValueList& args, bool counters)
-{
- unsigned numArgs = args.size();
- if (counters && numArgs != 3 && numArgs != 5)
- return nullptr;
- if (!counters && numArgs != 1 && numArgs != 3)
- return nullptr;
-
- CSSParserValue* argument = args.current();
- if (argument->unit != CSSPrimitiveValue::CSS_IDENT)
- return nullptr;
- auto identifier = createPrimitiveStringValue(*argument);
-
- RefPtr<CSSPrimitiveValue> separator;
- if (!counters)
- separator = CSSValuePool::singleton().createValue(String(), CSSPrimitiveValue::CSS_STRING);
- else {
- argument = args.next();
- if (argument->unit != CSSParserValue::Operator || argument->iValue != ',')
- return nullptr;
-
- argument = args.next();
- if (argument->unit != CSSPrimitiveValue::CSS_STRING)
- return nullptr;
-
- separator = createPrimitiveStringValue(*argument);
- }
-
- RefPtr<CSSPrimitiveValue> listStyle;
- argument = args.next();
- if (!argument) // Make the list style default decimal
- listStyle = CSSValuePool::singleton().createIdentifierValue(CSSValueDecimal);
- else {
- if (argument->unit != CSSParserValue::Operator || argument->iValue != ',')
- return nullptr;
-
- argument = args.next();
- if (argument->unit != CSSPrimitiveValue::CSS_IDENT)
- return nullptr;
-
- CSSValueID listStyleID = CSSValueInvalid;
- if (argument->id == CSSValueNone || (argument->id >= CSSValueDisc && argument->id <= CSSValueKatakanaIroha))
- listStyleID = argument->id;
- else
- return nullptr;
-
- listStyle = CSSValuePool::singleton().createIdentifierValue(listStyleID);
- }
-
- return CSSValuePool::singleton().createValue(Counter::create(WTFMove(identifier), listStyle.releaseNonNull(), separator.releaseNonNull()));
-}
-
-bool CSSParser::parseClipShape(CSSPropertyID propId, bool important)
-{
- CSSParserValue& value = *m_valueList->current();
- CSSParserValueList* args = value.function->args.get();
-
- if (!equalLettersIgnoringASCIICase(value.function->name, "rect(") || !args)
- return false;
-
- // rect(t, r, b, l) || rect(t r b l)
- if (args->size() != 4 && args->size() != 7)
- return false;
- auto rect = Rect::create();
- bool valid = true;
- int i = 0;
- CSSParserValue* argument = args->current();
- while (argument) {
- ValueWithCalculation argumentWithCalculation(*argument);
- valid = argument->id == CSSValueAuto || validateUnit(argumentWithCalculation, FLength);
- if (!valid)
- break;
- Ref<CSSPrimitiveValue> length = argument->id == CSSValueAuto ? CSSValuePool::singleton().createIdentifierValue(CSSValueAuto) : createPrimitiveNumericValue(argumentWithCalculation);
- if (i == 0)
- rect->setTop(WTFMove(length));
- else if (i == 1)
- rect->setRight(WTFMove(length));
- else if (i == 2)
- rect->setBottom(WTFMove(length));
- else
- rect->setLeft(WTFMove(length));
- argument = args->next();
- if (argument && args->size() == 7) {
- if (argument->unit == CSSParserValue::Operator && argument->iValue == ',') {
- argument = args->next();
- } else {
- valid = false;
- break;
- }
- }
- i++;
- }
- if (valid) {
- addProperty(propId, CSSValuePool::singleton().createValue(WTFMove(rect)), important);
- m_valueList->next();
- return true;
- }
- return false;
-}
-
-static void completeBorderRadii(RefPtr<CSSPrimitiveValue> radii[4])
-{
- if (radii[3])
- return;
- if (!radii[2]) {
- if (!radii[1])
- radii[1] = radii[0];
- radii[2] = radii[0];
- }
- radii[3] = radii[1];
-}
-
-// FIXME: This should be refactored with CSSParser::parseBorderRadius.
-// CSSParser::parseBorderRadius contains support for some legacy radius construction.
-RefPtr<CSSBasicShapeInset> CSSParser::parseInsetRoundedCorners(Ref<CSSBasicShapeInset>&& shape, CSSParserValueList& args)
-{
- CSSParserValue* argument = args.next();
-
- if (!argument)
- return nullptr;
-
- Vector<CSSParserValue*> radiusArguments;
- while (argument) {
- radiusArguments.append(argument);
- argument = args.next();
- }
-
- unsigned num = radiusArguments.size();
- if (!num || num > 9)
- return nullptr;
-
- RefPtr<CSSPrimitiveValue> radii[2][4];
-
- unsigned indexAfterSlash = 0;
- for (unsigned i = 0; i < num; ++i) {
- CSSParserValue& value = *radiusArguments.at(i);
- if (value.unit == CSSParserValue::Operator) {
- if (value.iValue != '/')
- return nullptr;
-
- if (!i || indexAfterSlash || i + 1 == num || num > i + 5)
- return nullptr;
-
- indexAfterSlash = i + 1;
- completeBorderRadii(radii[0]);
- continue;
- }
-
- if (i - indexAfterSlash >= 4)
- return nullptr;
-
- ValueWithCalculation valueWithCalculation(value);
- if (!validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg))
- return nullptr;
-
- auto radius = createPrimitiveNumericValue(valueWithCalculation);
-
- if (!indexAfterSlash)
- radii[0][i] = WTFMove(radius);
- else
- radii[1][i - indexAfterSlash] = WTFMove(radius);
- }
-
- if (!indexAfterSlash) {
- completeBorderRadii(radii[0]);
- for (unsigned i = 0; i < 4; ++i)
- radii[1][i] = radii[0][i];
- } else
- completeBorderRadii(radii[1]);
-
- shape->setTopLeftRadius(createPrimitiveValuePair(WTFMove(radii[0][0]), WTFMove(radii[1][0])));
- shape->setTopRightRadius(createPrimitiveValuePair(WTFMove(radii[0][1]), WTFMove(radii[1][1])));
- shape->setBottomRightRadius(createPrimitiveValuePair(WTFMove(radii[0][2]), WTFMove(radii[1][2])));
- shape->setBottomLeftRadius(createPrimitiveValuePair(WTFMove(radii[0][3]), WTFMove(radii[1][3])));
-
- return WTFMove(shape);
-}
-
-RefPtr<CSSBasicShapeInset> CSSParser::parseBasicShapeInset(CSSParserValueList& args)
-{
- auto shape = CSSBasicShapeInset::create();
-
- CSSParserValue* argument = args.current();
- Vector<Ref<CSSPrimitiveValue> > widthArguments;
- bool hasRoundedInset = false;
- while (argument) {
- if (argument->unit == CSSPrimitiveValue::CSS_IDENT && equalLettersIgnoringASCIICase(argument->string, "round")) {
- hasRoundedInset = true;
- break;
- }
-
- Units unitFlags = FLength | FPercent;
- ValueWithCalculation argumentWithCalculation(*argument);
- if (!validateUnit(argumentWithCalculation, unitFlags) || widthArguments.size() > 4)
- return nullptr;
-
- widthArguments.append(createPrimitiveNumericValue(argumentWithCalculation));
- argument = args.next();
- }
-
- switch (widthArguments.size()) {
- case 1: {
- shape->updateShapeSize1Value(WTFMove(widthArguments[0]));
- break;
- }
- case 2: {
- shape->updateShapeSize2Values(WTFMove(widthArguments[0]), WTFMove(widthArguments[1]));
- break;
- }
- case 3: {
- shape->updateShapeSize3Values(WTFMove(widthArguments[0]), WTFMove(widthArguments[1]), WTFMove(widthArguments[2]));
- break;
- }
- case 4: {
- shape->updateShapeSize4Values(WTFMove(widthArguments[0]), WTFMove(widthArguments[1]), WTFMove(widthArguments[2]), WTFMove(widthArguments[3]));
- break;
- }
- default:
- return nullptr;
- }
-
- if (hasRoundedInset)
- return parseInsetRoundedCorners(WTFMove(shape), args);
- return WTFMove(shape);
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseShapeRadius(CSSParserValue& value)
-{
- if (value.id == CSSValueClosestSide || value.id == CSSValueFarthestSide)
- return CSSValuePool::singleton().createIdentifierValue(value.id);
-
- ValueWithCalculation valueWithCalculation(value);
- if (!validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg))
- return nullptr;
-
- return createPrimitiveNumericValue(valueWithCalculation);
-}
-
-RefPtr<CSSBasicShapeCircle> CSSParser::parseBasicShapeCircle(CSSParserValueList& args)
-{
- // circle(radius)
- // circle(radius at <position>)
- // circle(at <position>)
- // where position defines centerX and centerY using a CSS <position> data type.
- auto shape = CSSBasicShapeCircle::create();
-
- for (CSSParserValue* argument = args.current(); argument; argument = args.next()) {
- // The call to parseFillPosition below should consume all of the
- // arguments except the first two. Thus, and index greater than one
- // indicates an invalid production.
- if (args.currentIndex() > 1)
- return nullptr;
-
- if (!args.currentIndex() && argument->id != CSSValueAt) {
- if (RefPtr<CSSPrimitiveValue> radius = parseShapeRadius(*argument)) {
- shape->setRadius(radius.releaseNonNull());
- continue;
- }
-
- return nullptr;
- }
-
- if (argument->id == CSSValueAt && args.next()) {
- RefPtr<CSSPrimitiveValue> centerX;
- RefPtr<CSSPrimitiveValue> centerY;
- parseFillPosition(args, centerX, centerY);
- if (centerX && centerY && !args.current()) {
- shape->setCenterX(centerX.releaseNonNull());
- shape->setCenterY(centerY.releaseNonNull());
- } else
- return nullptr;
- } else
- return nullptr;
- }
-
- return WTFMove(shape);
-}
-
-RefPtr<CSSBasicShapeEllipse> CSSParser::parseBasicShapeEllipse(CSSParserValueList& args)
-{
- // ellipse(radiusX)
- // ellipse(radiusX at <position>)
- // ellipse(radiusX radiusY)
- // ellipse(radiusX radiusY at <position>)
- // ellipse(at <position>)
- // where position defines centerX and centerY using a CSS <position> data type.
- auto shape = CSSBasicShapeEllipse::create();
-
- for (CSSParserValue* argument = args.current(); argument; argument = args.next()) {
- // The call to parseFillPosition below should consume all of the
- // arguments except the first three. Thus, an index greater than two
- // indicates an invalid production.
- if (args.currentIndex() > 2)
- return nullptr;
-
- if (args.currentIndex() < 2 && argument->id != CSSValueAt) {
- if (RefPtr<CSSPrimitiveValue> radius = parseShapeRadius(*argument)) {
- if (!shape->radiusX())
- shape->setRadiusX(radius.releaseNonNull());
- else
- shape->setRadiusY(radius.releaseNonNull());
- continue;
- }
-
- return nullptr;
- }
-
- if (argument->id != CSSValueAt || !args.next()) // expecting ellipse(.. at <position>)
- return nullptr;
-
- RefPtr<CSSPrimitiveValue> centerX;
- RefPtr<CSSPrimitiveValue> centerY;
- parseFillPosition(args, centerX, centerY);
- if (!centerX || !centerY || args.current())
- return nullptr;
-
- shape->setCenterX(centerX.releaseNonNull());
- shape->setCenterY(centerY.releaseNonNull());
- }
-
- return WTFMove(shape);
-}
-
-RefPtr<CSSBasicShapePolygon> CSSParser::parseBasicShapePolygon(CSSParserValueList& args)
-{
- unsigned size = args.size();
- if (!size)
- return nullptr;
-
- auto shape = CSSBasicShapePolygon::create();
-
- CSSParserValue* argument = args.current();
- if (argument->id == CSSValueEvenodd || argument->id == CSSValueNonzero) {
- shape->setWindRule(argument->id == CSSValueEvenodd ? RULE_EVENODD : RULE_NONZERO);
-
- if (!isComma(args.next()))
- return nullptr;
-
- argument = args.next();
- size -= 2;
- }
-
- // <length> <length>, ... <length> <length> -> each pair has 3 elements except the last one
- if (!size || (size % 3) - 2)
- return nullptr;
-
- CSSParserValue* argumentX = argument;
- while (argumentX) {
-
- ValueWithCalculation argumentXWithCalculation(*argumentX);
- if (!validateUnit(argumentXWithCalculation, FLength | FPercent))
- return nullptr;
- auto xLength = createPrimitiveNumericValue(argumentXWithCalculation);
-
- CSSParserValue* argumentY = args.next();
- if (!argumentY)
- return nullptr;
- ValueWithCalculation argumentYWithCalculation(*argumentY);
- if (!validateUnit(argumentYWithCalculation, FLength | FPercent))
- return nullptr;
- auto yLength = createPrimitiveNumericValue(argumentYWithCalculation);
-
- shape->appendPoint(WTFMove(xLength), WTFMove(yLength));
-
- CSSParserValue* commaOrNull = args.next();
- if (!commaOrNull)
- argumentX = nullptr;
- else if (!isComma(commaOrNull))
- return nullptr;
- else
- argumentX = args.next();
- }
-
- return WTFMove(shape);
-}
-
-RefPtr<CSSBasicShapePath> CSSParser::parseBasicShapePath(CSSParserValueList& args)
-{
- unsigned size = args.size();
- if (size != 1 && size != 3)
- return nullptr;
-
- WindRule windRule = RULE_NONZERO;
-
- CSSParserValue* argument = args.current();
- if (argument->id == CSSValueEvenodd || argument->id == CSSValueNonzero) {
- windRule = argument->id == CSSValueEvenodd ? RULE_EVENODD : RULE_NONZERO;
-
- if (!isComma(args.next()))
- return nullptr;
- argument = args.next();
- }
-
- if (argument->unit != CSSPrimitiveValue::CSS_STRING)
- return nullptr;
-
- auto byteStream = std::make_unique<SVGPathByteStream>();
- if (!buildSVGPathByteStreamFromString(argument->string, *byteStream, UnalteredParsing))
- return nullptr;
-
- auto shape = CSSBasicShapePath::create(WTFMove(byteStream));
- shape->setWindRule(windRule);
-
- args.next();
- return WTFMove(shape);
-}
-
-static bool isBoxValue(CSSValueID valueId, CSSPropertyID propId)
-{
- switch (valueId) {
- case CSSValueContentBox:
- case CSSValuePaddingBox:
- case CSSValueBorderBox:
- case CSSValueMarginBox:
- return true;
- case CSSValueFill:
- case CSSValueStroke:
- case CSSValueViewBox:
- return propId == CSSPropertyWebkitClipPath;
- default: break;
- }
-
- return false;
-}
-
-RefPtr<CSSValueList> CSSParser::parseBasicShapeAndOrBox(CSSPropertyID propId)
-{
- CSSParserValue* value = m_valueList->current();
-
- bool shapeFound = false;
- bool boxFound = false;
- CSSValueID valueId;
-
- auto list = CSSValueList::createSpaceSeparated();
- for (unsigned i = 0; i < 2; ++i) {
- if (!value)
- break;
- valueId = value->id;
- if (value->unit == CSSParserValue::Function && !shapeFound) {
- // parseBasicShape already asks for the next value list item.
- RefPtr<CSSPrimitiveValue> shapeValue = parseBasicShape();
- if (!shapeValue)
- return nullptr;
- list->append(shapeValue.releaseNonNull());
- shapeFound = true;
- } else if (isBoxValue(valueId, propId) && !boxFound) {
- RefPtr<CSSPrimitiveValue> parsedValue = CSSValuePool::singleton().createIdentifierValue(valueId);
- list->append(parsedValue.releaseNonNull());
- boxFound = true;
- m_valueList->next();
- } else
- return nullptr;
- value = m_valueList->current();
- }
-
- if (m_valueList->current())
- return nullptr;
- return WTFMove(list);
-}
-
-RefPtr<CSSValue> CSSParser::parseShapeProperty(CSSPropertyID propId)
-{
- CSSParserValue& value = *m_valueList->current();
- CSSValueID valueId = value.id;
-
- if (valueId == CSSValueNone) {
- m_valueList->next();
- return CSSValuePool::singleton().createIdentifierValue(valueId);
- }
-
- RefPtr<CSSValue> imageValue;
- if (valueId != CSSValueNone && parseFillImage(*m_valueList, imageValue)) {
- m_valueList->next();
- return imageValue;
- }
-
- return parseBasicShapeAndOrBox(propId);
-}
-
-RefPtr<CSSValue> CSSParser::parseClipPath()
-{
- CSSParserValue& value = *m_valueList->current();
- CSSValueID valueId = value.id;
-
- if (valueId == CSSValueNone) {
- m_valueList->next();
- return CSSValuePool::singleton().createIdentifierValue(valueId);
- }
- if (value.unit == CSSPrimitiveValue::CSS_URI) {
- m_valueList->next();
- return CSSPrimitiveValue::create(value.string, CSSPrimitiveValue::CSS_URI);
- }
-
- return parseBasicShapeAndOrBox(CSSPropertyWebkitClipPath);
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseBasicShape()
-{
- CSSParserValue& value = *m_valueList->current();
- ASSERT(value.unit == CSSParserValue::Function);
- CSSParserValueList* args = value.function->args.get();
-
- if (!args)
- return nullptr;
-
- RefPtr<CSSBasicShape> shape;
- if (equalLettersIgnoringASCIICase(value.function->name, "circle("))
- shape = parseBasicShapeCircle(*args);
- else if (equalLettersIgnoringASCIICase(value.function->name, "ellipse("))
- shape = parseBasicShapeEllipse(*args);
- else if (equalLettersIgnoringASCIICase(value.function->name, "polygon("))
- shape = parseBasicShapePolygon(*args);
- else if (equalLettersIgnoringASCIICase(value.function->name, "path("))
- shape = parseBasicShapePath(*args);
- else if (equalLettersIgnoringASCIICase(value.function->name, "inset("))
- shape = parseBasicShapeInset(*args);
-
- if (!shape)
- return nullptr;
-
- m_valueList->next();
- return CSSValuePool::singleton().createValue(shape.releaseNonNull());
-}
-
-// [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]? 'font-family'
-bool CSSParser::parseFont(bool important)
-{
- // Let's check if there is an inherit or initial somewhere in the shorthand.
- for (unsigned i = 0; i < m_valueList->size(); ++i) {
- if (m_valueList->valueAt(i)->id == CSSValueInherit || m_valueList->valueAt(i)->id == CSSValueInitial)
- return false;
- }
-
- ShorthandScope scope(this, CSSPropertyFont);
- // Optional font-style, font-variant and font-weight.
- bool fontStyleParsed = false;
- bool fontVariantParsed = false;
- bool fontWeightParsed = false;
- CSSParserValue* value;
- while ((value = m_valueList->current())) {
- if (!fontStyleParsed && isValidKeywordPropertyAndValue(CSSPropertyFontStyle, value->id, m_context, m_styleSheet)) {
- addProperty(CSSPropertyFontStyle, CSSValuePool::singleton().createIdentifierValue(value->id), important);
- fontStyleParsed = true;
- } else if (!fontVariantParsed && (value->id == CSSValueNormal || value->id == CSSValueSmallCaps)) {
- // Font variant in the shorthand is particular, it only accepts normal or small-caps.
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(value->id), important);
- fontVariantParsed = true;
- } else if (!fontWeightParsed && parseFontWeight(important))
- fontWeightParsed = true;
- else
- break;
- m_valueList->next();
- }
-
- if (!value)
- return false;
-
- if (!fontStyleParsed)
- addProperty(CSSPropertyFontStyle, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
- if (!fontVariantParsed)
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
- if (!fontWeightParsed)
- addProperty(CSSPropertyFontWeight, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
-
- // Now a font size _must_ come.
- // <absolute-size> | <relative-size> | <length> | <percentage> | inherit
- if (!parseFontSize(important))
- return false;
-
- value = m_valueList->current();
- if (!value)
- return false;
-
- if (isForwardSlashOperator(*value)) {
- // The line-height property.
- value = m_valueList->next();
- if (!value)
- return false;
- if (!parseLineHeight(important))
- return false;
- } else
- addProperty(CSSPropertyLineHeight, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important, true);
-
- // Font family must come now.
- RefPtr<CSSValue> parsedFamilyValue = parseFontFamily();
- if (!parsedFamilyValue)
- return false;
-
- addProperty(CSSPropertyFontFamily, parsedFamilyValue.releaseNonNull(), important);
-
- // FIXME: http://www.w3.org/TR/2011/WD-css3-fonts-20110324/#font-prop requires that
- // "font-stretch", "font-size-adjust", and "font-kerning" be reset to their initial values
- // but we don't seem to support them at the moment. They should also be added here once implemented.
- if (m_valueList->current())
- return false;
-
- return true;
-}
-
-void CSSParser::parseSystemFont(bool important)
-{
- ASSERT(m_valueList->size() == 1);
- CSSValueID systemFontID = m_valueList->valueAt(0)->id;
- ASSERT(systemFontID >= CSSValueCaption && systemFontID <= CSSValueStatusBar);
- m_valueList->next();
-
- FontCascadeDescription fontDescription;
- RenderTheme::defaultTheme()->systemFont(systemFontID, fontDescription);
- if (!fontDescription.isAbsoluteSize())
- return;
-
- // We must set font's constituent properties, even for system fonts, so the cascade functions correctly.
- ShorthandScope scope(this, CSSPropertyFont);
- addProperty(CSSPropertyFontStyle, CSSValuePool::singleton().createIdentifierValue(fontDescription.italic() == FontItalicOn ? CSSValueItalic : CSSValueNormal), important);
- addProperty(CSSPropertyFontWeight, CSSValuePool::singleton().createValue(fontDescription.weight()), important);
- addProperty(CSSPropertyFontSize, CSSValuePool::singleton().createValue(fontDescription.specifiedSize(), CSSPrimitiveValue::CSS_PX), important);
- Ref<CSSValueList> fontFamilyList = CSSValueList::createCommaSeparated();
- fontFamilyList->append(CSSValuePool::singleton().createFontFamilyValue(fontDescription.familyAt(0), FromSystemFontID::Yes));
- addProperty(CSSPropertyFontFamily, WTFMove(fontFamilyList), important);
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
- addProperty(CSSPropertyLineHeight, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
-}
-
-class FontFamilyValueBuilder {
-public:
- FontFamilyValueBuilder(CSSValueList& list)
- : m_list(list)
- {
- }
-
- void add(const CSSParserString& string)
- {
- if (!m_builder.isEmpty())
- m_builder.append(' ');
-
- if (string.is8Bit()) {
- m_builder.append(string.characters8(), string.length());
- return;
- }
-
- m_builder.append(string.characters16(), string.length());
- }
-
- void commit()
- {
- if (m_builder.isEmpty())
- return;
- m_list.append(CSSValuePool::singleton().createFontFamilyValue(m_builder.toString()));
- m_builder.clear();
- }
-
-private:
- StringBuilder m_builder;
- CSSValueList& m_list;
-};
-
-static bool valueIsCSSKeyword(const CSSParserValue& value)
-{
- // FIXME: when we add "unset", we should handle it here.
- return value.id == CSSValueInitial || value.id == CSSValueInherit || value.id == CSSValueDefault;
-}
-
-RefPtr<CSSValueList> CSSParser::parseFontFamily()
-{
- auto list = CSSValueList::createCommaSeparated();
- CSSParserValue* value = m_valueList->current();
-
- FontFamilyValueBuilder familyBuilder(list);
- bool inFamily = false;
-
- while (value) {
- CSSParserValue* nextValue = m_valueList->next();
- bool nextValBreaksFont = !nextValue ||
- (nextValue->unit == CSSParserValue::Operator && nextValue->iValue == ',');
- bool nextValIsFontName = nextValue &&
- ((nextValue->id >= CSSValueSerif && nextValue->id <= CSSValueWebkitBody) ||
- (nextValue->unit == CSSPrimitiveValue::CSS_STRING || nextValue->unit == CSSPrimitiveValue::CSS_IDENT));
-
- bool valueIsKeyword = valueIsCSSKeyword(*value);
- if (valueIsKeyword && !inFamily) {
- if (nextValBreaksFont)
- value = m_valueList->next();
- else if (nextValIsFontName)
- value = nextValue;
- continue;
- }
-
- if (value->id >= CSSValueSerif && value->id <= CSSValueWebkitBody) {
- if (inFamily)
- familyBuilder.add(value->string);
- else if (nextValBreaksFont || !nextValIsFontName)
- list->append(CSSValuePool::singleton().createIdentifierValue(value->id));
- else {
- familyBuilder.commit();
- familyBuilder.add(value->string);
- inFamily = true;
- }
- } else if (value->unit == CSSPrimitiveValue::CSS_STRING) {
- // Strings never share in a family name.
- inFamily = false;
- familyBuilder.commit();
- list->append(CSSValuePool::singleton().createFontFamilyValue(value->string));
- } else if (value->unit == CSSPrimitiveValue::CSS_IDENT) {
- if (inFamily)
- familyBuilder.add(value->string);
- else if (nextValBreaksFont || !nextValIsFontName)
- list->append(CSSValuePool::singleton().createFontFamilyValue(value->string));
- else {
- familyBuilder.commit();
- familyBuilder.add(value->string);
- inFamily = true;
- }
- } else {
- break;
- }
-
- if (!nextValue)
- break;
-
- if (nextValBreaksFont) {
- value = m_valueList->next();
- familyBuilder.commit();
- inFamily = false;
- }
- else if (nextValIsFontName)
- value = nextValue;
- else
- break;
- }
- familyBuilder.commit();
-
- if (!list->length())
- return nullptr;
- return WTFMove(list);
-}
-
-bool CSSParser::parseLineHeight(bool important)
-{
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- CSSValueID id = valueWithCalculation.value().id;
- bool validPrimitive = false;
- // normal | <number> | <length> | <percentage> | inherit
- if (id == CSSValueNormal)
- validPrimitive = true;
- else
- validPrimitive = (!id && validateUnit(valueWithCalculation, FNumber | FLength | FPercent | FNonNeg));
- if (validPrimitive && (!m_valueList->next() || inShorthand()))
- addProperty(CSSPropertyLineHeight, parseValidPrimitive(id, valueWithCalculation), important);
- return validPrimitive;
-}
-
-bool CSSParser::parseFontSize(bool important)
-{
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- CSSValueID id = valueWithCalculation.value().id;
- bool validPrimitive = false;
- // <absolute-size> | <relative-size> | <length> | <percentage> | inherit
- if (id >= CSSValueXxSmall && id <= CSSValueLarger)
- validPrimitive = true;
- else
- validPrimitive = validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg);
- if (validPrimitive && (!m_valueList->next() || inShorthand()))
- addProperty(CSSPropertyFontSize, parseValidPrimitive(id, valueWithCalculation), important);
- return validPrimitive;
-}
-
-static CSSValueID createFontWeightValueKeyword(int weight)
-{
- ASSERT(!(weight % 100) && weight >= 100 && weight <= 900);
- CSSValueID value = static_cast<CSSValueID>(CSSValue100 + weight / 100 - 1);
- ASSERT(value >= CSSValue100 && value <= CSSValue900);
- return value;
-}
-
-bool CSSParser::parseFontWeight(bool important)
-{
- CSSParserValue& value = *m_valueList->current();
- if ((value.id >= CSSValueNormal) && (value.id <= CSSValue900)) {
- addProperty(CSSPropertyFontWeight, CSSValuePool::singleton().createIdentifierValue(value.id), important);
- return true;
- }
- ValueWithCalculation valueWithCalculation(value);
- if (validateUnit(valueWithCalculation, FInteger | FNonNeg, HTMLQuirksMode)) {
- int weight = static_cast<int>(parsedDouble(valueWithCalculation));
- if (!(weight % 100) && weight >= 100 && weight <= 900) {
- addProperty(CSSPropertyFontWeight, CSSValuePool::singleton().createIdentifierValue(createFontWeightValueKeyword(weight)), important);
- return true;
- }
- }
- return false;
-}
-
-bool CSSParser::parseFontSynthesis(bool important)
-{
- CSSParserValue* value = m_valueList->current();
- if (value && value->id == CSSValueNone) {
- addProperty(CSSPropertyFontSynthesis, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- m_valueList->next();
- return true;
- }
-
- RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
-
- do {
- switch (value->id) {
- case CSSValueWeight:
- case CSSValueStyle: {
- auto singleValue = CSSValuePool::singleton().createIdentifierValue(value->id);
- if (list->hasValue(singleValue.ptr()))
- return false;
- list->append(WTFMove(singleValue));
- break;
- }
- default:
- return false;
- }
- } while ((value = m_valueList->next()));
-
- if (!list->length())
- return false;
-
- addProperty(CSSPropertyFontSynthesis, list.releaseNonNull(), important);
- m_valueList->next();
- return true;
-
-}
-
-bool CSSParser::parseFontFaceSrcURI(CSSValueList& valueList)
-{
- auto uriValue = CSSFontFaceSrcValue::create(completeURL(m_valueList->current()->string));
-
- CSSParserValue* value = m_valueList->next();
- if (!value) {
- valueList.append(WTFMove(uriValue));
- return true;
- }
- if (value->unit == CSSParserValue::Operator && value->iValue == ',') {
- m_valueList->next();
- valueList.append(WTFMove(uriValue));
- return true;
- }
-
- if (value->unit != CSSParserValue::Function || !equalLettersIgnoringASCIICase(value->function->name, "format("))
- return false;
-
- // FIXME: http://www.w3.org/TR/2011/WD-css3-fonts-20111004/ says that format() contains a comma-separated list of strings,
- // but CSSFontFaceSrcValue stores only one format. Allowing one format for now.
- CSSParserValueList* args = value->function->args.get();
- if (!args || args->size() != 1 || (args->current()->unit != CSSPrimitiveValue::CSS_STRING && args->current()->unit != CSSPrimitiveValue::CSS_IDENT))
- return false;
- uriValue->setFormat(args->current()->string);
- valueList.append(WTFMove(uriValue));
- value = m_valueList->next();
- if (value && value->unit == CSSParserValue::Operator && value->iValue == ',')
- m_valueList->next();
- return true;
-}
-
-bool CSSParser::parseFontFaceSrcLocal(CSSValueList& valueList)
-{
- CSSParserValueList* args = m_valueList->current()->function->args.get();
- if (!args || !args->size())
- return false;
-
- if (args->size() == 1 && args->current()->unit == CSSPrimitiveValue::CSS_STRING)
- valueList.append(CSSFontFaceSrcValue::createLocal(args->current()->string));
- else if (args->current()->unit == CSSPrimitiveValue::CSS_IDENT) {
- StringBuilder builder;
- for (CSSParserValue* localValue = args->current(); localValue; localValue = args->next()) {
- if (localValue->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
- if (!builder.isEmpty())
- builder.append(' ');
- builder.append(localValue->string.toStringView());
- }
- valueList.append(CSSFontFaceSrcValue::createLocal(builder.toString()));
- } else
- return false;
-
- if (CSSParserValue* value = m_valueList->next()) {
- if (value->unit == CSSParserValue::Operator && value->iValue == ',')
- m_valueList->next();
- }
- return true;
-}
-
-bool CSSParser::parseFontFaceSrc()
-{
- auto values = CSSValueList::createCommaSeparated();
-
- while (CSSParserValue* value = m_valueList->current()) {
- if (value->unit == CSSPrimitiveValue::CSS_URI) {
- if (!parseFontFaceSrcURI(values))
- return false;
- } else if (value->unit == CSSParserValue::Function && equalLettersIgnoringASCIICase(value->function->name, "local(")) {
- if (!parseFontFaceSrcLocal(values))
- return false;
- } else
- return false;
- }
- if (!values->length())
- return false;
-
- addProperty(CSSPropertySrc, WTFMove(values), m_important);
- m_valueList->next();
- return true;
-}
-
-bool CSSParser::parseFontFaceUnicodeRange()
-{
- auto values = CSSValueList::createCommaSeparated();
- bool failed = false;
- bool operatorExpected = false;
- for (; m_valueList->current(); m_valueList->next(), operatorExpected = !operatorExpected) {
- if (operatorExpected) {
- if (m_valueList->current()->unit == CSSParserValue::Operator && m_valueList->current()->iValue == ',')
- continue;
- failed = true;
- break;
- }
- if (m_valueList->current()->unit != CSSPrimitiveValue::CSS_UNICODE_RANGE) {
- failed = true;
- break;
- }
-
- String rangeString = m_valueList->current()->string;
- UChar32 from = 0;
- UChar32 to = 0;
- unsigned length = rangeString.length();
-
- if (length < 3) {
- failed = true;
- break;
- }
-
- unsigned i = 2;
- while (i < length) {
- UChar c = rangeString[i];
- if (c == '-' || c == '?')
- break;
- from *= 16;
- if (isASCIIHexDigit(c))
- from += toASCIIHexValue(c);
- else {
- failed = true;
- break;
- }
- i++;
- }
- if (failed)
- break;
-
- if (i == length)
- to = from;
- else if (rangeString[i] == '?') {
- unsigned span = 1;
- while (i < length && rangeString[i] == '?') {
- span *= 16;
- from *= 16;
- i++;
- }
- if (i < length)
- failed = true;
- to = from + span - 1;
- } else {
- if (length < i + 2) {
- failed = true;
- break;
- }
- i++;
- while (i < length) {
- UChar c = rangeString[i];
- to *= 16;
- if (isASCIIHexDigit(c))
- to += toASCIIHexValue(c);
- else {
- failed = true;
- break;
- }
- i++;
- }
- if (failed)
- break;
- }
- if (from <= to)
- values->append(CSSUnicodeRangeValue::create(from, to));
- }
- if (failed || !values->length())
- return false;
- addProperty(CSSPropertyUnicodeRange, WTFMove(values), m_important);
- return true;
-}
-
-// Returns the number of characters which form a valid double
-// and are terminated by the given terminator character
-template <typename CharacterType>
-static int checkForValidDouble(const CharacterType* string, const CharacterType* end, const char terminator)
-{
- int length = end - string;
- if (length < 1)
- return 0;
-
- bool decimalMarkSeen = false;
- int processedLength = 0;
-
- for (int i = 0; i < length; ++i) {
- if (string[i] == terminator) {
- processedLength = i;
- break;
- }
- if (!isASCIIDigit(string[i])) {
- if (!decimalMarkSeen && string[i] == '.')
- decimalMarkSeen = true;
- else
- return 0;
- }
- }
-
- if (decimalMarkSeen && processedLength == 1)
- return 0;
-
- return processedLength;
-}
-
-// Returns the number of characters consumed for parsing a valid double
-// terminated by the given terminator character
-template <typename CharacterType>
-static int parseDouble(const CharacterType* string, const CharacterType* end, const char terminator, double& value)
-{
- int length = checkForValidDouble(string, end, terminator);
- if (!length)
- return 0;
-
- int position = 0;
- double localValue = 0;
-
- // The consumed characters here are guaranteed to be
- // ASCII digits with or without a decimal mark
- for (; position < length; ++position) {
- if (string[position] == '.')
- break;
- localValue = localValue * 10 + string[position] - '0';
- }
-
- if (++position == length) {
- value = localValue;
- return length;
- }
-
- double fraction = 0;
- double scale = 1;
-
- while (position < length && scale < MAX_SCALE) {
- fraction = fraction * 10 + string[position++] - '0';
- scale *= 10;
- }
-
- value = localValue + fraction / scale;
- return length;
-}
-
-template <typename CharacterType>
-static bool parseColorIntOrPercentage(const CharacterType*& string, const CharacterType* end, const char terminator, CSSPrimitiveValue::UnitTypes& expect, int& value)
-{
- const CharacterType* current = string;
- double localValue = 0;
- bool negative = false;
- while (current != end && isHTMLSpace(*current))
- current++;
- if (current != end && *current == '-') {
- negative = true;
- current++;
- }
- if (current == end || !isASCIIDigit(*current))
- return false;
- while (current != end && isASCIIDigit(*current)) {
- double newValue = localValue * 10 + *current++ - '0';
- if (newValue >= 255) {
- // Clamp values at 255.
- localValue = 255;
- while (current != end && isASCIIDigit(*current))
- ++current;
- break;
- }
- localValue = newValue;
- }
-
- if (current == end)
- return false;
-
- if (expect == CSSPrimitiveValue::CSS_NUMBER && (*current == '.' || *current == '%'))
- return false;
-
- if (*current == '.') {
- // We already parsed the integral part, try to parse
- // the fraction part of the percentage value.
- double percentage = 0;
- int numCharactersParsed = parseDouble(current, end, '%', percentage);
- if (!numCharactersParsed)
- return false;
- current += numCharactersParsed;
- if (*current != '%')
- return false;
- localValue += percentage;
- }
-
- if (expect == CSSPrimitiveValue::CSS_PERCENTAGE && *current != '%')
- return false;
-
- if (*current == '%') {
- expect = CSSPrimitiveValue::CSS_PERCENTAGE;
- localValue = localValue / 100.0 * 256.0;
- // Clamp values at 255 for percentages over 100%
- if (localValue > 255)
- localValue = 255;
- current++;
- } else
- expect = CSSPrimitiveValue::CSS_NUMBER;
-
- while (current != end && isHTMLSpace(*current))
- current++;
- if (current == end || *current++ != terminator)
- return false;
- // Clamp negative values at zero.
- value = negative ? 0 : static_cast<int>(localValue);
- string = current;
- return true;
-}
-
-template <typename CharacterType>
-static inline bool isTenthAlpha(const CharacterType* string, const int length)
-{
- // "0.X"
- if (length == 3 && string[0] == '0' && string[1] == '.' && isASCIIDigit(string[2]))
- return true;
-
- // ".X"
- if (length == 2 && string[0] == '.' && isASCIIDigit(string[1]))
- return true;
-
- return false;
-}
-
-template <typename CharacterType>
-static inline bool parseAlphaValue(const CharacterType*& string, const CharacterType* end, const char terminator, int& value)
-{
- while (string != end && isHTMLSpace(*string))
- ++string;
-
- bool negative = false;
-
- if (string != end && *string == '-') {
- negative = true;
- ++string;
- }
-
- value = 0;
-
- int length = end - string;
- if (length < 2)
- return false;
-
- if (string[length - 1] != terminator || !isASCIIDigit(string[length - 2]))
- return false;
-
- if (string[0] != '0' && string[0] != '1' && string[0] != '.') {
- if (checkForValidDouble(string, end, terminator)) {
- value = negative ? 0 : 255;
- string = end;
- return true;
- }
- return false;
- }
-
- if (length == 2 && string[0] != '.') {
- value = !negative && string[0] == '1' ? 255 : 0;
- string = end;
- return true;
- }
-
- if (isTenthAlpha(string, length - 1)) {
- static const int tenthAlphaValues[] = { 0, 25, 51, 76, 102, 127, 153, 179, 204, 230 };
- value = negative ? 0 : tenthAlphaValues[string[length - 2] - '0'];
- string = end;
- return true;
- }
-
- double alpha = 0;
- if (!parseDouble(string, end, terminator, alpha))
- return false;
- value = negative ? 0 : static_cast<int>(alpha * nextafter(256.0, 0.0));
- string = end;
- return true;
-}
-
-template <typename CharacterType>
-static inline bool mightBeRGBA(const CharacterType* characters, unsigned length)
-{
- if (length < 5)
- return false;
- return characters[4] == '('
- && isASCIIAlphaCaselessEqual(characters[0], 'r')
- && isASCIIAlphaCaselessEqual(characters[1], 'g')
- && isASCIIAlphaCaselessEqual(characters[2], 'b')
- && isASCIIAlphaCaselessEqual(characters[3], 'a');
-}
-
-template <typename CharacterType>
-static inline bool mightBeRGB(const CharacterType* characters, unsigned length)
-{
- if (length < 4)
- return false;
- return characters[3] == '('
- && isASCIIAlphaCaselessEqual(characters[0], 'r')
- && isASCIIAlphaCaselessEqual(characters[1], 'g')
- && isASCIIAlphaCaselessEqual(characters[2], 'b');
-}
-
-template <typename CharacterType>
-static inline Color fastParseColorInternal(const CharacterType* characters, unsigned length , bool strict)
-{
- CSSPrimitiveValue::UnitTypes expect = CSSPrimitiveValue::CSS_UNKNOWN;
-
- if (!strict && length >= 3) {
- RGBA32 rgb;
- if (characters[0] == '#') {
- if (Color::parseHexColor(characters + 1, length - 1, rgb))
- return Color(rgb);
- } else {
- if (Color::parseHexColor(characters, length, rgb))
- return Color(rgb);
- }
- }
-
- // Try rgba() syntax.
- if (mightBeRGBA(characters, length)) {
- const CharacterType* current = characters + 5;
- const CharacterType* end = characters + length;
- int red;
- int green;
- int blue;
- int alpha;
-
- if (!parseColorIntOrPercentage(current, end, ',', expect, red))
- return Color();
- if (!parseColorIntOrPercentage(current, end, ',', expect, green))
- return Color();
- if (!parseColorIntOrPercentage(current, end, ',', expect, blue))
- return Color();
- if (!parseAlphaValue(current, end, ')', alpha))
- return Color();
- if (current != end)
- return Color();
- return Color(makeRGBA(red, green, blue, alpha));
- }
-
- // Try rgb() syntax.
- if (mightBeRGB(characters, length)) {
- const CharacterType* current = characters + 4;
- const CharacterType* end = characters + length;
- int red;
- int green;
- int blue;
- if (!parseColorIntOrPercentage(current, end, ',', expect, red))
- return Color();
- if (!parseColorIntOrPercentage(current, end, ',', expect, green))
- return Color();
- if (!parseColorIntOrPercentage(current, end, ')', expect, blue))
- return Color();
- if (current != end)
- return Color();
- return Color(makeRGB(red, green, blue));
- }
-
- return Color();
-}
-
-template<typename StringType>
-Color CSSParser::fastParseColor(const StringType& name, bool strict)
-{
- unsigned length = name.length();
-
- if (!length)
- return Color();
-
- Color color;
- if (name.is8Bit())
- color = fastParseColorInternal(name.characters8(), length, strict);
- else
- color = fastParseColorInternal(name.characters16(), length, strict);
-
- if (color.isValid())
- return color;
-
- // Try named colors.
- return Color { name };
-}
-
-inline double CSSParser::parsedDouble(ValueWithCalculation& valueWithCalculation)
-{
- return valueWithCalculation.calculation() ? valueWithCalculation.calculation()->doubleValue() : valueWithCalculation.value().fValue;
-}
-
-bool CSSParser::isCalculation(CSSParserValue& value)
-{
- return value.unit == CSSParserValue::Function
- && (equalLettersIgnoringASCIICase(value.function->name, "calc(")
- || equalLettersIgnoringASCIICase(value.function->name, "-webkit-calc("));
-}
-
-static bool isPercent(const CSSParser::ValueWithCalculation& valueWithCalculation)
-{
- if (valueWithCalculation.calculation())
- return valueWithCalculation.calculation()->category() == CalcPercent;
-
- return valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_PERCENTAGE;
-}
-
-inline int CSSParser::parseColorInt(ValueWithCalculation& valueWithCalculation)
-{
- double doubleValue = parsedDouble(valueWithCalculation);
-
- if (doubleValue <= 0.0)
- return 0;
-
- if (isPercent(valueWithCalculation)) {
- if (doubleValue >= 100.0)
- return 255;
- return static_cast<int>(doubleValue * 256.0 / 100.0);
- }
-
- if (doubleValue >= 255.0)
- return 255;
-
- return static_cast<int>(doubleValue);
-}
-
-inline double CSSParser::parseColorDouble(ValueWithCalculation& valueWithCalculation)
-{
- double doubleValue = parsedDouble(valueWithCalculation);
-
- if (isPercent(valueWithCalculation))
- return doubleValue / 100.0;
-
- return doubleValue;
-}
-
-bool CSSParser::parseRGBParameters(CSSParserValue& value, int* colorArray, bool parseAlpha)
-{
- CSSParserValueList* args = value.function->args.get();
- ValueWithCalculation firstArgumentWithCalculation(*args->current());
- Units unitType = FUnknown;
- // Get the first value and its type
- if (validateUnit(firstArgumentWithCalculation, FInteger, HTMLStandardMode))
- unitType = FInteger;
- else if (validateUnit(firstArgumentWithCalculation, FPercent, HTMLStandardMode))
- unitType = FPercent;
- else
- return false;
-
- colorArray[0] = parseColorInt(firstArgumentWithCalculation);
- for (int i = 1; i < 3; i++) {
- CSSParserValue& operatorArgument = *args->next();
- if (operatorArgument.unit != CSSParserValue::Operator && operatorArgument.iValue != ',')
- return false;
- ValueWithCalculation argumentWithCalculation(*args->next());
- if (!validateUnit(argumentWithCalculation, unitType, HTMLStandardMode))
- return false;
- colorArray[i] = parseColorInt(argumentWithCalculation);
- }
- if (parseAlpha) {
- CSSParserValue& operatorArgument = *args->next();
- if (operatorArgument.unit != CSSParserValue::Operator && operatorArgument.iValue != ',')
- return false;
- ValueWithCalculation argumentWithCalculation(*args->next());
- if (!validateUnit(argumentWithCalculation, FNumber, HTMLStandardMode))
- return false;
- double doubleValue = parsedDouble(argumentWithCalculation);
- // Convert the floating pointer number of alpha to an integer in the range [0, 256),
- // with an equal distribution across all 256 values.
- colorArray[3] = static_cast<int>(std::max(0.0, std::min(1.0, doubleValue)) * nextafter(256.0, 0.0));
- }
- return true;
-}
-
-std::optional<std::pair<std::array<double, 4>, ColorSpace>> CSSParser::parseColorFunctionParameters(CSSParserValue& value)
-{
- CSSParserValueList* args = value.function->args.get();
- if (!args->size())
- return std::nullopt;
-
- ColorSpace colorSpace;
- switch (args->current()->id) {
- case CSSValueSrgb:
- colorSpace = ColorSpaceSRGB;
- break;
- case CSSValueDisplayP3:
- colorSpace = ColorSpaceDisplayP3;
- break;
- default:
- return std::nullopt;
- }
-
- std::array<double, 4> colorValues = { { 0, 0, 0, 1 } };
-
- for (int i = 0; i < 3; ++i) {
- auto valueOrNull = args->next();
- if (valueOrNull) {
- ValueWithCalculation argumentWithCalculation(*valueOrNull);
- if (!validateUnit(argumentWithCalculation, FNumber))
- return std::nullopt;
- colorValues[i] = std::max(0.0, std::min(1.0, parsedDouble(argumentWithCalculation)));
- }
- }
-
- auto slashOrNull = args->next();
- if (!slashOrNull)
- return { { colorValues, colorSpace } };
-
- if (!isForwardSlashOperator(*slashOrNull))
- return std::nullopt;
-
- // Handle alpha.
-
- ValueWithCalculation argumentWithCalculation(*args->next());
- if (!validateUnit(argumentWithCalculation, FNumber | FPercent))
- return std::nullopt;
- colorValues[3] = std::max(0.0, std::min(1.0, parseColorDouble(argumentWithCalculation)));
-
- // FIXME: Support the comma-separated list of fallback color values.
- // If there is another argument, it should be a comma.
-
- auto commaOrNull = args->next();
- if (commaOrNull && !isComma(commaOrNull))
- return std::nullopt;
-
- return { { colorValues, colorSpace } };
-}
-
-// The CSS3 specification defines the format of a HSL color as
-// hsl(<number>, <percent>, <percent>)
-// and with alpha, the format is
-// hsla(<number>, <percent>, <percent>, <number>)
-// The first value, HUE, is in an angle with a value between 0 and 360
-bool CSSParser::parseHSLParameters(CSSParserValue& value, double* colorArray, bool parseAlpha)
-{
- CSSParserValueList* args = value.function->args.get();
- ValueWithCalculation firstArgumentWithCalculation(*args->current());
- // Get the first value
- if (!validateUnit(firstArgumentWithCalculation, FNumber, HTMLStandardMode))
- return false;
- // normalize the Hue value and change it to be between 0 and 1.0
- colorArray[0] = (((static_cast<int>(parsedDouble(firstArgumentWithCalculation)) % 360) + 360) % 360) / 360.0;
- for (int i = 1; i < 3; ++i) {
- CSSParserValue& operatorArgument = *args->next();
- if (operatorArgument.unit != CSSParserValue::Operator && operatorArgument.iValue != ',')
- return false;
- ValueWithCalculation argumentWithCalculation(*args->next());
- if (!validateUnit(argumentWithCalculation, FPercent, HTMLStandardMode))
- return false;
- colorArray[i] = std::max(0.0, std::min(100.0, parsedDouble(argumentWithCalculation))) / 100.0; // needs to be value between 0 and 1.0
- }
- if (parseAlpha) {
- CSSParserValue& operatorArgument = *args->next();
- if (operatorArgument.unit != CSSParserValue::Operator && operatorArgument.iValue != ',')
- return false;
- ValueWithCalculation argumentWithCalculation(*args->next());
- if (!validateUnit(argumentWithCalculation, FNumber, HTMLStandardMode))
- return false;
- colorArray[3] = std::max(0.0, std::min(1.0, parsedDouble(argumentWithCalculation)));
- }
- return true;
-}
-
-RefPtr<CSSPrimitiveValue> CSSParser::parseColor(CSSParserValue* value)
-{
- Color color = parseColorFromValue(value ? *value : *m_valueList->current());
- if (!color.isValid())
- return nullptr;
- return CSSValuePool::singleton().createColorValue(color);
-}
-
-Color CSSParser::parseColorFromValue(CSSParserValue& value)
-{
- if (inQuirksMode() && value.unit == CSSPrimitiveValue::CSS_NUMBER
- && value.fValue >= 0. && value.fValue < 1000000.) {
- String str = String::format("%06d", static_cast<int>((value.fValue+.5)));
- // FIXME: This should be strict parsing for SVG as well.
- return fastParseColor(str, inStrictMode());
- } else if (value.unit == CSSPrimitiveValue::CSS_PARSER_HEXCOLOR
- || value.unit == CSSPrimitiveValue::CSS_IDENT
- || (inQuirksMode() && value.unit == CSSPrimitiveValue::CSS_DIMENSION)) {
- return fastParseColor(value.string, inStrictMode() && value.unit == CSSPrimitiveValue::CSS_IDENT);
- } else if (value.unit == CSSParserValue::Function
- && value.function->args
- && value.function->args->size() == 5 /* rgb + two commas */
- && equalLettersIgnoringASCIICase(value.function->name, "rgb(")) {
- int colorValues[3];
- if (!parseRGBParameters(value, colorValues, false))
- return Color();
- return Color(makeRGB(colorValues[0], colorValues[1], colorValues[2]));
- } else if (value.unit == CSSParserValue::Function
- && value.function->args
- && value.function->args->size() == 7 /* rgba + three commas */
- && equalLettersIgnoringASCIICase(value.function->name, "rgba(")) {
- int colorValues[4];
- if (!parseRGBParameters(value, colorValues, true))
- return Color();
- return Color(makeRGBA(colorValues[0], colorValues[1], colorValues[2], colorValues[3]));
- } else if (value.unit == CSSParserValue::Function
- && value.function->args
- && value.function->args->size() == 5 /* hsl + two commas */
- && equalLettersIgnoringASCIICase(value.function->name, "hsl(")) {
- double colorValues[3];
- if (!parseHSLParameters(value, colorValues, false))
- return Color();
- return Color(makeRGBAFromHSLA(colorValues[0], colorValues[1], colorValues[2], 1.0));
- } else if (value.unit == CSSParserValue::Function
- && value.function->args
- && value.function->args->size() == 7 /* hsla + three commas */
- && equalLettersIgnoringASCIICase(value.function->name, "hsla(")) {
- double colorValues[4];
- if (!parseHSLParameters(value, colorValues, true))
- return Color();
- return Color(makeRGBAFromHSLA(colorValues[0], colorValues[1], colorValues[2], colorValues[3]));
- } else if (value.unit == CSSParserValue::Function
- && value.function->args
- && equalLettersIgnoringASCIICase(value.function->name, "color(")) {
- std::optional<std::pair<std::array<double, 4>, ColorSpace>> colorData = parseColorFunctionParameters(value);
- if (!colorData)
- return Color();
- return Color(colorData.value().first[0], colorData.value().first[1], colorData.value().first[2], colorData.value().first[3], colorData.value().second);
- }
-
- return Color();
-}
-
-// This class tracks parsing state for shadow values. If it goes out of scope (e.g., due to an early return)
-// without the allowBreak bit being set, then it will clean up all of the objects and destroy them.
-struct ShadowParseContext {
- ShadowParseContext(CSSPropertyID prop, CSSParser& parser)
- : property(prop)
- , m_parser(parser)
- , allowX(true)
- , allowY(false)
- , allowBlur(false)
- , allowSpread(false)
- , allowColor(true)
- , allowStyle(prop == CSSPropertyWebkitBoxShadow || prop == CSSPropertyBoxShadow)
- , allowBreak(true)
- {
- }
-
- bool allowLength() { return allowX || allowY || allowBlur || allowSpread; }
-
- void commitValue()
- {
- // Handle the ,, case gracefully by doing nothing.
- if (x || y || blur || spread || color || style) {
- if (!values)
- values = CSSValueList::createCommaSeparated();
-
- // Construct the current shadow value and add it to the list.
- values->append(CSSShadowValue::create(WTFMove(x), WTFMove(y), WTFMove(blur), WTFMove(spread), WTFMove(style), WTFMove(color)));
- }
-
- // Now reset for the next shadow value.
- x = nullptr;
- y = nullptr;
- blur = nullptr;
- spread = nullptr;
- style = nullptr;
- color = nullptr;
-
- allowX = true;
- allowColor = true;
- allowBreak = true;
- allowY = false;
- allowBlur = false;
- allowSpread = false;
- allowStyle = property == CSSPropertyWebkitBoxShadow || property == CSSPropertyBoxShadow;
- }
-
- void commitLength(CSSParser::ValueWithCalculation& valueWithCalculation)
- {
- auto primitiveValue = m_parser.createPrimitiveNumericValue(valueWithCalculation);
-
- if (allowX) {
- x = WTFMove(primitiveValue);
- allowX = false;
- allowY = true;
- allowColor = false;
- allowStyle = false;
- allowBreak = false;
- } else if (allowY) {
- y = WTFMove(primitiveValue);
- allowY = false;
- allowBlur = true;
- allowColor = true;
- allowStyle = property == CSSPropertyWebkitBoxShadow || property == CSSPropertyBoxShadow;
- allowBreak = true;
- } else if (allowBlur) {
- blur = WTFMove(primitiveValue);
- allowBlur = false;
- allowSpread = property == CSSPropertyWebkitBoxShadow || property == CSSPropertyBoxShadow;
- } else if (allowSpread) {
- spread = WTFMove(primitiveValue);
- allowSpread = false;
- }
- }
-
- void commitColor(Ref<CSSPrimitiveValue>&& value)
- {
- color = WTFMove(value);
- allowColor = false;
- if (allowX) {
- allowStyle = false;
- allowBreak = false;
- } else {
- allowBlur = false;
- allowSpread = false;
- allowStyle = property == CSSPropertyWebkitBoxShadow || property == CSSPropertyBoxShadow;
- }
- }
-
- void commitStyle(CSSParserValue& value)
- {
- style = CSSValuePool::singleton().createIdentifierValue(value.id);
- allowStyle = false;
- if (allowX)
- allowBreak = false;
- else {
- allowBlur = false;
- allowSpread = false;
- allowColor = false;
- }
- }
-
- CSSPropertyID property;
- CSSParser& m_parser;
-
- RefPtr<CSSValueList> values;
- RefPtr<CSSPrimitiveValue> x;
- RefPtr<CSSPrimitiveValue> y;
- RefPtr<CSSPrimitiveValue> blur;
- RefPtr<CSSPrimitiveValue> spread;
- RefPtr<CSSPrimitiveValue> style;
- RefPtr<CSSPrimitiveValue> color;
-
- bool allowX;
- bool allowY;
- bool allowBlur;
- bool allowSpread;
- bool allowColor;
- bool allowStyle; // inset or not.
- bool allowBreak;
-};
-
-RefPtr<CSSValueList> CSSParser::parseShadow(CSSParserValueList& valueList, CSSPropertyID propId)
-{
- ShadowParseContext context(propId, *this);
- CSSParserValue* value;
- while ((value = valueList.current())) {
- ValueWithCalculation valueWithCalculation(*value);
- // Check for a comma break first.
- if (value->unit == CSSParserValue::Operator) {
- if (value->iValue != ',' || !context.allowBreak) {
- // Other operators aren't legal or we aren't done with the current shadow
- // value. Treat as invalid.
- return nullptr;
- }
- // -webkit-svg-shadow does not support multiple values.
- if (propId == CSSPropertyWebkitSvgShadow)
- return nullptr;
- // The value is good. Commit it.
- context.commitValue();
- } else if (validateUnit(valueWithCalculation, FLength, HTMLStandardMode)) {
- // We required a length and didn't get one. Invalid.
- if (!context.allowLength())
- return nullptr;
-
- // Blur radius must be non-negative.
- if (context.allowBlur && !validateUnit(valueWithCalculation, FLength | FNonNeg, HTMLStandardMode))
- return nullptr;
-
- // A length is allowed here. Construct the value and add it.
- context.commitLength(valueWithCalculation);
- } else if (value->id == CSSValueInset) {
- if (!context.allowStyle)
- return nullptr;
-
- context.commitStyle(valueWithCalculation);
- } else {
- // The only other type of value that's ok is a color value.
- RefPtr<CSSPrimitiveValue> parsedColor;
- bool isColor = (isValidSystemColorValue(value->id) || value->id == CSSValueMenu
- || (value->id >= CSSValueWebkitFocusRingColor && value->id <= CSSValueWebkitText && inQuirksMode())
- || value->id == CSSValueCurrentcolor);
- if (isColor) {
- if (!context.allowColor)
- return nullptr;
- parsedColor = CSSValuePool::singleton().createIdentifierValue(value->id);
- }
-
- if (!parsedColor)
- // It's not built-in. Try to parse it as a color.
- parsedColor = parseColor(value);
-
- if (!parsedColor || !context.allowColor)
- return nullptr; // This value is not a color or length and is invalid or
- // it is a color, but a color isn't allowed at this point.
-
- context.commitColor(parsedColor.releaseNonNull());
- }
-
- valueList.next();
- }
-
- if (context.allowBreak) {
- context.commitValue();
- if (context.values && context.values->length())
- return WTFMove(context.values);
- }
-
- return nullptr;
-}
-
-bool CSSParser::parseReflect(CSSPropertyID propId, bool important)
-{
- // box-reflect: <direction> <offset> <mask>
-
- // Direction comes first.
- CSSParserValue* value = m_valueList->current();
- RefPtr<CSSPrimitiveValue> direction;
- switch (value->id) {
- case CSSValueAbove:
- case CSSValueBelow:
- case CSSValueLeft:
- case CSSValueRight:
- direction = CSSValuePool::singleton().createIdentifierValue(value->id);
- break;
- default:
- return false;
- }
-
- // The offset comes next.
- value = m_valueList->next();
- RefPtr<CSSPrimitiveValue> offset;
- if (!value)
- offset = CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::CSS_PX);
- else {
- ValueWithCalculation valueWithCalculation(*value);
- if (!validateUnit(valueWithCalculation, FLength | FPercent))
- return false;
- offset = createPrimitiveNumericValue(valueWithCalculation);
- }
-
- // Now for the mask.
- RefPtr<CSSValue> mask;
- value = m_valueList->next();
- if (value) {
- if (!parseBorderImage(propId, mask))
- return false;
- }
-
- addProperty(propId, CSSReflectValue::create(direction.releaseNonNull(), offset.releaseNonNull(), WTFMove(mask)), important);
- m_valueList->next();
- return true;
-}
-
-bool CSSParser::parseFlex(CSSParserValueList& args, bool important)
-{
- if (!args.size() || args.size() > 3)
- return false;
- static const double unsetValue = -1;
- double flexGrow = unsetValue;
- double flexShrink = unsetValue;
- RefPtr<CSSPrimitiveValue> flexBasis;
-
- while (CSSParserValue* argument = args.current()) {
- ValueWithCalculation argumentWithCalculation(*argument);
- if (validateUnit(argumentWithCalculation, FNumber | FNonNeg)) {
- if (flexGrow == unsetValue)
- flexGrow = parsedDouble(argumentWithCalculation);
- else if (flexShrink == unsetValue)
- flexShrink = parsedDouble(argumentWithCalculation);
- else if (!parsedDouble(argumentWithCalculation)) {
- // flex only allows a basis of 0 (sans units) if flex-grow and flex-shrink values have already been set.
- flexBasis = CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::CSS_PX);
- } else {
- // We only allow 3 numbers without units if the last value is 0. E.g., flex:1 1 1 is invalid.
- return false;
- }
- } else if (!flexBasis && (argumentWithCalculation.value().id == CSSValueAuto || validateUnit(argumentWithCalculation, FLength | FPercent | FNonNeg)))
- flexBasis = parseValidPrimitive(argumentWithCalculation.value().id, argumentWithCalculation);
- else {
- // Not a valid arg for flex.
- return false;
- }
- args.next();
- }
-
- if (flexGrow == unsetValue)
- flexGrow = 1;
- if (flexShrink == unsetValue)
- flexShrink = 1;
- if (!flexBasis)
- flexBasis = CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::CSS_PX);
-
- addProperty(CSSPropertyFlexGrow, CSSValuePool::singleton().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important);
- addProperty(CSSPropertyFlexShrink, CSSValuePool::singleton().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important);
- addProperty(CSSPropertyFlexBasis, flexBasis.releaseNonNull(), important);
- return true;
-}
-
-struct BorderImageParseContext {
- BorderImageParseContext()
- : m_canAdvance(false)
- , m_allowCommit(true)
- , m_allowImage(true)
- , m_allowImageSlice(true)
- , m_allowRepeat(true)
- , m_allowForwardSlashOperator(false)
- , m_requireWidth(false)
- , m_requireOutset(false)
- {}
-
- bool canAdvance() const { return m_canAdvance; }
- void setCanAdvance(bool canAdvance) { m_canAdvance = canAdvance; }
-
- bool allowCommit() const { return m_allowCommit; }
- bool allowImage() const { return m_allowImage; }
- bool allowImageSlice() const { return m_allowImageSlice; }
- bool allowRepeat() const { return m_allowRepeat; }
- bool allowForwardSlashOperator() const { return m_allowForwardSlashOperator; }
-
- bool requireWidth() const { return m_requireWidth; }
- bool requireOutset() const { return m_requireOutset; }
-
- void commitImage(RefPtr<CSSValue>&& image)
- {
- m_image = WTFMove(image);
- m_canAdvance = true;
- m_allowCommit = true;
- m_allowImage = m_allowForwardSlashOperator = m_requireWidth = m_requireOutset = false;
- m_allowImageSlice = !m_imageSlice;
- m_allowRepeat = !m_repeat;
- }
- void commitImageSlice(RefPtr<CSSBorderImageSliceValue>&& slice)
- {
- m_imageSlice = WTFMove(slice);
- m_canAdvance = true;
- m_allowCommit = m_allowForwardSlashOperator = true;
- m_allowImageSlice = m_requireWidth = m_requireOutset = false;
- m_allowImage = !m_image;
- m_allowRepeat = !m_repeat;
- }
- void commitForwardSlashOperator()
- {
- m_canAdvance = true;
- m_allowCommit = m_allowImage = m_allowImageSlice = m_allowRepeat = m_allowForwardSlashOperator = false;
- if (!m_borderSlice) {
- m_requireWidth = true;
- m_requireOutset = false;
- } else {
- m_requireOutset = true;
- m_requireWidth = false;
- }
- }
- void commitBorderWidth(RefPtr<CSSPrimitiveValue>&& slice)
- {
- m_borderSlice = WTFMove(slice);
- m_canAdvance = true;
- m_allowCommit = m_allowForwardSlashOperator = true;
- m_allowImageSlice = m_requireWidth = m_requireOutset = false;
- m_allowImage = !m_image;
- m_allowRepeat = !m_repeat;
- }
- void commitBorderOutset(RefPtr<CSSPrimitiveValue>&& outset)
- {
- m_outset = WTFMove(outset);
- m_canAdvance = true;
- m_allowCommit = true;
- m_allowImageSlice = m_allowForwardSlashOperator = m_requireWidth = m_requireOutset = false;
- m_allowImage = !m_image;
- m_allowRepeat = !m_repeat;
- }
- void commitRepeat(RefPtr<CSSValue>&& repeat)
- {
- m_repeat = WTFMove(repeat);
- m_canAdvance = true;
- m_allowCommit = true;
- m_allowRepeat = m_allowForwardSlashOperator = m_requireWidth = m_requireOutset = false;
- m_allowImageSlice = !m_imageSlice;
- m_allowImage = !m_image;
- }
-
- Ref<CSSValue> commitWebKitBorderImage()
- {
- return createBorderImageValue(m_image.copyRef(), m_imageSlice.copyRef(), m_borderSlice.copyRef(), m_outset.copyRef(), m_repeat.copyRef());
- }
-
- void commitBorderImage(CSSParser& parser, bool important)
- {
- commitBorderImageProperty(CSSPropertyBorderImageSource, parser, WTFMove(m_image), important);
- commitBorderImageProperty(CSSPropertyBorderImageSlice, parser, m_imageSlice, important);
- commitBorderImageProperty(CSSPropertyBorderImageWidth, parser, m_borderSlice, important);
- commitBorderImageProperty(CSSPropertyBorderImageOutset, parser, m_outset, important);
- commitBorderImageProperty(CSSPropertyBorderImageRepeat, parser, WTFMove(m_repeat), important);
- }
-
- void commitBorderImageProperty(CSSPropertyID propId, CSSParser& parser, RefPtr<CSSValue>&& value, bool important)
- {
- if (value)
- parser.addProperty(propId, value.releaseNonNull(), important);
- else
- parser.addProperty(propId, CSSValuePool::singleton().createImplicitInitialValue(), important, true);
- }
-
- bool m_canAdvance;
-
- bool m_allowCommit;
- bool m_allowImage;
- bool m_allowImageSlice;
- bool m_allowRepeat;
- bool m_allowForwardSlashOperator;
-
- bool m_requireWidth;
- bool m_requireOutset;
-
- RefPtr<CSSValue> m_image;
- RefPtr<CSSBorderImageSliceValue> m_imageSlice;
- RefPtr<CSSPrimitiveValue> m_borderSlice;
- RefPtr<CSSPrimitiveValue> m_outset;
-
- RefPtr<CSSValue> m_repeat;
-};
-
-bool CSSParser::parseBorderImage(CSSPropertyID propId, RefPtr<CSSValue>& result, bool important)
-{
- ShorthandScope scope(this, propId);
- BorderImageParseContext context;
- while (CSSParserValue* currentValue = m_valueList->current()) {
- context.setCanAdvance(false);
-
- if (!context.canAdvance() && context.allowForwardSlashOperator() && isForwardSlashOperator(*currentValue))
- context.commitForwardSlashOperator();
-
- if (!context.canAdvance() && context.allowImage()) {
- if (currentValue->unit == CSSPrimitiveValue::CSS_URI)
- context.commitImage(CSSImageValue::create(completeURL(currentValue->string)));
- else if (isGeneratedImageValue(*currentValue)) {
- RefPtr<CSSValue> value;
- if (parseGeneratedImage(*m_valueList, value))
- context.commitImage(WTFMove(value));
- else
- return false;
- } else if (isImageSetFunctionValue(*currentValue)) {
- RefPtr<CSSValue> value = parseImageSet();
- if (value)
- context.commitImage(value.releaseNonNull());
- else
- return false;
- } else if (currentValue->id == CSSValueNone)
- context.commitImage(CSSValuePool::singleton().createIdentifierValue(CSSValueNone));
- }
-
- if (!context.canAdvance() && context.allowImageSlice()) {
- RefPtr<CSSBorderImageSliceValue> imageSlice;
- if (parseBorderImageSlice(propId, imageSlice))
- context.commitImageSlice(WTFMove(imageSlice));
- }
-
- if (!context.canAdvance() && context.allowRepeat()) {
- RefPtr<CSSValue> repeat;
- if (parseBorderImageRepeat(repeat))
- context.commitRepeat(WTFMove(repeat));
- }
-
- if (!context.canAdvance() && context.requireWidth()) {
- RefPtr<CSSPrimitiveValue> borderSlice;
- if (parseBorderImageWidth(borderSlice))
- context.commitBorderWidth(WTFMove(borderSlice));
- }
-
- if (!context.canAdvance() && context.requireOutset()) {
- RefPtr<CSSPrimitiveValue> borderOutset;
- if (parseBorderImageOutset(borderOutset))
- context.commitBorderOutset(WTFMove(borderOutset));
- }
-
- if (!context.canAdvance())
- return false;
-
- m_valueList->next();
- }
-
- if (context.allowCommit()) {
- if (propId == CSSPropertyBorderImage)
- context.commitBorderImage(*this, important);
- else
- // Need to fully commit as a single value.
- result = context.commitWebKitBorderImage();
- return true;
- }
-
- return false;
-}
-
-static bool isBorderImageRepeatKeyword(int id)
-{
- return id == CSSValueStretch || id == CSSValueRepeat || id == CSSValueSpace || id == CSSValueRound;
-}
-
-bool CSSParser::parseBorderImageRepeat(RefPtr<CSSValue>& result)
-{
- RefPtr<CSSPrimitiveValue> firstValue;
- RefPtr<CSSPrimitiveValue> secondValue;
- CSSParserValue* val = m_valueList->current();
- if (!val)
- return false;
- if (isBorderImageRepeatKeyword(val->id))
- firstValue = CSSValuePool::singleton().createIdentifierValue(val->id);
- else
- return false;
-
- val = m_valueList->next();
- if (val) {
- if (isBorderImageRepeatKeyword(val->id))
- secondValue = CSSValuePool::singleton().createIdentifierValue(val->id);
- else if (!inShorthand()) {
- // If we're not parsing a shorthand then we are invalid.
- return false;
- } else {
- // We need to rewind the value list, so that when its advanced we'll
- // end up back at this value.
- m_valueList->previous();
- secondValue = firstValue;
- }
- } else
- secondValue = firstValue;
-
- result = createPrimitiveValuePair(firstValue.releaseNonNull(), secondValue.releaseNonNull());
- return true;
-}
-
-class BorderImageSliceParseContext {
-public:
- BorderImageSliceParseContext(CSSParser& parser)
- : m_parser(parser)
- , m_allowNumber(true)
- , m_allowFill(true)
- , m_allowFinalCommit(false)
- , m_fill(false)
- { }
-
- bool allowNumber() const { return m_allowNumber; }
- bool allowFill() const { return m_allowFill; }
- bool allowFinalCommit() const { return m_allowFinalCommit; }
- CSSPrimitiveValue* top() const { return m_top.get(); }
-
- void commitNumber(CSSParser::ValueWithCalculation& valueWithCalculation)
- {
- auto primitiveValue = m_parser.createPrimitiveNumericValue(valueWithCalculation);
- if (!m_top)
- m_top = WTFMove(primitiveValue);
- else if (!m_right)
- m_right = WTFMove(primitiveValue);
- else if (!m_bottom)
- m_bottom = WTFMove(primitiveValue);
- else {
- ASSERT(!m_left);
- m_left = WTFMove(primitiveValue);
- }
-
- m_allowNumber = !m_left;
- m_allowFinalCommit = true;
- }
-
- void commitFill() { m_fill = true; m_allowFill = false; m_allowNumber = !m_top; }
-
- Ref<CSSBorderImageSliceValue> commitBorderImageSlice()
- {
- // We need to clone and repeat values for any omissions.
- ASSERT(m_top);
- if (!m_right) {
- m_right = m_top;
- m_bottom = m_top;
- m_left = m_top;
- }
- if (!m_bottom) {
- m_bottom = m_top;
- m_left = m_right;
- }
- if (!m_left)
- m_left = m_right;
-
- // Now build a rect value to hold all four of our primitive values.
- auto quad = Quad::create();
- quad->setTop(m_top.copyRef());
- quad->setRight(m_right.copyRef());
- quad->setBottom(m_bottom.copyRef());
- quad->setLeft(m_left.copyRef());
-
- // Make our new border image value now.
- return CSSBorderImageSliceValue::create(CSSValuePool::singleton().createValue(WTFMove(quad)), m_fill);
- }
-
-private:
- CSSParser& m_parser;
-
- bool m_allowNumber;
- bool m_allowFill;
- bool m_allowFinalCommit;
-
- RefPtr<CSSPrimitiveValue> m_top;
- RefPtr<CSSPrimitiveValue> m_right;
- RefPtr<CSSPrimitiveValue> m_bottom;
- RefPtr<CSSPrimitiveValue> m_left;
-
- bool m_fill;
-};
-
-bool CSSParser::parseBorderImageSlice(CSSPropertyID propId, RefPtr<CSSBorderImageSliceValue>& result)
-{
- BorderImageSliceParseContext context(*this);
- CSSParserValue* value;
- while ((value = m_valueList->current())) {
- ValueWithCalculation valueWithCalculation(*value);
- // FIXME calc() http://webkit.org/b/16662 : calc is parsed but values are not created yet.
- if (context.allowNumber() && !isCalculation(valueWithCalculation) && validateUnit(valueWithCalculation, FInteger | FNonNeg | FPercent, HTMLStandardMode)) {
- context.commitNumber(valueWithCalculation);
- } else if (context.allowFill() && value->id == CSSValueFill)
- context.commitFill();
- else if (!inShorthand()) {
- // If we're not parsing a shorthand then we are invalid.
- return false;
- } else {
- if (context.allowFinalCommit()) {
- // We're going to successfully parse, but we don't want to consume this token.
- m_valueList->previous();
- }
- break;
- }
- m_valueList->next();
- }
-
- if (context.allowFinalCommit()) {
- // FIXME: For backwards compatibility, -webkit-border-image, -webkit-mask-box-image and -webkit-box-reflect have to do a fill by default.
- // FIXME: What do we do with -webkit-box-reflect and -webkit-mask-box-image? Probably just have to leave them filling...
- if (propId == CSSPropertyWebkitBorderImage || propId == CSSPropertyWebkitMaskBoxImage || propId == CSSPropertyWebkitBoxReflect)
- context.commitFill();
-
- // Need to fully commit as a single value.
- result = context.commitBorderImageSlice();
- return true;
- }
-
- return false;
-}
-
-class BorderImageQuadParseContext {
-public:
- BorderImageQuadParseContext(CSSParser& parser)
- : m_parser(parser)
- , m_allowNumber(true)
- , m_allowFinalCommit(false)
- { }
-
- bool allowNumber() const { return m_allowNumber; }
- bool allowFinalCommit() const { return m_allowFinalCommit; }
- CSSPrimitiveValue* top() const { return m_top.get(); }
-
- void commitNumber(CSSParser::ValueWithCalculation& valueWithCalculation)
- {
- RefPtr<CSSPrimitiveValue> primitiveValue;
- if (valueWithCalculation.value().id == CSSValueAuto)
- primitiveValue = CSSValuePool::singleton().createIdentifierValue(valueWithCalculation.value().id);
- else
- primitiveValue = m_parser.createPrimitiveNumericValue(valueWithCalculation);
-
- if (!m_top)
- m_top = WTFMove(primitiveValue);
- else if (!m_right)
- m_right = WTFMove(primitiveValue);
- else if (!m_bottom)
- m_bottom = WTFMove(primitiveValue);
- else {
- ASSERT(!m_left);
- m_left = WTFMove(primitiveValue);
- }
-
- m_allowNumber = !m_left;
- m_allowFinalCommit = true;
- }
-
- void setAllowFinalCommit() { m_allowFinalCommit = true; }
- void setTop(RefPtr<CSSPrimitiveValue>&& val) { m_top = WTFMove(val); }
-
- Ref<CSSPrimitiveValue> commitBorderImageQuad()
- {
- // We need to clone and repeat values for any omissions.
- ASSERT(m_top);
- if (!m_right) {
- m_right = m_top;
- m_bottom = m_top;
- m_left = m_top;
- }
- if (!m_bottom) {
- m_bottom = m_top;
- m_left = m_right;
- }
- if (!m_left)
- m_left = m_right;
-
- // Now build a quad value to hold all four of our primitive values.
- auto quad = Quad::create();
- quad->setTop(m_top.copyRef());
- quad->setRight(m_right.copyRef());
- quad->setBottom(m_bottom.copyRef());
- quad->setLeft(m_left.copyRef());
-
- // Make our new value now.
- return CSSValuePool::singleton().createValue(WTFMove(quad));
- }
-
-private:
- CSSParser& m_parser;
-
- bool m_allowNumber;
- bool m_allowFinalCommit;
-
- RefPtr<CSSPrimitiveValue> m_top;
- RefPtr<CSSPrimitiveValue> m_right;
- RefPtr<CSSPrimitiveValue> m_bottom;
- RefPtr<CSSPrimitiveValue> m_left;
-};
-
-bool CSSParser::parseBorderImageQuad(Units validUnits, RefPtr<CSSPrimitiveValue>& result)
-{
- BorderImageQuadParseContext context(*this);
- CSSParserValue* value;
- while ((value = m_valueList->current())) {
- ValueWithCalculation valueWithCalculation(*value);
- if (context.allowNumber() && (validateUnit(valueWithCalculation, validUnits, HTMLStandardMode) || value->id == CSSValueAuto)) {
- context.commitNumber(valueWithCalculation);
- } else if (!inShorthand()) {
- // If we're not parsing a shorthand then we are invalid.
- return false;
- } else {
- if (context.allowFinalCommit())
- m_valueList->previous(); // The shorthand loop will advance back to this point.
- break;
- }
- m_valueList->next();
- }
-
- if (context.allowFinalCommit()) {
- // Need to fully commit as a single value.
- result = context.commitBorderImageQuad();
- return true;
- }
- return false;
-}
-
-bool CSSParser::parseBorderImageWidth(RefPtr<CSSPrimitiveValue>& result)
-{
- return parseBorderImageQuad(FLength | FInteger | FNonNeg | FPercent, result);
-}
-
-bool CSSParser::parseBorderImageOutset(RefPtr<CSSPrimitiveValue>& result)
-{
- return parseBorderImageQuad(FLength | FInteger | FNonNeg, result);
-}
-
-bool CSSParser::parseBorderRadius(CSSPropertyID propId, bool important)
-{
- unsigned num = m_valueList->size();
- if (num > 9)
- return false;
-
- ShorthandScope scope(this, propId);
- RefPtr<CSSPrimitiveValue> radii[2][4];
-
- unsigned indexAfterSlash = 0;
- for (unsigned i = 0; i < num; ++i) {
- CSSParserValue& value = *m_valueList->valueAt(i);
- if (value.unit == CSSParserValue::Operator) {
- if (value.iValue != '/')
- return false;
-
- if (!i || indexAfterSlash || i + 1 == num || num > i + 5)
- return false;
-
- indexAfterSlash = i + 1;
- completeBorderRadii(radii[0]);
- continue;
- }
-
- if (i - indexAfterSlash >= 4)
- return false;
-
- ValueWithCalculation valueWithCalculation(value);
- if (!validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg))
- return false;
-
- auto radius = createPrimitiveNumericValue(valueWithCalculation);
-
- if (!indexAfterSlash) {
- radii[0][i] = WTFMove(radius);
-
- // Legacy syntax: -webkit-border-radius: l1 l2; is equivalent to border-radius: l1 / l2;
- if (num == 2 && propId == CSSPropertyWebkitBorderRadius) {
- indexAfterSlash = 1;
- completeBorderRadii(radii[0]);
- }
- } else
- radii[1][i - indexAfterSlash] = WTFMove(radius);
- }
-
- if (!indexAfterSlash) {
- completeBorderRadii(radii[0]);
- for (unsigned i = 0; i < 4; ++i)
- radii[1][i] = radii[0][i];
- } else
- completeBorderRadii(radii[1]);
-
- SetForScope<bool> change(m_implicitShorthand, true);
- addProperty(CSSPropertyBorderTopLeftRadius, createPrimitiveValuePair(WTFMove(radii[0][0]), WTFMove(radii[1][0])), important);
- addProperty(CSSPropertyBorderTopRightRadius, createPrimitiveValuePair(WTFMove(radii[0][1]), WTFMove(radii[1][1])), important);
- addProperty(CSSPropertyBorderBottomRightRadius, createPrimitiveValuePair(WTFMove(radii[0][2]), WTFMove(radii[1][2])), important);
- addProperty(CSSPropertyBorderBottomLeftRadius, createPrimitiveValuePair(WTFMove(radii[0][3]), WTFMove(radii[1][3])), important);
- return true;
-}
-
-bool CSSParser::parseAspectRatio(bool important)
-{
- unsigned num = m_valueList->size();
- if (num == 1) {
- CSSValueID valueId = m_valueList->valueAt(0)->id;
- if (valueId == CSSValueAuto || valueId == CSSValueFromDimensions || valueId == CSSValueFromIntrinsic) {
- addProperty(CSSPropertyWebkitAspectRatio, CSSValuePool::singleton().createIdentifierValue(valueId), important);
- return true;
- }
- }
-
- if (num != 3)
- return false;
-
- CSSParserValue& op = *m_valueList->valueAt(1);
-
- if (!isForwardSlashOperator(op))
- return false;
-
- ValueWithCalculation lvalueWithCalculation(*m_valueList->valueAt(0));
- ValueWithCalculation rvalueWithCalculation(*m_valueList->valueAt(2));
- if (!validateUnit(lvalueWithCalculation, FNumber | FNonNeg) || !validateUnit(rvalueWithCalculation, FNumber | FNonNeg))
- return false;
-
- // FIXME: This doesn't handle calculated values.
- if (!lvalueWithCalculation.value().fValue || !rvalueWithCalculation.value().fValue)
- return false;
-
- addProperty(CSSPropertyWebkitAspectRatio, CSSAspectRatioValue::create(narrowPrecisionToFloat(lvalueWithCalculation.value().fValue), narrowPrecisionToFloat(rvalueWithCalculation.value().fValue)), important);
-
- return true;
-}
-
-bool CSSParser::parseCounter(CSSPropertyID propId, int defaultValue, bool important)
-{
- enum { ID, VAL } state = ID;
-
- auto list = CSSValueList::createCommaSeparated();
- RefPtr<CSSPrimitiveValue> counterName;
-
- while (true) {
- CSSParserValue* value = m_valueList->current();
- switch (state) {
- case ID:
- if (value && value->unit == CSSPrimitiveValue::CSS_IDENT) {
- counterName = createPrimitiveStringValue(*value);
- state = VAL;
- m_valueList->next();
- continue;
- }
- break;
- case VAL: {
- int i = defaultValue;
- if (value && value->unit == CSSPrimitiveValue::CSS_NUMBER) {
- i = clampToInteger(value->fValue);
- m_valueList->next();
- }
-
- list->append(createPrimitiveValuePair(WTFMove(counterName),
- CSSValuePool::singleton().createValue(i, CSSPrimitiveValue::CSS_NUMBER)));
- state = ID;
- continue;
- }
- }
- break;
- }
-
- if (list->length() > 0) {
- addProperty(propId, WTFMove(list), important);
- return true;
- }
-
- return false;
-}
-
-// This should go away once we drop support for -webkit-gradient
-static RefPtr<CSSPrimitiveValue> parseDeprecatedGradientPoint(CSSParserValue& value, bool horizontal)
-{
- RefPtr<CSSPrimitiveValue> result;
- if (value.unit == CSSPrimitiveValue::CSS_IDENT) {
- if ((equalLettersIgnoringASCIICase(value, "left") && horizontal)
- || (equalLettersIgnoringASCIICase(value, "top") && !horizontal))
- result = CSSValuePool::singleton().createValue(0., CSSPrimitiveValue::CSS_PERCENTAGE);
- else if ((equalLettersIgnoringASCIICase(value, "right") && horizontal)
- || (equalLettersIgnoringASCIICase(value, "bottom") && !horizontal))
- result = CSSValuePool::singleton().createValue(100., CSSPrimitiveValue::CSS_PERCENTAGE);
- else if (equalLettersIgnoringASCIICase(value, "center"))
- result = CSSValuePool::singleton().createValue(50., CSSPrimitiveValue::CSS_PERCENTAGE);
- } else if (value.unit == CSSPrimitiveValue::CSS_NUMBER || value.unit == CSSPrimitiveValue::CSS_PERCENTAGE)
- result = CSSValuePool::singleton().createValue(value.fValue, static_cast<CSSPrimitiveValue::UnitTypes>(value.unit));
- return result;
-}
-
-static bool parseDeprecatedGradientColorStop(CSSParser& parser, CSSParserValue& value, CSSGradientColorStop& stop)
-{
- if (value.unit != CSSParserValue::Function)
- return false;
-
- if (!equalLettersIgnoringASCIICase(value.function->name, "from(")
- && !equalLettersIgnoringASCIICase(value.function->name, "to(")
- && !equalLettersIgnoringASCIICase(value.function->name, "color-stop("))
- return false;
-
- CSSParserValueList* args = value.function->args.get();
- if (!args)
- return false;
-
- if (equalLettersIgnoringASCIICase(value.function->name, "from(")
- || equalLettersIgnoringASCIICase(value.function->name, "to(")) {
- // The "from" and "to" stops expect 1 argument.
- if (args->size() != 1)
- return false;
-
- if (equalLettersIgnoringASCIICase(value.function->name, "from("))
- stop.m_position = CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::CSS_NUMBER);
- else
- stop.m_position = CSSValuePool::singleton().createValue(1, CSSPrimitiveValue::CSS_NUMBER);
-
- CSSValueID id = args->current()->id;
- if (id == CSSValueWebkitText || CSSParser::isValidSystemColorValue(id) || id == CSSValueMenu)
- stop.m_color = CSSValuePool::singleton().createIdentifierValue(id);
- else
- stop.m_color = parser.parseColor(args->current());
- if (!stop.m_color)
- return false;
- }
-
- // The "color-stop" function expects 3 arguments.
- if (equalLettersIgnoringASCIICase(value.function->name, "color-stop(")) {
- if (args->size() != 3)
- return false;
-
- CSSParserValue* stopArg = args->current();
- if (stopArg->unit == CSSPrimitiveValue::CSS_PERCENTAGE)
- stop.m_position = CSSValuePool::singleton().createValue(stopArg->fValue / 100, CSSPrimitiveValue::CSS_NUMBER);
- else if (stopArg->unit == CSSPrimitiveValue::CSS_NUMBER)
- stop.m_position = CSSValuePool::singleton().createValue(stopArg->fValue, CSSPrimitiveValue::CSS_NUMBER);
- else
- return false;
-
- stopArg = args->next();
- if (stopArg->unit != CSSParserValue::Operator || stopArg->iValue != ',')
- return false;
-
- stopArg = args->next();
- CSSValueID id = stopArg->id;
- if (id == CSSValueWebkitText || CSSParser::isValidSystemColorValue(id) || id == CSSValueMenu)
- stop.m_color = CSSValuePool::singleton().createIdentifierValue(id);
- else
- stop.m_color = parser.parseColor(stopArg);
- if (!stop.m_color)
- return false;
- }
-
- return true;
-}
-
-bool CSSParser::parseDeprecatedGradient(CSSParserValueList& valueList, RefPtr<CSSValue>& gradient)
-{
- // Walk the arguments.
- CSSParserValueList* args = valueList.current()->function->args.get();
- if (!args || args->size() == 0)
- return false;
-
- // The first argument is the gradient type. It is an identifier.
- CSSGradientType gradientType;
- CSSParserValue* argument = args->current();
- if (!argument || argument->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
- if (equalLettersIgnoringASCIICase(*argument, "linear"))
- gradientType = CSSDeprecatedLinearGradient;
- else if (equalLettersIgnoringASCIICase(*argument, "radial"))
- gradientType = CSSDeprecatedRadialGradient;
- else
- return false;
-
- RefPtr<CSSGradientValue> result;
- switch (gradientType) {
- case CSSDeprecatedLinearGradient:
- result = CSSLinearGradientValue::create(NonRepeating, gradientType);
- break;
- case CSSDeprecatedRadialGradient:
- result = CSSRadialGradientValue::create(NonRepeating, gradientType);
- break;
- default:
- // The rest of the gradient types shouldn't appear here.
- ASSERT_NOT_REACHED();
- }
-
- // Comma.
- argument = args->next();
- if (!isComma(argument))
- return false;
-
- // Next comes the starting point for the gradient as an x y pair. There is no
- // comma between the x and the y values.
- // First X. It can be left, right, number or percent.
- argument = args->next();
- if (!argument)
- return false;
- RefPtr<CSSPrimitiveValue> point = parseDeprecatedGradientPoint(*argument, true);
- if (!point)
- return false;
- result->setFirstX(point.releaseNonNull());
-
- // First Y. It can be top, bottom, number or percent.
- argument = args->next();
- if (!argument)
- return false;
- point = parseDeprecatedGradientPoint(*argument, false);
- if (!point)
- return false;
- result->setFirstY(point.releaseNonNull());
-
- // Comma after the first point.
- argument = args->next();
- if (!isComma(argument))
- return false;
-
- // For radial gradients only, we now expect a numeric radius.
- if (gradientType == CSSDeprecatedRadialGradient) {
- argument = args->next();
- // FIXME: This does not handle calculation values.
- if (!argument || argument->unit != CSSPrimitiveValue::CSS_NUMBER)
- return false;
- ValueWithCalculation argumentWithCalculation(*argument);
- downcast<CSSRadialGradientValue>(*result).setFirstRadius(createPrimitiveNumericValue(argumentWithCalculation));
-
- // Comma after the first radius.
- argument = args->next();
- if (!isComma(argument))
- return false;
- }
-
- // Next is the ending point for the gradient as an x, y pair.
- // Second X. It can be left, right, number or percent.
- argument = args->next();
- if (!argument)
- return false;
- point = parseDeprecatedGradientPoint(*argument, true);
- if (!point)
- return false;
- result->setSecondX(point.releaseNonNull());
-
- // Second Y. It can be top, bottom, number or percent.
- argument = args->next();
- if (!argument)
- return false;
- point = parseDeprecatedGradientPoint(*argument, false);
- if (!point)
- return false;
- result->setSecondY(point.releaseNonNull());
-
- // For radial gradients only, we now expect the second radius.
- if (gradientType == CSSDeprecatedRadialGradient) {
- // Comma after the second point.
- argument = args->next();
- if (!isComma(argument))
- return false;
-
- argument = args->next();
- // FIXME: This does not handle calculation values.
- if (!argument || argument->unit != CSSPrimitiveValue::CSS_NUMBER)
- return false;
- ValueWithCalculation argumentWithCalculation(*argument);
- downcast<CSSRadialGradientValue>(*result).setSecondRadius(createPrimitiveNumericValue(argumentWithCalculation));
- }
-
- // We now will accept any number of stops (0 or more).
- argument = args->next();
- while (argument) {
- // Look for the comma before the next stop.
- if (!isComma(argument))
- return false;
-
- // Now examine the stop itself.
- argument = args->next();
- if (!argument)
- return false;
-
- // The function name needs to be one of "from", "to", or "color-stop."
- CSSGradientColorStop stop;
- if (!parseDeprecatedGradientColorStop(*this, *argument, stop))
- return false;
- result->addStop(stop);
-
- // Advance
- argument = args->next();
- }
-
- gradient = WTFMove(result);
- return true;
-}
-
-static RefPtr<CSSPrimitiveValue> valueFromSideKeyword(CSSParserValue& value, bool& isHorizontal)
-{
- if (value.unit != CSSPrimitiveValue::CSS_IDENT)
- return nullptr;
-
- switch (value.id) {
- case CSSValueLeft:
- case CSSValueRight:
- isHorizontal = true;
- break;
- case CSSValueTop:
- case CSSValueBottom:
- isHorizontal = false;
- break;
- default:
- return nullptr;
- }
- return CSSValuePool::singleton().createIdentifierValue(value.id);
-}
-
-static RefPtr<CSSPrimitiveValue> parseGradientColorOrKeyword(CSSParser& parser, CSSParserValue& value)
-{
- CSSValueID id = value.id;
- if (id == CSSValueWebkitText || CSSParser::isValidSystemColorValue(id) || id == CSSValueMenu || id == CSSValueCurrentcolor)
- return CSSValuePool::singleton().createIdentifierValue(id);
-
- return parser.parseColor(&value);
-}
-
-bool CSSParser::parseDeprecatedLinearGradient(CSSParserValueList& valueList, RefPtr<CSSValue>& gradient, CSSGradientRepeat repeating)
-{
- auto result = CSSLinearGradientValue::create(repeating, CSSPrefixedLinearGradient);
-
- // Walk the arguments.
- CSSParserValueList* args = valueList.current()->function->args.get();
- if (!args || !args->size())
- return false;
-
- CSSParserValue* argument = args->current();
- if (!argument)
- return false;
- ValueWithCalculation argumentWithCalculation(*argument);
-
- bool expectComma = false;
- // Look for angle.
- if (validateUnit(argumentWithCalculation, FAngle, HTMLStandardMode)) {
- result->setAngle(createPrimitiveNumericValue(argumentWithCalculation));
-
- args->next();
- expectComma = true;
- } else {
- // Look one or two optional keywords that indicate a side or corner.
- RefPtr<CSSPrimitiveValue> startX, startY;
- bool isHorizontal = false;
- if (RefPtr<CSSPrimitiveValue> location = valueFromSideKeyword(*argument, isHorizontal)) {
- if (isHorizontal)
- startX = WTFMove(location);
- else
- startY = WTFMove(location);
-
- if ((argument = args->next())) {
- if ((location = valueFromSideKeyword(*argument, isHorizontal))) {
- if (isHorizontal) {
- if (startX)
- return false;
- startX = WTFMove(location);
- } else {
- if (startY)
- return false;
- startY = WTFMove(location);
- }
-
- args->next();
- }
- }
-
- expectComma = true;
- }
-
- if (!startX && !startY)
- startY = CSSValuePool::singleton().createIdentifierValue(CSSValueTop);
-
- result->setFirstX(WTFMove(startX));
- result->setFirstY(WTFMove(startY));
- }
-
- if (!parseGradientColorStops(*args, result, expectComma))
- return false;
-
- if (!result->stopCount())
- return false;
-
- gradient = WTFMove(result);
- return true;
-}
-
-bool CSSParser::parseDeprecatedRadialGradient(CSSParserValueList& valueList, RefPtr<CSSValue>& gradient, CSSGradientRepeat repeating)
-{
- auto result = CSSRadialGradientValue::create(repeating, CSSPrefixedRadialGradient);
-
- // Walk the arguments.
- CSSParserValueList* args = valueList.current()->function->args.get();
- if (!args || !args->size())
- return false;
-
- CSSParserValue* argument = args->current();
- if (!argument)
- return false;
-
- bool expectComma = false;
-
- // Optional background-position
- RefPtr<CSSPrimitiveValue> centerX;
- RefPtr<CSSPrimitiveValue> centerY;
- // parse2ValuesFillPosition advances the args next pointer.
- parse2ValuesFillPosition(*args, centerX, centerY);
- argument = args->current();
- if (!argument)
- return false;
-
- if (centerX || centerY) {
- // Comma
- if (!isComma(argument))
- return false;
-
- argument = args->next();
- if (!argument)
- return false;
- }
-
- result->setFirstX(centerX.copyRef());
- result->setSecondX(WTFMove(centerX));
- // CSS3 radial gradients always share the same start and end point.
- result->setFirstY(centerY.copyRef());
- result->setSecondY(WTFMove(centerY));
-
- RefPtr<CSSPrimitiveValue> shapeValue;
- RefPtr<CSSPrimitiveValue> sizeValue;
-
- // Optional shape and/or size in any order.
- for (int i = 0; i < 2; ++i) {
- if (argument->unit != CSSPrimitiveValue::CSS_IDENT)
- break;
-
- bool foundValue = false;
- switch (argument->id) {
- case CSSValueCircle:
- case CSSValueEllipse:
- shapeValue = CSSValuePool::singleton().createIdentifierValue(argument->id);
- foundValue = true;
- break;
- case CSSValueClosestSide:
- case CSSValueClosestCorner:
- case CSSValueFarthestSide:
- case CSSValueFarthestCorner:
- case CSSValueContain:
- case CSSValueCover:
- sizeValue = CSSValuePool::singleton().createIdentifierValue(argument->id);
- foundValue = true;
- break;
- default:
- break;
- }
-
- if (foundValue) {
- argument = args->next();
- if (!argument)
- return false;
-
- expectComma = true;
- }
- }
-
- result->setShape(shapeValue.copyRef());
- result->setSizingBehavior(sizeValue.copyRef());
-
- // Or, two lengths or percentages
- RefPtr<CSSPrimitiveValue> horizontalSize;
- RefPtr<CSSPrimitiveValue> verticalSize;
-
- if (!shapeValue && !sizeValue) {
- ValueWithCalculation hSizeWithCalculation(*argument);
- if (validateUnit(hSizeWithCalculation, FLength | FPercent)) {
- horizontalSize = createPrimitiveNumericValue(hSizeWithCalculation);
- argument = args->next();
- if (!argument)
- return false;
-
- expectComma = true;
- }
-
- ValueWithCalculation vSizeWithCalculation(*argument);
- if (validateUnit(vSizeWithCalculation, FLength | FPercent)) {
- verticalSize = createPrimitiveNumericValue(vSizeWithCalculation);
-
- argument = args->next();
- if (!argument)
- return false;
- expectComma = true;
- }
- }
-
- // Must have neither or both.
- if (!horizontalSize != !verticalSize)
- return false;
-
- result->setEndHorizontalSize(WTFMove(horizontalSize));
- result->setEndVerticalSize(WTFMove(verticalSize));
-
- if (!parseGradientColorStops(*args, result, expectComma))
- return false;
-
- gradient = WTFMove(result);
- return true;
-}
-
-bool CSSParser::parseLinearGradient(CSSParserValueList& valueList, RefPtr<CSSValue>& gradient, CSSGradientRepeat repeating)
-{
- auto result = CSSLinearGradientValue::create(repeating, CSSLinearGradient);
-
- CSSParserValueList* args = valueList.current()->function->args.get();
- if (!args || !args->size())
- return false;
-
- if (!args->current())
- return false;
-
- ValueWithCalculation firstArgumentWithCalculation(*args->current());
-
- bool expectComma = false;
- // Look for angle.
- if (validateUnit(firstArgumentWithCalculation, FAngle, HTMLStandardMode)) {
- result->setAngle(createPrimitiveNumericValue(firstArgumentWithCalculation));
-
- args->next();
- expectComma = true;
- } else if (firstArgumentWithCalculation.value().unit == CSSPrimitiveValue::CSS_IDENT && equalLettersIgnoringASCIICase(firstArgumentWithCalculation, "to")) {
- // to [ [left | right] || [top | bottom] ]
- CSSParserValue* nextArgument = args->next();
- if (!nextArgument)
- return false;
-
- bool isHorizontal = false;
- RefPtr<CSSPrimitiveValue> location = valueFromSideKeyword(*nextArgument, isHorizontal);
- if (!location)
- return false;
-
- RefPtr<CSSPrimitiveValue> endX, endY;
- if (isHorizontal)
- endX = WTFMove(location);
- else
- endY = WTFMove(location);
-
- nextArgument = args->next();
- if (!nextArgument)
- return false;
-
- location = valueFromSideKeyword(*nextArgument, isHorizontal);
- if (location) {
- if (isHorizontal) {
- if (endX)
- return false;
- endX = WTFMove(location);
- } else {
- if (endY)
- return false;
- endY = WTFMove(location);
- }
-
- args->next();
- }
-
- expectComma = true;
- result->setFirstX(WTFMove(endX));
- result->setFirstY(WTFMove(endY));
- }
-
- if (!parseGradientColorStops(*args, result, expectComma))
- return false;
-
- if (!result->stopCount())
- return false;
-
- gradient = WTFMove(result);
- return true;
-}
-
-bool CSSParser::parseRadialGradient(CSSParserValueList& valueList, RefPtr<CSSValue>& gradient, CSSGradientRepeat repeating)
-{
- auto result = CSSRadialGradientValue::create(repeating, CSSRadialGradient);
-
- CSSParserValueList* args = valueList.current()->function->args.get();
- if (!args || !args->size())
- return false;
-
- CSSParserValue* argument = args->current();
- if (!argument)
- return false;
-
- bool expectComma = false;
-
- RefPtr<CSSPrimitiveValue> shapeValue;
- RefPtr<CSSPrimitiveValue> sizeValue;
- RefPtr<CSSPrimitiveValue> horizontalSize;
- RefPtr<CSSPrimitiveValue> verticalSize;
-
- // First part of grammar, the size/shape clause:
- // [ circle || <length> ] |
- // [ ellipse || [ <length> | <percentage> ]{2} ] |
- // [ [ circle | ellipse] || <size-keyword> ]
- for (int i = 0; i < 3; ++i) {
- ValueWithCalculation argumentWithCalculation(*argument);
- if (argument->unit == CSSPrimitiveValue::CSS_IDENT) {
- bool badIdent = false;
- switch (argument->id) {
- case CSSValueCircle:
- case CSSValueEllipse:
- if (shapeValue)
- return false;
- shapeValue = CSSValuePool::singleton().createIdentifierValue(argument->id);
- break;
- case CSSValueClosestSide:
- case CSSValueClosestCorner:
- case CSSValueFarthestSide:
- case CSSValueFarthestCorner:
- if (sizeValue || horizontalSize)
- return false;
- sizeValue = CSSValuePool::singleton().createIdentifierValue(argument->id);
- break;
- default:
- badIdent = true;
- }
-
- if (badIdent)
- break;
-
- argument = args->next();
- if (!argument)
- return false;
- } else if (validateUnit(argumentWithCalculation, FLength | FPercent)) {
-
- if (sizeValue || horizontalSize)
- return false;
- horizontalSize = createPrimitiveNumericValue(argumentWithCalculation);
-
- argument = args->next();
- if (!argument)
- return false;
-
- ValueWithCalculation vSizeWithCalculation(*argument);
- if (validateUnit(vSizeWithCalculation, FLength | FPercent)) {
- verticalSize = createPrimitiveNumericValue(vSizeWithCalculation);
- ++i;
- argument = args->next();
- if (!argument)
- return false;
- }
- } else
- break;
- }
-
- // You can specify size as a keyword or a length/percentage, not both.
- if (sizeValue && horizontalSize)
- return false;
- // Circles must have 0 or 1 lengths.
- if (shapeValue && shapeValue->valueID() == CSSValueCircle && verticalSize)
- return false;
- // Ellipses must have 0 or 2 length/percentages.
- if (shapeValue && shapeValue->valueID() == CSSValueEllipse && horizontalSize && !verticalSize)
- return false;
- // If there's only one size, it must be a length.
- if (!verticalSize && horizontalSize && horizontalSize->isPercentage())
- return false;
-
- result->setShape(shapeValue.copyRef());
- result->setSizingBehavior(sizeValue.copyRef());
- result->setEndHorizontalSize(horizontalSize.copyRef());
- result->setEndVerticalSize(verticalSize.copyRef());
-
- // Second part of grammar, the center-position clause:
- // at <position>
- RefPtr<CSSPrimitiveValue> centerX;
- RefPtr<CSSPrimitiveValue> centerY;
- if (argument->unit == CSSPrimitiveValue::CSS_IDENT && equalLettersIgnoringASCIICase(*argument, "at")) {
- argument = args->next();
- if (!argument)
- return false;
-
- parseFillPosition(*args, centerX, centerY);
- if (!(centerX && centerY))
- return false;
-
- argument = args->current();
- if (!argument)
- return false;
-
- result->setFirstX(centerX.copyRef());
- result->setFirstY(centerY.copyRef());
- // Right now, CSS radial gradients have the same start and end centers.
- result->setSecondX(centerX.copyRef());
- result->setSecondY(centerY.copyRef());
- }
-
- if (shapeValue || sizeValue || horizontalSize || centerX || centerY)
- expectComma = true;
-
- if (!parseGradientColorStops(*args, result, expectComma))
- return false;
-
- gradient = WTFMove(result);
- return true;
-}
-
-bool CSSParser::parseGradientColorStops(CSSParserValueList& valueList, CSSGradientValue& gradient, bool expectComma)
-{
- CSSParserValue* value = valueList.current();
- bool previousStopWasMidpoint = true;
-
- // Now look for color stops.
- while (value) {
- // Look for the comma before the next stop.
- if (expectComma) {
- if (!isComma(value))
- return false;
-
- value = valueList.next();
- if (!value)
- return false;
- }
-
- // <color-stop> = <color> [ <percentage> | <length> ]?
- CSSGradientColorStop stop;
- stop.m_color = parseGradientColorOrKeyword(*this, *value);
- if (!stop.m_color) {
- if (previousStopWasMidpoint) // 2 midpoints in a row is not allowed. This also catches starting with a midpoint.
- return false;
-
- stop.isMidpoint = true;
- } else
- value = valueList.next();
-
- previousStopWasMidpoint = stop.isMidpoint;
-
- if (value) {
- ValueWithCalculation valueWithCalculation(*value);
- if (validateUnit(valueWithCalculation, FLength | FPercent)) {
- stop.m_position = createPrimitiveNumericValue(valueWithCalculation);
- value = valueList.next();
- } else if (stop.isMidpoint)
- return false;
- }
-
- gradient.addStop(stop);
- expectComma = true;
- }
-
- // We can't end on a midpoint.
- if (previousStopWasMidpoint)
- return false;
-
- // Must have 2 or more stops to be valid.
- return gradient.stopCount() >= 2;
-}
-
-bool CSSParser::isGeneratedImageValue(CSSParserValue& value) const
-{
- if (value.unit != CSSParserValue::Function)
- return false;
-
- return equalLettersIgnoringASCIICase(value.function->name, "-webkit-gradient(")
- || equalLettersIgnoringASCIICase(value.function->name, "-webkit-linear-gradient(")
- || equalLettersIgnoringASCIICase(value.function->name, "linear-gradient(")
- || equalLettersIgnoringASCIICase(value.function->name, "-webkit-repeating-linear-gradient(")
- || equalLettersIgnoringASCIICase(value.function->name, "repeating-linear-gradient(")
- || equalLettersIgnoringASCIICase(value.function->name, "-webkit-radial-gradient(")
- || equalLettersIgnoringASCIICase(value.function->name, "radial-gradient(")
- || equalLettersIgnoringASCIICase(value.function->name, "-webkit-repeating-radial-gradient(")
- || equalLettersIgnoringASCIICase(value.function->name, "repeating-radial-gradient(")
- || equalLettersIgnoringASCIICase(value.function->name, "-webkit-canvas(")
- || equalLettersIgnoringASCIICase(value.function->name, "cross-fade(")
- || equalLettersIgnoringASCIICase(value.function->name, "-webkit-cross-fade(")
- || equalLettersIgnoringASCIICase(value.function->name, "filter(")
- || equalLettersIgnoringASCIICase(value.function->name, "-webkit-filter(")
- || equalLettersIgnoringASCIICase(value.function->name, "-webkit-named-image(");
-}
-
-bool CSSParser::parseGeneratedImage(CSSParserValueList& valueList, RefPtr<CSSValue>& value)
-{
- CSSParserValue& parserValue = *valueList.current();
-
- if (parserValue.unit != CSSParserValue::Function)
- return false;
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "-webkit-gradient("))
- return parseDeprecatedGradient(valueList, value);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "-webkit-linear-gradient("))
- return parseDeprecatedLinearGradient(valueList, value, NonRepeating);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "linear-gradient("))
- return parseLinearGradient(valueList, value, NonRepeating);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "-webkit-repeating-linear-gradient("))
- return parseDeprecatedLinearGradient(valueList, value, Repeating);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "repeating-linear-gradient("))
- return parseLinearGradient(valueList, value, Repeating);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "-webkit-radial-gradient("))
- return parseDeprecatedRadialGradient(valueList, value, NonRepeating);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "radial-gradient("))
- return parseRadialGradient(valueList, value, NonRepeating);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "-webkit-repeating-radial-gradient("))
- return parseDeprecatedRadialGradient(valueList, value, Repeating);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "repeating-radial-gradient("))
- return parseRadialGradient(valueList, value, Repeating);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "-webkit-canvas("))
- return parseCanvas(valueList, value);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "-webkit-cross-fade("))
- return parseCrossfade(valueList, value, true);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "cross-fade("))
- return parseCrossfade(valueList, value, false);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "filter(") || equalLettersIgnoringASCIICase(parserValue.function->name, "-webkit-filter("))
- return parseFilterImage(valueList, value);
-
- if (equalLettersIgnoringASCIICase(parserValue.function->name, "-webkit-named-image("))
- return parseNamedImage(valueList, value);
-
- return false;
-}
-
-bool CSSParser::parseFilterImage(CSSParserValueList& valueList, RefPtr<CSSValue>& filter)
-{
- // Walk the arguments.
- CSSParserValueList* args = valueList.current()->function->args.get();
- if (!args)
- return false;
- CSSParserValue* value = args->current();
- if (!value)
- return false;
-
- // The first argument is the image. It is a fill image.
- RefPtr<CSSValue> imageValue;
- if (!parseFillImage(*args, imageValue)) {
- if (value->unit == CSSPrimitiveValue::CSS_STRING)
- imageValue = CSSImageValue::create(completeURL(value->string));
- else
- return false;
- }
-
- value = args->next();
-
- // Skip a comma
- if (!isComma(value))
- return false;
- value = args->next();
-
- RefPtr<CSSValueList> filterValue;
- if (!value || !parseFilter(*args, filterValue))
- return false;
- value = args->next();
-
- filter = CSSFilterImageValue::create(imageValue.releaseNonNull(), filterValue.releaseNonNull());
-
- return true;
-}
-
-bool CSSParser::parseCrossfade(CSSParserValueList& valueList, RefPtr<CSSValue>& crossfade, bool prefixed)
-{
- // Walk the arguments.
- CSSParserValueList* args = valueList.current()->function->args.get();
- if (!args || args->size() != 5)
- return false;
-
- CSSParserValue* argument = args->current();
-
- // The first argument is the "from" image. It is a fill image.
- RefPtr<CSSValue> fromImageValue;
- if (!argument || !parseFillImage(*args, fromImageValue))
- return false;
- argument = args->next();
-
- // Skip a comma
- if (!isComma(argument))
- return false;
- argument = args->next();
-
- // The second argument is the "to" image. It is a fill image.
- RefPtr<CSSValue> toImageValue;
- if (!argument || !parseFillImage(*args, toImageValue))
- return false;
- argument = args->next();
-
- // Skip a comma
- if (!isComma(argument))
- return false;
- argument = args->next();
-
- // The third argument is the crossfade value. It is a percentage or a fractional number.
- if (!argument)
- return false;
-
- RefPtr<CSSPrimitiveValue> percentage;
- if (argument->unit == CSSPrimitiveValue::CSS_PERCENTAGE)
- percentage = CSSValuePool::singleton().createValue(clampTo<double>(argument->fValue / 100, 0, 1), CSSPrimitiveValue::CSS_NUMBER);
- else if (argument->unit == CSSPrimitiveValue::CSS_NUMBER)
- percentage = CSSValuePool::singleton().createValue(clampTo<double>(argument->fValue, 0, 1), CSSPrimitiveValue::CSS_NUMBER);
- else
- return false;
-
- crossfade = CSSCrossfadeValue::create(fromImageValue.releaseNonNull(), toImageValue.releaseNonNull(), percentage.releaseNonNull(), prefixed);
-
- return true;
-}
-
-bool CSSParser::parseCanvas(CSSParserValueList& valueList, RefPtr<CSSValue>& canvas)
-{
- // Walk the arguments.
- CSSParserValueList* args = valueList.current()->function->args.get();
- if (!args || args->size() != 1)
- return false;
-
- // The first argument is the canvas name. It is an identifier.
- CSSParserValue* value = args->current();
- if (!value || value->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
-
- canvas = CSSCanvasValue::create(value->string);
- return true;
-}
-
-bool CSSParser::parseNamedImage(CSSParserValueList& valueList, RefPtr<CSSValue>& namedImage)
-{
- CSSParserValueList* args = valueList.current()->function->args.get();
- if (!args || args->size() != 1)
- return false;
-
- // The only argument is the image name.
- CSSParserValue* value = args->current();
- if (!value || value->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
-
- namedImage = CSSNamedImageValue::create(value->string);
- return true;
-}
-
-#if ENABLE(CSS_IMAGE_RESOLUTION)
-RefPtr<CSSValueList> CSSParser::parseImageResolution()
-{
- auto list = CSSValueList::createSpaceSeparated();
- bool haveResolution = false;
- bool haveFromImage = false;
- bool haveSnap = false;
-
- CSSParserValue* value = m_valueList->current();
- while (value) {
- ValueWithCalculation valueWithCalculation(*value);
- if (!haveFromImage && value->id == CSSValueFromImage) {
- list->append(CSSValuePool::singleton().createIdentifierValue(value->id));
- haveFromImage = true;
- } else if (!haveSnap && value->id == CSSValueSnap) {
- list->append(CSSValuePool::singleton().createIdentifierValue(value->id));
- haveSnap = true;
- } else if (!haveResolution && validateUnit(valueWithCalculation, FResolution | FNonNeg) && value->fValue > 0) {
- list->append(createPrimitiveNumericValue(valueWithCalculation));
- haveResolution = true;
- } else
- return nullptr;
- value = m_valueList->next();
- }
- if (!list->length())
- return nullptr;
- if (!haveFromImage && !haveResolution)
- return nullptr;
- return WTFMove(list);
-}
-#endif
-
-RefPtr<CSSImageSetValue> CSSParser::parseImageSet()
-{
- CSSParserValue& value = *m_valueList->current();
- ASSERT(value.unit == CSSParserValue::Function);
-
- CSSParserValueList* functionArgs = value.function->args.get();
- if (!functionArgs || !functionArgs->size() || !functionArgs->current())
- return nullptr;
-
- auto imageSet = CSSImageSetValue::create();
- CSSParserValue* arg = functionArgs->current();
- while (arg) {
- if (arg->unit != CSSPrimitiveValue::CSS_URI)
- return nullptr;
-
- imageSet->append(CSSImageValue::create(completeURL(arg->string)));
- arg = functionArgs->next();
- if (!arg || arg->unit != CSSPrimitiveValue::CSS_DIMENSION)
- return nullptr;
-
- double imageScaleFactor = 0;
- const String& string = arg->string;
- unsigned length = string.length();
- if (!length)
- return nullptr;
- if (string.is8Bit()) {
- const LChar* start = string.characters8();
- parseDouble(start, start + length, 'x', imageScaleFactor);
- } else {
- const UChar* start = string.characters16();
- parseDouble(start, start + length, 'x', imageScaleFactor);
- }
- if (imageScaleFactor <= 0)
- return nullptr;
- imageSet->append(CSSValuePool::singleton().createValue(imageScaleFactor, CSSPrimitiveValue::CSS_NUMBER));
-
- // If there are no more arguments, we're done.
- arg = functionArgs->next();
- if (!arg)
- break;
-
- // If there are more arguments, they should be after a comma.
- if (!isComma(arg))
- return nullptr;
-
- // Skip the comma and move on to the next argument.
- arg = functionArgs->next();
- }
-
- return WTFMove(imageSet);
-}
-
-class TransformOperationInfo {
-public:
- TransformOperationInfo(const CSSParserString& name)
- : m_type(WebKitCSSTransformValue::UnknownTransformOperation)
- , m_argCount(1)
- , m_allowSingleArgument(false)
- , m_unit(CSSParser::FUnknown)
- {
- const UChar* characters;
- unsigned nameLength = name.length();
-
- const unsigned longestNameLength = 12;
- UChar characterBuffer[longestNameLength];
- if (name.is8Bit()) {
- unsigned length = std::min(longestNameLength, nameLength);
- const LChar* characters8 = name.characters8();
- for (unsigned i = 0; i < length; ++i)
- characterBuffer[i] = characters8[i];
- characters = characterBuffer;
- } else
- characters = name.characters16();
-
- switch (nameLength) {
- case 5:
- // Valid name: skew(.
- if (((characters[0] == 's') || (characters[0] == 'S'))
- & ((characters[1] == 'k') || (characters[1] == 'K'))
- & ((characters[2] == 'e') || (characters[2] == 'E'))
- & ((characters[3] == 'w') || (characters[3] == 'W'))
- & (characters[4] == '(')) {
- m_unit = CSSParser::FAngle;
- m_type = WebKitCSSTransformValue::SkewTransformOperation;
- m_allowSingleArgument = true;
- m_argCount = 3;
- }
- break;
- case 6:
- // Valid names: skewx(, skewy(, scale(.
- if ((characters[1] == 'c') || (characters[1] == 'C')) {
- if (((characters[0] == 's') || (characters[0] == 'S'))
- & ((characters[2] == 'a') || (characters[2] == 'A'))
- & ((characters[3] == 'l') || (characters[3] == 'L'))
- & ((characters[4] == 'e') || (characters[4] == 'E'))
- & (characters[5] == '(')) {
- m_unit = CSSParser::FNumber;
- m_type = WebKitCSSTransformValue::ScaleTransformOperation;
- m_allowSingleArgument = true;
- m_argCount = 3;
- }
- } else if (((characters[0] == 's') || (characters[0] == 'S'))
- & ((characters[1] == 'k') || (characters[1] == 'K'))
- & ((characters[2] == 'e') || (characters[2] == 'E'))
- & ((characters[3] == 'w') || (characters[3] == 'W'))
- & (characters[5] == '(')) {
- if ((characters[4] == 'x') || (characters[4] == 'X')) {
- m_unit = CSSParser::FAngle;
- m_type = WebKitCSSTransformValue::SkewXTransformOperation;
- } else if ((characters[4] == 'y') || (characters[4] == 'Y')) {
- m_unit = CSSParser::FAngle;
- m_type = WebKitCSSTransformValue::SkewYTransformOperation;
- }
- }
- break;
- case 7:
- // Valid names: matrix(, rotate(, scalex(, scaley(, scalez(.
- if ((characters[0] == 'm') || (characters[0] == 'M')) {
- if (((characters[1] == 'a') || (characters[1] == 'A'))
- & ((characters[2] == 't') || (characters[2] == 'T'))
- & ((characters[3] == 'r') || (characters[3] == 'R'))
- & ((characters[4] == 'i') || (characters[4] == 'I'))
- & ((characters[5] == 'x') || (characters[5] == 'X'))
- & (characters[6] == '(')) {
- m_unit = CSSParser::FNumber;
- m_type = WebKitCSSTransformValue::MatrixTransformOperation;
- m_argCount = 11;
- }
- } else if ((characters[0] == 'r') || (characters[0] == 'R')) {
- if (((characters[1] == 'o') || (characters[1] == 'O'))
- & ((characters[2] == 't') || (characters[2] == 'T'))
- & ((characters[3] == 'a') || (characters[3] == 'A'))
- & ((characters[4] == 't') || (characters[4] == 'T'))
- & ((characters[5] == 'e') || (characters[5] == 'E'))
- & (characters[6] == '(')) {
- m_unit = CSSParser::FAngle;
- m_type = WebKitCSSTransformValue::RotateTransformOperation;
- }
- } else if (((characters[0] == 's') || (characters[0] == 'S'))
- & ((characters[1] == 'c') || (characters[1] == 'C'))
- & ((characters[2] == 'a') || (characters[2] == 'A'))
- & ((characters[3] == 'l') || (characters[3] == 'L'))
- & ((characters[4] == 'e') || (characters[4] == 'E'))
- & (characters[6] == '(')) {
- if ((characters[5] == 'x') || (characters[5] == 'X')) {
- m_unit = CSSParser::FNumber;
- m_type = WebKitCSSTransformValue::ScaleXTransformOperation;
- } else if ((characters[5] == 'y') || (characters[5] == 'Y')) {
- m_unit = CSSParser::FNumber;
- m_type = WebKitCSSTransformValue::ScaleYTransformOperation;
- } else if ((characters[5] == 'z') || (characters[5] == 'Z')) {
- m_unit = CSSParser::FNumber;
- m_type = WebKitCSSTransformValue::ScaleZTransformOperation;
- }
- }
- break;
- case 8:
- // Valid names: rotatex(, rotatey(, rotatez(, scale3d(.
- if ((characters[0] == 's') || (characters[0] == 'S')) {
- if (((characters[1] == 'c') || (characters[1] == 'C'))
- & ((characters[2] == 'a') || (characters[2] == 'A'))
- & ((characters[3] == 'l') || (characters[3] == 'L'))
- & ((characters[4] == 'e') || (characters[4] == 'E'))
- & (characters[5] == '3')
- & ((characters[6] == 'd') || (characters[6] == 'D'))
- & (characters[7] == '(')) {
- m_unit = CSSParser::FNumber;
- m_type = WebKitCSSTransformValue::Scale3DTransformOperation;
- m_argCount = 5;
- }
- } else if (((characters[0] == 'r') || (characters[0] == 'R'))
- & ((characters[1] == 'o') || (characters[1] == 'O'))
- & ((characters[2] == 't') || (characters[2] == 'T'))
- & ((characters[3] == 'a') || (characters[3] == 'A'))
- & ((characters[4] == 't') || (characters[4] == 'T'))
- & ((characters[5] == 'e') || (characters[5] == 'E'))
- & (characters[7] == '(')) {
- if ((characters[6] == 'x') || (characters[6] == 'X')) {
- m_unit = CSSParser::FAngle;
- m_type = WebKitCSSTransformValue::RotateXTransformOperation;
- } else if ((characters[6] == 'y') || (characters[6] == 'Y')) {
- m_unit = CSSParser::FAngle;
- m_type = WebKitCSSTransformValue::RotateYTransformOperation;
- } else if ((characters[6] == 'z') || (characters[6] == 'Z')) {
- m_unit = CSSParser::FAngle;
- m_type = WebKitCSSTransformValue::RotateZTransformOperation;
- }
- }
- break;
- case 9:
- // Valid names: matrix3d(, rotate3d(.
- if ((characters[0] == 'm') || (characters[0] == 'M')) {
- if (((characters[1] == 'a') || (characters[1] == 'A'))
- & ((characters[2] == 't') || (characters[2] == 'T'))
- & ((characters[3] == 'r') || (characters[3] == 'R'))
- & ((characters[4] == 'i') || (characters[4] == 'I'))
- & ((characters[5] == 'x') || (characters[5] == 'X'))
- & (characters[6] == '3')
- & ((characters[7] == 'd') || (characters[7] == 'D'))
- & (characters[8] == '(')) {
- m_unit = CSSParser::FNumber;
- m_type = WebKitCSSTransformValue::Matrix3DTransformOperation;
- m_argCount = 31;
- }
- } else if (((characters[0] == 'r') || (characters[0] == 'R'))
- & ((characters[1] == 'o') || (characters[1] == 'O'))
- & ((characters[2] == 't') || (characters[2] == 'T'))
- & ((characters[3] == 'a') || (characters[3] == 'A'))
- & ((characters[4] == 't') || (characters[4] == 'T'))
- & ((characters[5] == 'e') || (characters[5] == 'E'))
- & (characters[6] == '3')
- & ((characters[7] == 'd') || (characters[7] == 'D'))
- & (characters[8] == '(')) {
- m_unit = CSSParser::FNumber;
- m_type = WebKitCSSTransformValue::Rotate3DTransformOperation;
- m_argCount = 7;
- }
- break;
- case 10:
- // Valid name: translate(.
- if (((characters[0] == 't') || (characters[0] == 'T'))
- & ((characters[1] == 'r') || (characters[1] == 'R'))
- & ((characters[2] == 'a') || (characters[2] == 'A'))
- & ((characters[3] == 'n') || (characters[3] == 'N'))
- & ((characters[4] == 's') || (characters[4] == 'S'))
- & ((characters[5] == 'l') || (characters[5] == 'L'))
- & ((characters[6] == 'a') || (characters[6] == 'A'))
- & ((characters[7] == 't') || (characters[7] == 'T'))
- & ((characters[8] == 'e') || (characters[8] == 'E'))
- & (characters[9] == '(')) {
- m_unit = CSSParser::FLength | CSSParser::FPercent;
- m_type = WebKitCSSTransformValue::TranslateTransformOperation;
- m_allowSingleArgument = true;
- m_argCount = 3;
- }
- break;
- case 11:
- // Valid names: translatex(, translatey(, translatez(.
- if (((characters[0] == 't') || (characters[0] == 'T'))
- & ((characters[1] == 'r') || (characters[1] == 'R'))
- & ((characters[2] == 'a') || (characters[2] == 'A'))
- & ((characters[3] == 'n') || (characters[3] == 'N'))
- & ((characters[4] == 's') || (characters[4] == 'S'))
- & ((characters[5] == 'l') || (characters[5] == 'L'))
- & ((characters[6] == 'a') || (characters[6] == 'A'))
- & ((characters[7] == 't') || (characters[7] == 'T'))
- & ((characters[8] == 'e') || (characters[8] == 'E'))
- & (characters[10] == '(')) {
- if ((characters[9] == 'x') || (characters[9] == 'X')) {
- m_unit = CSSParser::FLength | CSSParser::FPercent;
- m_type = WebKitCSSTransformValue::TranslateXTransformOperation;
- } else if ((characters[9] == 'y') || (characters[9] == 'Y')) {
- m_unit = CSSParser::FLength | CSSParser::FPercent;
- m_type = WebKitCSSTransformValue::TranslateYTransformOperation;
- } else if ((characters[9] == 'z') || (characters[9] == 'Z')) {
- m_unit = CSSParser::FLength | CSSParser::FPercent;
- m_type = WebKitCSSTransformValue::TranslateZTransformOperation;
- }
- }
- break;
- case 12:
- // Valid names: perspective(, translate3d(.
- if ((characters[0] == 'p') || (characters[0] == 'P')) {
- if (((characters[1] == 'e') || (characters[1] == 'E'))
- & ((characters[2] == 'r') || (characters[2] == 'R'))
- & ((characters[3] == 's') || (characters[3] == 'S'))
- & ((characters[4] == 'p') || (characters[4] == 'P'))
- & ((characters[5] == 'e') || (characters[5] == 'E'))
- & ((characters[6] == 'c') || (characters[6] == 'C'))
- & ((characters[7] == 't') || (characters[7] == 'T'))
- & ((characters[8] == 'i') || (characters[8] == 'I'))
- & ((characters[9] == 'v') || (characters[9] == 'V'))
- & ((characters[10] == 'e') || (characters[10] == 'E'))
- & (characters[11] == '(')) {
- m_unit = CSSParser::FNumber;
- m_type = WebKitCSSTransformValue::PerspectiveTransformOperation;
- }
- } else if (((characters[0] == 't') || (characters[0] == 'T'))
- & ((characters[1] == 'r') || (characters[1] == 'R'))
- & ((characters[2] == 'a') || (characters[2] == 'A'))
- & ((characters[3] == 'n') || (characters[3] == 'N'))
- & ((characters[4] == 's') || (characters[4] == 'S'))
- & ((characters[5] == 'l') || (characters[5] == 'L'))
- & ((characters[6] == 'a') || (characters[6] == 'A'))
- & ((characters[7] == 't') || (characters[7] == 'T'))
- & ((characters[8] == 'e') || (characters[8] == 'E'))
- & (characters[9] == '3')
- & ((characters[10] == 'd') || (characters[10] == 'D'))
- & (characters[11] == '(')) {
- m_unit = CSSParser::FLength | CSSParser::FPercent;
- m_type = WebKitCSSTransformValue::Translate3DTransformOperation;
- m_argCount = 5;
- }
- break;
- } // end switch ()
- }
-
- WebKitCSSTransformValue::TransformOperationType type() const { return m_type; }
- unsigned argCount() const { return m_argCount; }
- CSSParser::Units unit() const { return m_unit; }
-
- bool unknown() const { return m_type == WebKitCSSTransformValue::UnknownTransformOperation; }
- bool hasCorrectArgCount(unsigned argCount) { return m_argCount == argCount || (m_allowSingleArgument && argCount == 1); }
-
-private:
- WebKitCSSTransformValue::TransformOperationType m_type;
- unsigned m_argCount;
- bool m_allowSingleArgument;
- CSSParser::Units m_unit;
-};
-
-RefPtr<CSSValueList> CSSParser::parseTransform()
-{
- if (!m_valueList)
- return nullptr;
-
- auto list = CSSValueList::createSpaceSeparated();
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- auto parsedTransformValue = parseTransformValue(*value);
- if (!parsedTransformValue)
- return nullptr;
-
- list->append(parsedTransformValue.releaseNonNull());
- }
-
- return WTFMove(list);
-}
-
-RefPtr<WebKitCSSTransformValue> CSSParser::parseTransformValue(CSSParserValue& value)
-{
- if (value.unit != CSSParserValue::Function || !value.function)
- return nullptr;
-
- // Every primitive requires at least one argument.
- CSSParserValueList* args = value.function->args.get();
- if (!args)
- return nullptr;
-
- // See if the specified primitive is one we understand.
- TransformOperationInfo info(value.function->name);
- if (info.unknown())
- return nullptr;
-
- if (!info.hasCorrectArgCount(args->size()))
- return nullptr;
-
- // The transform is a list of functional primitives that specify transform operations.
- // We collect a list of WebKitCSSTransformValues, where each value specifies a single operation.
-
- // Create the new WebKitCSSTransformValue for this operation and add it to our list.
- auto transformValue = WebKitCSSTransformValue::create(info.type());
-
- // Snag our values.
- CSSParserValue* argument = args->current();
- unsigned argNumber = 0;
- while (argument) {
- ValueWithCalculation argumentWithCalculation(*argument);
- CSSParser::Units unit = info.unit();
-
- if (info.type() == WebKitCSSTransformValue::Rotate3DTransformOperation && argNumber == 3) {
- // 4th param of rotate3d() is an angle rather than a bare number, validate it as such
- if (!validateUnit(argumentWithCalculation, FAngle, HTMLStandardMode))
- return nullptr;
- } else if (info.type() == WebKitCSSTransformValue::Translate3DTransformOperation && argNumber == 2) {
- // 3rd param of translate3d() cannot be a percentage
- if (!validateUnit(argumentWithCalculation, FLength, HTMLStandardMode))
- return nullptr;
- } else if (info.type() == WebKitCSSTransformValue::TranslateZTransformOperation && !argNumber) {
- // 1st param of translateZ() cannot be a percentage
- if (!validateUnit(argumentWithCalculation, FLength, HTMLStandardMode))
- return nullptr;
- } else if (info.type() == WebKitCSSTransformValue::PerspectiveTransformOperation && !argNumber) {
- // 1st param of perspective() must be a non-negative number (deprecated) or length.
- if (!validateUnit(argumentWithCalculation, FNumber | FLength | FNonNeg, HTMLStandardMode))
- return nullptr;
- } else if (!validateUnit(argumentWithCalculation, unit, HTMLStandardMode))
- return nullptr;
-
- // Add the value to the current transform operation.
- transformValue->append(createPrimitiveNumericValue(argumentWithCalculation));
-
- argument = args->next();
- if (!argument)
- break;
- if (argument->unit != CSSParserValue::Operator || argument->iValue != ',')
- return nullptr;
- argument = args->next();
-
- ++argNumber;
- }
-
- return WTFMove(transformValue);
-}
-
-bool CSSParser::isBlendMode(CSSValueID valueID)
-{
- return (valueID >= CSSValueMultiply && valueID <= CSSValueLuminosity)
- || valueID == CSSValueNormal
- || valueID == CSSValueOverlay;
-}
-
-bool CSSParser::isCompositeOperator(CSSValueID valueID)
-{
- // FIXME: Add CSSValueDestination and CSSValueLighter when the Compositing spec updates.
- return valueID >= CSSValueClear && valueID <= CSSValueXor;
-}
-
-static bool isValidPrimitiveFilterFunction(CSSValueID filterFunction)
-{
- switch (filterFunction) {
- case CSSValueBlur:
- case CSSValueBrightness:
- case CSSValueContrast:
- case CSSValueDropShadow:
- case CSSValueGrayscale:
- case CSSValueHueRotate:
- case CSSValueInvert:
- case CSSValueOpacity:
- case CSSValueSaturate:
- case CSSValueSepia:
- return true;
- default:
- return false;
- }
-}
-
-RefPtr<CSSFunctionValue> CSSParser::parseBuiltinFilterArguments(CSSValueID filterFunction, CSSParserValueList& args)
-{
- ASSERT(isValidPrimitiveFilterFunction(filterFunction));
- auto filterValue = CSSFunctionValue::create(filterFunction);
-
- switch (filterFunction) {
- case CSSValueGrayscale:
- case CSSValueSepia:
- case CSSValueSaturate:
- case CSSValueInvert:
- case CSSValueOpacity:
- case CSSValueContrast: {
- // One optional argument, 0-1 or 0%-100%, if missing use 100%.
- if (args.size() > 1)
- return nullptr;
-
- if (args.size()) {
- ValueWithCalculation argumentWithCalculation(*args.current());
- if (!validateUnit(argumentWithCalculation, FNumber | FPercent | FNonNeg, HTMLStandardMode))
- return nullptr;
-
- auto primitiveValue = createPrimitiveNumericValue(argumentWithCalculation);
-
- // Saturate and contrast allow values over 100%. Otherwise clamp.
- if (filterFunction != CSSValueSaturate && filterFunction != CSSValueContrast) {
- double maxAllowed = primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_PERCENTAGE ? 100.0 : 1.0;
- if (primitiveValue->doubleValue() > maxAllowed)
- primitiveValue = CSSValuePool::singleton().createValue(maxAllowed, static_cast<CSSPrimitiveValue::UnitTypes>(primitiveValue->primitiveType()));
- }
-
- filterValue->append(WTFMove(primitiveValue));
- }
- break;
- }
- case CSSValueBrightness: {
- // One optional argument, if missing use 100%.
- if (args.size() > 1)
- return nullptr;
-
- if (args.size()) {
- ValueWithCalculation argumentWithCalculation(*args.current());
- if (!validateUnit(argumentWithCalculation, FNumber | FPercent, HTMLStandardMode))
- return nullptr;
-
- filterValue->append(createPrimitiveNumericValue(argumentWithCalculation));
- }
- break;
- }
- case CSSValueHueRotate: {
- // hue-rotate() takes one optional angle.
- if (args.size() > 1)
- return nullptr;
-
- if (args.size()) {
- ValueWithCalculation argumentWithCalculation(*args.current());
- if (!validateUnit(argumentWithCalculation, FAngle, HTMLStandardMode))
- return nullptr;
-
- filterValue->append(createPrimitiveNumericValue(argumentWithCalculation));
- }
- break;
- }
- case CSSValueBlur: {
- // Blur takes a single length. Zero parameters are allowed.
- if (args.size() > 1)
- return nullptr;
-
- if (args.size()) {
- ValueWithCalculation argumentWithCalculation(*args.current());
- if (!validateUnit(argumentWithCalculation, FLength | FNonNeg, HTMLStandardMode))
- return nullptr;
-
- filterValue->append(createPrimitiveNumericValue(argumentWithCalculation));
- }
- break;
- }
- case CSSValueDropShadow: {
- // drop-shadow() takes a single shadow.
- RefPtr<CSSValueList> shadowValueList = parseShadow(args, CSSPropertyFilter);
- if (!shadowValueList || shadowValueList->length() != 1)
- return nullptr;
-
- filterValue->append(*shadowValueList->itemWithoutBoundsCheck(0));
- break;
- }
- default:
- ASSERT_NOT_REACHED();
- }
-
- // In all cases there should be nothing left over in the function.
- auto nextArgument = args.next();
- if (nextArgument)
- return nullptr;
-
- return WTFMove(filterValue);
-}
-
-// FIXME-NEWPARSER: The code for this is at the end of the file. Since this is only
-// needed while using cssValueKeywordIDForFunctionName for the old CSS parser, I just
-// declared it here.
-template <typename CharacterType> static CSSValueID cssValueKeywordID(const CharacterType* valueKeyword, unsigned length);
-
-static CSSValueID cssValueKeywordIDForFunctionName(const CSSParserString& string)
-{
- // FIXME-NEWPARSER: We can remove this when the new CSS parser is
- // enabled and just use cssValueKeywordID. This is just covering
- // the old parser's crazy behavior of including the '(' in the
- // function->name.
- unsigned length = string.length();
- if (length < 2 || length > maxCSSValueKeywordLength)
- return CSSValueInvalid;
-
- return string.is8Bit() ? cssValueKeywordID(string.characters8(), length - 1) : cssValueKeywordID(string.characters16(), length - 1);
-}
-
-bool CSSParser::parseFilter(CSSParserValueList& valueList, RefPtr<CSSValueList>& result)
-{
- // The filter is a list of functional primitives that specify individual operations.
- auto list = CSSValueList::createSpaceSeparated();
- for (auto* value = valueList.current(); value; value = valueList.next()) {
- if (value->unit != CSSPrimitiveValue::CSS_URI && (value->unit != CSSParserValue::Function || !value->function))
- return false;
-
- // See if the specified primitive is one we understand.
- if (value->unit == CSSPrimitiveValue::CSS_URI)
- list->append(CSSPrimitiveValue::create(value->string, CSSPrimitiveValue::CSS_URI));
- else {
- CSSValueID filterFunction = cssValueKeywordIDForFunctionName(value->function->name);
-
- if (!isValidPrimitiveFilterFunction(filterFunction))
- return false;
-
- CSSParserValueList* args = value->function->args.get();
- if (!args)
- return false;
-
- RefPtr<CSSFunctionValue> filterValue = parseBuiltinFilterArguments(filterFunction, *args);
- if (!filterValue)
- return false;
-
- list->append(filterValue.releaseNonNull());
- }
- }
-
- result = WTFMove(list);
-
- return true;
-}
-
-#if ENABLE(CSS_REGIONS)
-static bool validFlowName(const String& flowName)
-{
- return !(equalLettersIgnoringASCIICase(flowName, "auto")
- || equalLettersIgnoringASCIICase(flowName, "default")
- || equalLettersIgnoringASCIICase(flowName, "inherit")
- || equalLettersIgnoringASCIICase(flowName, "initial")
- || equalLettersIgnoringASCIICase(flowName, "none"));
-}
-#endif
-
-#if ENABLE(TEXT_AUTOSIZING)
-bool CSSParser::isTextAutosizingEnabled() const
-{
- return m_context.textAutosizingEnabled;
-}
-#endif
-
-#if ENABLE(CSS_GRID_LAYOUT)
-bool CSSParser::isCSSGridLayoutEnabled() const
-{
- return m_context.cssGridLayoutEnabled;
-}
-#endif
-
-#if ENABLE(CSS_REGIONS)
-
-// none | <ident>
-bool CSSParser::parseFlowThread(CSSPropertyID propId, bool important)
-{
- ASSERT(propId == CSSPropertyWebkitFlowInto);
-
- if (m_valueList->size() != 1)
- return false;
-
- CSSParserValue* value = m_valueList->current();
- if (!value)
- return false;
-
- if (value->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
-
- if (value->id == CSSValueNone) {
- addProperty(propId, CSSValuePool::singleton().createIdentifierValue(value->id), important);
- return true;
- }
-
- String inputProperty = String(value->string);
- if (!inputProperty.isEmpty()) {
- if (!validFlowName(inputProperty))
- return false;
- addProperty(propId, CSSValuePool::singleton().createValue(inputProperty, CSSPrimitiveValue::CSS_STRING), important);
- } else
- addProperty(propId, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
-
- return true;
-}
-
-// -webkit-flow-from: none | <ident>
-bool CSSParser::parseRegionThread(CSSPropertyID propId, bool important)
-{
- ASSERT(propId == CSSPropertyWebkitFlowFrom);
-
- if (m_valueList->size() != 1)
- return false;
-
- CSSParserValue* value = m_valueList->current();
- if (!value)
- return false;
-
- if (value->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
-
- if (value->id == CSSValueNone)
- addProperty(propId, CSSValuePool::singleton().createIdentifierValue(value->id), important);
- else {
- String inputProperty = String(value->string);
- if (!inputProperty.isEmpty()) {
- if (!validFlowName(inputProperty))
- return false;
- addProperty(propId, CSSValuePool::singleton().createValue(inputProperty, CSSPrimitiveValue::CSS_STRING), important);
- } else
- addProperty(propId, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- }
-
- return true;
-}
-#endif
-
-bool CSSParser::parseTransformOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, CSSPropertyID& propId3, RefPtr<CSSPrimitiveValue>& value, RefPtr<CSSPrimitiveValue>& value2, RefPtr<CSSValue>& value3)
-{
- propId1 = propId;
- propId2 = propId;
- propId3 = propId;
- if (propId == CSSPropertyTransformOrigin) {
- propId1 = CSSPropertyTransformOriginX;
- propId2 = CSSPropertyTransformOriginY;
- propId3 = CSSPropertyTransformOriginZ;
- }
-
- switch (propId) {
- case CSSPropertyTransformOrigin:
- if (!parseTransformOriginShorthand(value, value2, value3))
- return false;
- // parseTransformOriginShorthand advances the m_valueList pointer
- break;
- case CSSPropertyTransformOriginX: {
- value = parsePositionX(*m_valueList);
- if (value)
- m_valueList->next();
- break;
- }
- case CSSPropertyTransformOriginY: {
- value = parsePositionY(*m_valueList);
- if (value)
- m_valueList->next();
- break;
- }
- case CSSPropertyTransformOriginZ: {
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
- if (validateUnit(valueWithCalculation, FLength))
- value = createPrimitiveNumericValue(valueWithCalculation);
- if (value)
- m_valueList->next();
- break;
- }
- default:
- ASSERT_NOT_REACHED();
- return false;
- }
-
- return value;
-}
-
-bool CSSParser::parsePerspectiveOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtr<CSSPrimitiveValue>& value, RefPtr<CSSPrimitiveValue>& value2)
-{
- propId1 = propId;
- propId2 = propId;
- if (propId == CSSPropertyPerspectiveOrigin) {
- propId1 = CSSPropertyPerspectiveOriginX;
- propId2 = CSSPropertyPerspectiveOriginY;
- }
-
- switch (propId) {
- case CSSPropertyPerspectiveOrigin:
- if (m_valueList->size() > 2)
- return false;
- parse2ValuesFillPosition(*m_valueList, value, value2);
- break;
- case CSSPropertyPerspectiveOriginX: {
- value = parsePositionX(*m_valueList);
- if (value)
- m_valueList->next();
- break;
- }
- case CSSPropertyPerspectiveOriginY: {
- value = parsePositionY(*m_valueList);
- if (value)
- m_valueList->next();
- break;
- }
- default:
- ASSERT_NOT_REACHED();
- return false;
- }
-
- return value;
-}
-
-void CSSParser::addTextDecorationProperty(CSSPropertyID propId, RefPtr<CSSValue>&& value, bool important)
-{
- // The text-decoration-line property takes priority over text-decoration, unless the latter has important priority set.
- if (propId == CSSPropertyTextDecoration && !important && !inShorthand()) {
- for (unsigned i = 0; i < m_parsedProperties.size(); ++i) {
- if (m_parsedProperties[i].id() == CSSPropertyWebkitTextDecorationLine)
- return;
- }
- }
- addProperty(propId, WTFMove(value), important);
-}
-
-bool CSSParser::parseTextDecoration(CSSPropertyID propId, bool important)
-{
- CSSParserValue* value = m_valueList->current();
- if (value && value->id == CSSValueNone) {
- addTextDecorationProperty(propId, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- m_valueList->next();
- return true;
- }
-
- auto list = CSSValueList::createSpaceSeparated();
- bool isValid = true;
- while (isValid && value) {
- switch (value->id) {
- case CSSValueBlink:
- case CSSValueLineThrough:
- case CSSValueOverline:
- case CSSValueUnderline:
-#if ENABLE(LETTERPRESS)
- case CSSValueWebkitLetterpress:
-#endif
- list->append(CSSValuePool::singleton().createIdentifierValue(value->id));
- break;
- default:
- isValid = false;
- break;
- }
- if (isValid)
- value = m_valueList->next();
- }
-
- // Values are either valid or in shorthand scope.
- if (list->length() && (isValid || inShorthand())) {
- addTextDecorationProperty(propId, WTFMove(list), important);
- return true;
- }
-
- return false;
-}
-
-bool CSSParser::parseTextDecorationSkip(bool important)
-{
- // The text-decoration-skip property has syntax "none | [ objects || spaces || ink || edges || box-decoration ]".
- // However, only 'none' and 'ink' are implemented yet, so we will parse syntax "none | ink" for now.
- CSSParserValue* value = m_valueList->current();
- if (value && value->id == CSSValueNone) {
- addProperty(CSSPropertyWebkitTextDecorationSkip, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- m_valueList->next();
- return true;
- }
-
- RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
-
- do {
- switch (value->id) {
- case CSSValueAuto:
- case CSSValueInk:
- case CSSValueObjects: {
- auto singleValue = CSSValuePool::singleton().createIdentifierValue(value->id);
- if (list->hasValue(singleValue.ptr()))
- return false;
- list->append(WTFMove(singleValue));
- break;
- }
- default:
- return false;
- }
- } while ((value = m_valueList->next()));
-
- if (!list->length())
- return false;
-
- addProperty(CSSPropertyWebkitTextDecorationSkip, list.releaseNonNull(), important);
- m_valueList->next();
- return true;
-}
-
-bool CSSParser::parseTextUnderlinePosition(bool important)
-{
- // The text-underline-position property has sintax "auto | alphabetic | [ under || [ left | right ] ]".
- // However, values 'left' and 'right' are not implemented yet, so we will parse sintax
- // "auto | alphabetic | under" for now.
- CSSParserValue& value = *m_valueList->current();
- switch (value.id) {
- case CSSValueAuto:
- case CSSValueAlphabetic:
- case CSSValueUnder:
- if (m_valueList->next())
- return false;
-
- addProperty(CSSPropertyWebkitTextUnderlinePosition, CSSValuePool::singleton().createIdentifierValue(value.id), important);
- return true;
- default:
- break;
- }
- return false;
-}
-
-bool CSSParser::parseTextEmphasisStyle(bool important)
-{
- unsigned valueListSize = m_valueList->size();
-
- RefPtr<CSSPrimitiveValue> fill;
- RefPtr<CSSPrimitiveValue> shape;
-
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- if (value->unit == CSSPrimitiveValue::CSS_STRING) {
- if (fill || shape || (valueListSize != 1 && !inShorthand()))
- return false;
- addProperty(CSSPropertyWebkitTextEmphasisStyle, createPrimitiveStringValue(*value), important);
- m_valueList->next();
- return true;
- }
-
- if (value->id == CSSValueNone) {
- if (fill || shape || (valueListSize != 1 && !inShorthand()))
- return false;
- addProperty(CSSPropertyWebkitTextEmphasisStyle, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- m_valueList->next();
- return true;
- }
-
- if (value->id == CSSValueOpen || value->id == CSSValueFilled) {
- if (fill)
- return false;
- fill = CSSValuePool::singleton().createIdentifierValue(value->id);
- } else if (value->id == CSSValueDot || value->id == CSSValueCircle || value->id == CSSValueDoubleCircle || value->id == CSSValueTriangle || value->id == CSSValueSesame) {
- if (shape)
- return false;
- shape = CSSValuePool::singleton().createIdentifierValue(value->id);
- } else if (!inShorthand())
- return false;
- else
- break;
- }
-
- if (fill && shape) {
- auto parsedValues = CSSValueList::createSpaceSeparated();
- parsedValues->append(fill.releaseNonNull());
- parsedValues->append(shape.releaseNonNull());
- addProperty(CSSPropertyWebkitTextEmphasisStyle, WTFMove(parsedValues), important);
- return true;
- }
- if (fill) {
- addProperty(CSSPropertyWebkitTextEmphasisStyle, fill.releaseNonNull(), important);
- return true;
- }
- if (shape) {
- addProperty(CSSPropertyWebkitTextEmphasisStyle, shape.releaseNonNull(), important);
- return true;
- }
-
- return false;
-}
-
-bool CSSParser::parseTextEmphasisPosition(bool important)
-{
- bool foundOverOrUnder = false;
- CSSValueID overUnderValueID = CSSValueOver;
- bool foundLeftOrRight = false;
- CSSValueID leftRightValueID = CSSValueRight;
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- switch (value->id) {
- case CSSValueOver:
- if (foundOverOrUnder)
- return false;
- foundOverOrUnder = true;
- overUnderValueID = CSSValueOver;
- break;
- case CSSValueUnder:
- if (foundOverOrUnder)
- return false;
- foundOverOrUnder = true;
- overUnderValueID = CSSValueUnder;
- break;
- case CSSValueLeft:
- if (foundLeftOrRight)
- return false;
- foundLeftOrRight = true;
- leftRightValueID = CSSValueLeft;
- break;
- case CSSValueRight:
- if (foundLeftOrRight)
- return false;
- foundLeftOrRight = true;
- leftRightValueID = CSSValueRight;
- break;
- default:
- return false;
- }
- }
- if (!foundOverOrUnder)
- return false;
- auto list = CSSValueList::createSpaceSeparated();
- list->append(CSSValuePool::singleton().createIdentifierValue(overUnderValueID));
- if (foundLeftOrRight)
- list->append(CSSValuePool::singleton().createIdentifierValue(leftRightValueID));
- addProperty(CSSPropertyWebkitTextEmphasisPosition, WTFMove(list), important);
- return true;
-}
-
-RefPtr<CSSValueList> CSSParser::parseTextIndent()
-{
- // <length> | <percentage> | inherit when CSS3_TEXT is disabled.
- // [ <length> | <percentage> ] && [ -webkit-hanging || -webkit-each-line ]? | inherit when CSS3_TEXT is enabled.
- auto list = CSSValueList::createSpaceSeparated();
- bool hasLengthOrPercentage = false;
-#if ENABLE(CSS3_TEXT)
- bool hasEachLine = false;
- bool hasHanging = false;
-#endif
-
- CSSParserValue* value = m_valueList->current();
- while (value) {
- ValueWithCalculation valueWithCalculation(*value);
- if (!hasLengthOrPercentage && validateUnit(valueWithCalculation, FLength | FPercent)) {
- list->append(createPrimitiveNumericValue(valueWithCalculation));
- hasLengthOrPercentage = true;
- }
-#if ENABLE(CSS3_TEXT)
- else if (!hasEachLine && value->id == CSSValueWebkitEachLine) {
- list->append(CSSValuePool::singleton().createIdentifierValue(CSSValueWebkitEachLine));
- hasEachLine = true;
- } else if (!hasHanging && value->id == CSSValueWebkitHanging) {
- list->append(CSSValuePool::singleton().createIdentifierValue(CSSValueWebkitHanging));
- hasHanging = true;
- }
-#endif
- else
- return nullptr;
-
- value = m_valueList->next();
- }
-
- if (!hasLengthOrPercentage)
- return nullptr;
-
- return WTFMove(list);
-}
-
-bool CSSParser::parseHangingPunctuation(bool important)
-{
- CSSParserValue* value = m_valueList->current();
- if (value && value->id == CSSValueNone) {
- addProperty(CSSPropertyHangingPunctuation, CSSValuePool::singleton().createIdentifierValue(CSSValueNone), important);
- m_valueList->next();
- return true;
- }
-
- auto list = CSSValueList::createSpaceSeparated();
- bool isValid = true;
- std::bitset<numCSSValueKeywords> seenValues;
- while (isValid && value) {
- if (seenValues[value->id]
- || (value->id == CSSValueAllowEnd && seenValues[CSSValueForceEnd])
- || (value->id == CSSValueForceEnd && seenValues[CSSValueAllowEnd])) {
- isValid = false;
- break;
- }
- switch (value->id) {
- case CSSValueAllowEnd:
- case CSSValueFirst:
- case CSSValueForceEnd:
- case CSSValueLast:
- list->append(CSSValuePool::singleton().createIdentifierValue(value->id));
- seenValues.set(value->id);
- break;
- default:
- isValid = false;
- break;
- }
- if (isValid)
- value = m_valueList->next();
- }
-
- // Values are either valid or in shorthand scope.
- if (list->length() && isValid) {
- addProperty(CSSPropertyHangingPunctuation, WTFMove(list), important);
- return true;
- }
-
- return false;
-}
-
-bool CSSParser::parseLineBoxContain(bool important)
-{
- LineBoxContain lineBoxContain = LineBoxContainNone;
-
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- if (value->id == CSSValueBlock) {
- if (lineBoxContain & LineBoxContainBlock)
- return false;
- lineBoxContain |= LineBoxContainBlock;
- } else if (value->id == CSSValueInline) {
- if (lineBoxContain & LineBoxContainInline)
- return false;
- lineBoxContain |= LineBoxContainInline;
- } else if (value->id == CSSValueFont) {
- if (lineBoxContain & LineBoxContainFont)
- return false;
- lineBoxContain |= LineBoxContainFont;
- } else if (value->id == CSSValueGlyphs) {
- if (lineBoxContain & LineBoxContainGlyphs)
- return false;
- lineBoxContain |= LineBoxContainGlyphs;
- } else if (value->id == CSSValueReplaced) {
- if (lineBoxContain & LineBoxContainReplaced)
- return false;
- lineBoxContain |= LineBoxContainReplaced;
- } else if (value->id == CSSValueInlineBox) {
- if (lineBoxContain & LineBoxContainInlineBox)
- return false;
- lineBoxContain |= LineBoxContainInlineBox;
- } else if (value->id == CSSValueInitialLetter) {
- if (lineBoxContain & LineBoxContainInitialLetter)
- return false;
- lineBoxContain |= LineBoxContainInitialLetter;
- } else
- return false;
- }
-
- if (!lineBoxContain)
- return false;
-
- addProperty(CSSPropertyWebkitLineBoxContain, CSSLineBoxContainValue::create(lineBoxContain), important);
- return true;
-}
-
-bool CSSParser::parseFontFeatureTag(CSSValueList& settings)
-{
- CSSParserValue* value = m_valueList->current();
- // Feature tag name comes first
- if (value->unit != CSSPrimitiveValue::CSS_STRING)
- return false;
- FontTag tag;
- if (value->string.length() != tag.size())
- return false;
- for (unsigned i = 0; i < tag.size(); ++i) {
- // Limits the range of characters to 0x20-0x7E, following the tag name rules defiend in the OpenType specification.
- UChar character = value->string[i];
- if (character < 0x20 || character > 0x7E)
- return false;
- tag[i] = toASCIILower(character);
- }
-
- int tagValue = 1;
- // Feature tag values could follow: <integer> | on | off
- value = m_valueList->next();
- if (value) {
- if (value->unit == CSSPrimitiveValue::CSS_NUMBER && value->isInt && value->fValue >= 0) {
- tagValue = clampToInteger(value->fValue);
- if (tagValue < 0)
- return false;
- m_valueList->next();
- } else if (value->id == CSSValueOn || value->id == CSSValueOff) {
- tagValue = value->id == CSSValueOn;
- m_valueList->next();
- }
- }
- settings.append(CSSFontFeatureValue::create(WTFMove(tag), tagValue));
- return true;
-}
-
-bool CSSParser::parseFontFeatureSettings(bool important)
-{
- if (m_valueList->size() == 1 && m_valueList->current()->id == CSSValueNormal) {
- auto normalValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
- m_valueList->next();
- addProperty(CSSPropertyFontFeatureSettings, WTFMove(normalValue), important);
- return true;
- }
-
- auto settings = CSSValueList::createCommaSeparated();
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- if (!parseFontFeatureTag(settings))
- return false;
-
- // If the list isn't parsed fully, the current value should be comma.
- value = m_valueList->current();
- if (value && !isComma(value))
- return false;
- }
- if (settings->length()) {
- addProperty(CSSPropertyFontFeatureSettings, WTFMove(settings), important);
- return true;
- }
- return false;
-}
-
-#if ENABLE(VARIATION_FONTS)
-bool CSSParser::parseFontVariationTag(CSSValueList& settings)
-{
- CSSParserValue* value = m_valueList->current();
- // Feature tag name comes first
- if (value->unit != CSSPrimitiveValue::CSS_STRING)
- return false;
- FontTag tag;
- if (value->string.length() != tag.size())
- return false;
- for (unsigned i = 0; i < tag.size(); ++i) {
- // Limits the range of characters to 0x20-0x7E, following the tag name rules defiend in the OpenType specification.
- UChar character = value->string[i];
- if (character < 0x20 || character > 0x7E)
- return false;
- tag[i] = character;
- }
-
- value = m_valueList->next();
- if (!value || value->unit != CSSPrimitiveValue::CSS_NUMBER)
- return false;
-
- float tagValue = value->fValue;
- m_valueList->next();
-
- settings.append(CSSFontVariationValue::create(tag, tagValue));
- return true;
-}
-
-bool CSSParser::parseFontVariationSettings(bool important)
-{
- if (m_valueList->size() == 1 && m_valueList->current()->id == CSSValueNormal) {
- auto normalValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
- m_valueList->next();
- addProperty(CSSPropertyFontVariationSettings, WTFMove(normalValue), important);
- return true;
- }
-
- auto settings = CSSValueList::createCommaSeparated();
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- if (!parseFontVariationTag(settings))
- return false;
-
- // If the list isn't parsed fully, the current value should be comma.
- value = m_valueList->current();
- if (value && !isComma(value))
- return false;
- }
- if (settings->length()) {
- addProperty(CSSPropertyFontVariationSettings, WTFMove(settings), important);
- return true;
- }
- return false;
-}
-#endif // ENABLE(VARIATION_FONTS)
-
-bool CSSParser::parseFontVariantLigatures(bool important, bool unknownIsFailure, bool implicit)
-{
- auto values = CSSValueList::createSpaceSeparated();
- FontVariantLigatures commonLigatures = FontVariantLigatures::Normal;
- FontVariantLigatures discretionaryLigatures = FontVariantLigatures::Normal;
- FontVariantLigatures historicalLigatures = FontVariantLigatures::Normal;
- FontVariantLigatures contextualAlternates = FontVariantLigatures::Normal;
-
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- if (value->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
-
- switch (value->id) {
- case CSSValueNoCommonLigatures:
- commonLigatures = FontVariantLigatures::No;
- break;
- case CSSValueCommonLigatures:
- commonLigatures = FontVariantLigatures::Yes;
- break;
- case CSSValueNoDiscretionaryLigatures:
- discretionaryLigatures = FontVariantLigatures::No;
- break;
- case CSSValueDiscretionaryLigatures:
- discretionaryLigatures = FontVariantLigatures::Yes;
- break;
- case CSSValueNoHistoricalLigatures:
- historicalLigatures = FontVariantLigatures::No;
- break;
- case CSSValueHistoricalLigatures:
- historicalLigatures = FontVariantLigatures::Yes;
- break;
- case CSSValueContextual:
- contextualAlternates = FontVariantLigatures::Yes;
- break;
- case CSSValueNoContextual:
- contextualAlternates = FontVariantLigatures::No;
- break;
- default:
- if (unknownIsFailure)
- return false;
- continue;
- }
- }
-
- switch (commonLigatures) {
- case FontVariantLigatures::Normal:
- break;
- case FontVariantLigatures::Yes:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueCommonLigatures));
- break;
- case FontVariantLigatures::No:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueNoCommonLigatures));
- break;
- }
-
- switch (discretionaryLigatures) {
- case FontVariantLigatures::Normal:
- break;
- case FontVariantLigatures::Yes:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueDiscretionaryLigatures));
- break;
- case FontVariantLigatures::No:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueNoDiscretionaryLigatures));
- break;
- }
-
- switch (historicalLigatures) {
- case FontVariantLigatures::Normal:
- break;
- case FontVariantLigatures::Yes:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueHistoricalLigatures));
- break;
- case FontVariantLigatures::No:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueNoHistoricalLigatures));
- break;
- }
-
- switch (contextualAlternates) {
- case FontVariantLigatures::Normal:
- break;
- case FontVariantLigatures::Yes:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueContextual));
- break;
- case FontVariantLigatures::No:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueNoContextual));
- break;
- }
-
- if (!values->length())
- return !unknownIsFailure;
-
- addProperty(CSSPropertyFontVariantLigatures, WTFMove(values), important, implicit);
- return true;
-}
-
-bool CSSParser::parseFontVariantNumeric(bool important, bool unknownIsFailure, bool implicit)
-{
- auto values = CSSValueList::createSpaceSeparated();
- FontVariantNumericFigure figure = FontVariantNumericFigure::Normal;
- FontVariantNumericSpacing spacing = FontVariantNumericSpacing::Normal;
- FontVariantNumericFraction fraction = FontVariantNumericFraction::Normal;
- FontVariantNumericOrdinal ordinal = FontVariantNumericOrdinal::Normal;
- FontVariantNumericSlashedZero slashedZero = FontVariantNumericSlashedZero::Normal;
-
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- if (value->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
-
- switch (value->id) {
- case CSSValueLiningNums:
- figure = FontVariantNumericFigure::LiningNumbers;
- break;
- case CSSValueOldstyleNums:
- figure = FontVariantNumericFigure::OldStyleNumbers;
- break;
- case CSSValueProportionalNums:
- spacing = FontVariantNumericSpacing::ProportionalNumbers;
- break;
- case CSSValueTabularNums:
- spacing = FontVariantNumericSpacing::TabularNumbers;
- break;
- case CSSValueDiagonalFractions:
- fraction = FontVariantNumericFraction::DiagonalFractions;
- break;
- case CSSValueStackedFractions:
- fraction = FontVariantNumericFraction::StackedFractions;
- break;
- case CSSValueOrdinal:
- ordinal = FontVariantNumericOrdinal::Yes;
- break;
- case CSSValueSlashedZero:
- slashedZero = FontVariantNumericSlashedZero::Yes;
- break;
- default:
- if (unknownIsFailure)
- return false;
- continue;
- }
- }
-
- switch (figure) {
- case FontVariantNumericFigure::Normal:
- break;
- case FontVariantNumericFigure::LiningNumbers:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueLiningNums));
- break;
- case FontVariantNumericFigure::OldStyleNumbers:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueOldstyleNums));
- break;
- }
-
- switch (spacing) {
- case FontVariantNumericSpacing::Normal:
- break;
- case FontVariantNumericSpacing::ProportionalNumbers:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueProportionalNums));
- break;
- case FontVariantNumericSpacing::TabularNumbers:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueTabularNums));
- break;
- }
-
- switch (fraction) {
- case FontVariantNumericFraction::Normal:
- break;
- case FontVariantNumericFraction::DiagonalFractions:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueDiagonalFractions));
- break;
- case FontVariantNumericFraction::StackedFractions:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueStackedFractions));
- break;
- }
-
- switch (ordinal) {
- case FontVariantNumericOrdinal::Normal:
- break;
- case FontVariantNumericOrdinal::Yes:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueOrdinal));
- break;
- }
-
- switch (slashedZero) {
- case FontVariantNumericSlashedZero::Normal:
- break;
- case FontVariantNumericSlashedZero::Yes:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueSlashedZero));
- break;
- }
-
- if (!values->length())
- return !unknownIsFailure;
-
- addProperty(CSSPropertyFontVariantNumeric, WTFMove(values), important, implicit);
- return true;
-}
-
-bool CSSParser::parseFontVariantEastAsian(bool important, bool unknownIsFailure, bool implicit)
-{
- auto values = CSSValueList::createSpaceSeparated();
- FontVariantEastAsianVariant variant = FontVariantEastAsianVariant::Normal;
- FontVariantEastAsianWidth width = FontVariantEastAsianWidth::Normal;
- FontVariantEastAsianRuby ruby = FontVariantEastAsianRuby::Normal;
-
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- if (value->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
-
- switch (value->id) {
- case CSSValueJis78:
- variant = FontVariantEastAsianVariant::Jis78;
- break;
- case CSSValueJis83:
- variant = FontVariantEastAsianVariant::Jis83;
- break;
- case CSSValueJis90:
- variant = FontVariantEastAsianVariant::Jis90;
- break;
- case CSSValueJis04:
- variant = FontVariantEastAsianVariant::Jis04;
- break;
- case CSSValueSimplified:
- variant = FontVariantEastAsianVariant::Simplified;
- break;
- case CSSValueTraditional:
- variant = FontVariantEastAsianVariant::Traditional;
- break;
- case CSSValueFullWidth:
- width = FontVariantEastAsianWidth::Full;
- break;
- case CSSValueProportionalWidth:
- width = FontVariantEastAsianWidth::Proportional;
- break;
- case CSSValueRuby:
- ruby = FontVariantEastAsianRuby::Yes;
- break;
- default:
- if (unknownIsFailure)
- return false;
- continue;
- }
- }
-
- switch (variant) {
- case FontVariantEastAsianVariant::Normal:
- break;
- case FontVariantEastAsianVariant::Jis78:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis78));
- break;
- case FontVariantEastAsianVariant::Jis83:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis83));
- break;
- case FontVariantEastAsianVariant::Jis90:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis90));
- break;
- case FontVariantEastAsianVariant::Jis04:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis04));
- break;
- case FontVariantEastAsianVariant::Simplified:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueSimplified));
- break;
- case FontVariantEastAsianVariant::Traditional:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueTraditional));
- break;
- }
-
- switch (width) {
- case FontVariantEastAsianWidth::Normal:
- break;
- case FontVariantEastAsianWidth::Full:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueFullWidth));
- break;
- case FontVariantEastAsianWidth::Proportional:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueProportionalWidth));
- break;
- }
-
- switch (ruby) {
- case FontVariantEastAsianRuby::Normal:
- break;
- case FontVariantEastAsianRuby::Yes:
- values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueRuby));
- }
-
- if (!values->length())
- return !unknownIsFailure;
-
- addProperty(CSSPropertyFontVariantEastAsian, WTFMove(values), important, implicit);
- return true;
-}
-
-bool CSSParser::parseFontVariant(bool important)
-{
- ShorthandScope scope(this, CSSPropertyFontVariant);
- if (!parseFontVariantLigatures(important, false, false))
- return false;
- m_valueList->setCurrentIndex(0);
- if (!parseFontVariantNumeric(important, false, false))
- return false;
- m_valueList->setCurrentIndex(0);
- if (!parseFontVariantEastAsian(important, false, false))
- return false;
- m_valueList->setCurrentIndex(0);
-
- FontVariantPosition position = FontVariantPosition::Normal;
- FontVariantCaps caps = FontVariantCaps::Normal;
- FontVariantAlternates alternates = FontVariantAlternates::Normal;
-
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- if (value->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
-
- switch (value->id) {
- case CSSValueNoCommonLigatures:
- case CSSValueCommonLigatures:
- case CSSValueNoDiscretionaryLigatures:
- case CSSValueDiscretionaryLigatures:
- case CSSValueNoHistoricalLigatures:
- case CSSValueHistoricalLigatures:
- case CSSValueContextual:
- case CSSValueNoContextual:
- case CSSValueLiningNums:
- case CSSValueOldstyleNums:
- case CSSValueProportionalNums:
- case CSSValueTabularNums:
- case CSSValueDiagonalFractions:
- case CSSValueStackedFractions:
- case CSSValueOrdinal:
- case CSSValueSlashedZero:
- case CSSValueJis78:
- case CSSValueJis83:
- case CSSValueJis90:
- case CSSValueJis04:
- case CSSValueSimplified:
- case CSSValueTraditional:
- case CSSValueFullWidth:
- case CSSValueProportionalWidth:
- case CSSValueRuby:
- break;
- case CSSValueSub:
- position = FontVariantPosition::Subscript;
- break;
- case CSSValueSuper:
- position = FontVariantPosition::Superscript;
- break;
- case CSSValueSmallCaps:
- caps = FontVariantCaps::Small;
- break;
- case CSSValueAllSmallCaps:
- caps = FontVariantCaps::AllSmall;
- break;
- case CSSValuePetiteCaps:
- caps = FontVariantCaps::Petite;
- break;
- case CSSValueAllPetiteCaps:
- caps = FontVariantCaps::AllPetite;
- break;
- case CSSValueUnicase:
- caps = FontVariantCaps::Unicase;
- break;
- case CSSValueTitlingCaps:
- caps = FontVariantCaps::Titling;
- break;
- case CSSValueHistoricalForms:
- alternates = FontVariantAlternates::HistoricalForms;
- break;
- default:
- return false;
- }
- }
-
- switch (position) {
- case FontVariantPosition::Normal:
- break;
- case FontVariantPosition::Subscript:
- addProperty(CSSPropertyFontVariantPosition, CSSValuePool::singleton().createIdentifierValue(CSSValueSub), important, false);
- break;
- case FontVariantPosition::Superscript:
- addProperty(CSSPropertyFontVariantPosition, CSSValuePool::singleton().createIdentifierValue(CSSValueSuper), important, false);
- break;
- }
-
- switch (caps) {
- case FontVariantCaps::Normal:
- break;
- case FontVariantCaps::Small:
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(CSSValueSmallCaps), important, false);
- break;
- case FontVariantCaps::AllSmall:
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(CSSValueAllSmallCaps), important, false);
- break;
- case FontVariantCaps::Petite:
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(CSSValuePetiteCaps), important, false);
- break;
- case FontVariantCaps::AllPetite:
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(CSSValueAllPetiteCaps), important, false);
- break;
- case FontVariantCaps::Unicase:
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(CSSValueUnicase), important, false);
- break;
- case FontVariantCaps::Titling:
- addProperty(CSSPropertyFontVariantCaps, CSSValuePool::singleton().createIdentifierValue(CSSValueTitlingCaps), important, false);
- break;
- }
-
- switch (alternates) {
- case FontVariantAlternates::Normal:
- break;
- case FontVariantAlternates::HistoricalForms:
- addProperty(CSSPropertyFontVariantAlternates, CSSValuePool::singleton().createIdentifierValue(CSSValueHistoricalForms), important, false);
- break;
- }
-
- return true;
-}
-
-static inline bool isValidWillChangeAnimatableFeature(const CSSParserValue& value)
-{
- if (value.id == CSSValueNone || value.id == CSSValueAuto || value.id == CSSValueAll)
- return false;
-
- if (valueIsCSSKeyword(value))
- return false;
-
- if (cssPropertyID(value.string) == CSSPropertyWillChange)
- return false;
-
- return true;
-}
-
-bool CSSParser::parseWillChange(bool important)
-{
- auto willChangePropertyValues = CSSValueList::createCommaSeparated();
-
- bool expectComma = false;
- for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
- if (expectComma) {
- if (!isComma(value))
- return false;
-
- expectComma = false;
- continue;
- }
-
- if (value->unit != CSSPrimitiveValue::CSS_IDENT)
- return false;
-
- if (!isValidWillChangeAnimatableFeature(*value))
- return false;
-
- RefPtr<CSSValue> cssValue;
- if (value->id == CSSValueScrollPosition || value->id == CSSValueContents)
- cssValue = CSSValuePool::singleton().createIdentifierValue(value->id);
- else {
- CSSPropertyID propertyID = cssPropertyID(value->string);
- if (propertyID != CSSPropertyInvalid)
- cssValue = CSSValuePool::singleton().createIdentifierValue(propertyID);
- else // This might be a property we don't support.
- cssValue = createPrimitiveStringValue(*value);
- }
-
- willChangePropertyValues->append(cssValue.releaseNonNull());
- expectComma = true;
- }
-
- addProperty(CSSPropertyWillChange, WTFMove(willChangePropertyValues), important);
- return true;
-}
-
-RefPtr<CSSCalcValue> CSSParser::parseCalculation(CSSParserValue& value, ValueRange range)
-{
- ASSERT(isCalculation(value));
-
- CSSParserValueList* args = value.function->args.get();
- if (!args || !args->size())
- return nullptr;
-
- return CSSCalcValue::create(value.function->name, *args, range);
-}
-
-#define END_TOKEN 0
-
-#include "CSSGrammar.h"
-
-enum CharacterType {
- // Types for the main switch.
-
- // The first 4 types must be grouped together, as they
- // represent the allowed chars in an identifier.
- CharacterCaselessU,
- CharacterIdentifierStart,
- CharacterNumber,
- CharacterDash,
-
- CharacterOther,
- CharacterNull,
- CharacterWhiteSpace,
- CharacterEndConditionQuery,
- CharacterEndNthChild,
- CharacterQuote,
- CharacterExclamationMark,
- CharacterHashmark,
- CharacterDollar,
- CharacterAsterisk,
- CharacterPlus,
- CharacterDot,
- CharacterSlash,
- CharacterLess,
- CharacterAt,
- CharacterBackSlash,
- CharacterXor,
- CharacterVerticalBar,
- CharacterTilde,
-};
-
-// 128 ASCII codes
-static const CharacterType typesOfASCIICharacters[128] = {
-/* 0 - Null */ CharacterNull,
-/* 1 - Start of Heading */ CharacterOther,
-/* 2 - Start of Text */ CharacterOther,
-/* 3 - End of Text */ CharacterOther,
-/* 4 - End of Transm. */ CharacterOther,
-/* 5 - Enquiry */ CharacterOther,
-/* 6 - Acknowledgment */ CharacterOther,
-/* 7 - Bell */ CharacterOther,
-/* 8 - Back Space */ CharacterOther,
-/* 9 - Horizontal Tab */ CharacterWhiteSpace,
-/* 10 - Line Feed */ CharacterWhiteSpace,
-/* 11 - Vertical Tab */ CharacterOther,
-/* 12 - Form Feed */ CharacterWhiteSpace,
-/* 13 - Carriage Return */ CharacterWhiteSpace,
-/* 14 - Shift Out */ CharacterOther,
-/* 15 - Shift In */ CharacterOther,
-/* 16 - Data Line Escape */ CharacterOther,
-/* 17 - Device Control 1 */ CharacterOther,
-/* 18 - Device Control 2 */ CharacterOther,
-/* 19 - Device Control 3 */ CharacterOther,
-/* 20 - Device Control 4 */ CharacterOther,
-/* 21 - Negative Ack. */ CharacterOther,
-/* 22 - Synchronous Idle */ CharacterOther,
-/* 23 - End of Transmit */ CharacterOther,
-/* 24 - Cancel */ CharacterOther,
-/* 25 - End of Medium */ CharacterOther,
-/* 26 - Substitute */ CharacterOther,
-/* 27 - Escape */ CharacterOther,
-/* 28 - File Separator */ CharacterOther,
-/* 29 - Group Separator */ CharacterOther,
-/* 30 - Record Separator */ CharacterOther,
-/* 31 - Unit Separator */ CharacterOther,
-/* 32 - Space */ CharacterWhiteSpace,
-/* 33 - ! */ CharacterExclamationMark,
-/* 34 - " */ CharacterQuote,
-/* 35 - # */ CharacterHashmark,
-/* 36 - $ */ CharacterDollar,
-/* 37 - % */ CharacterOther,
-/* 38 - & */ CharacterOther,
-/* 39 - ' */ CharacterQuote,
-/* 40 - ( */ CharacterOther,
-/* 41 - ) */ CharacterEndNthChild,
-/* 42 - * */ CharacterAsterisk,
-/* 43 - + */ CharacterPlus,
-/* 44 - , */ CharacterOther,
-/* 45 - - */ CharacterDash,
-/* 46 - . */ CharacterDot,
-/* 47 - / */ CharacterSlash,
-/* 48 - 0 */ CharacterNumber,
-/* 49 - 1 */ CharacterNumber,
-/* 50 - 2 */ CharacterNumber,
-/* 51 - 3 */ CharacterNumber,
-/* 52 - 4 */ CharacterNumber,
-/* 53 - 5 */ CharacterNumber,
-/* 54 - 6 */ CharacterNumber,
-/* 55 - 7 */ CharacterNumber,
-/* 56 - 8 */ CharacterNumber,
-/* 57 - 9 */ CharacterNumber,
-/* 58 - : */ CharacterOther,
-/* 59 - ; */ CharacterEndConditionQuery,
-/* 60 - < */ CharacterLess,
-/* 61 - = */ CharacterOther,
-/* 62 - > */ CharacterOther,
-/* 63 - ? */ CharacterOther,
-/* 64 - @ */ CharacterAt,
-/* 65 - A */ CharacterIdentifierStart,
-/* 66 - B */ CharacterIdentifierStart,
-/* 67 - C */ CharacterIdentifierStart,
-/* 68 - D */ CharacterIdentifierStart,
-/* 69 - E */ CharacterIdentifierStart,
-/* 70 - F */ CharacterIdentifierStart,
-/* 71 - G */ CharacterIdentifierStart,
-/* 72 - H */ CharacterIdentifierStart,
-/* 73 - I */ CharacterIdentifierStart,
-/* 74 - J */ CharacterIdentifierStart,
-/* 75 - K */ CharacterIdentifierStart,
-/* 76 - L */ CharacterIdentifierStart,
-/* 77 - M */ CharacterIdentifierStart,
-/* 78 - N */ CharacterIdentifierStart,
-/* 79 - O */ CharacterIdentifierStart,
-/* 80 - P */ CharacterIdentifierStart,
-/* 81 - Q */ CharacterIdentifierStart,
-/* 82 - R */ CharacterIdentifierStart,
-/* 83 - S */ CharacterIdentifierStart,
-/* 84 - T */ CharacterIdentifierStart,
-/* 85 - U */ CharacterCaselessU,
-/* 86 - V */ CharacterIdentifierStart,
-/* 87 - W */ CharacterIdentifierStart,
-/* 88 - X */ CharacterIdentifierStart,
-/* 89 - Y */ CharacterIdentifierStart,
-/* 90 - Z */ CharacterIdentifierStart,
-/* 91 - [ */ CharacterOther,
-/* 92 - \ */ CharacterBackSlash,
-/* 93 - ] */ CharacterOther,
-/* 94 - ^ */ CharacterXor,
-/* 95 - _ */ CharacterIdentifierStart,
-/* 96 - ` */ CharacterOther,
-/* 97 - a */ CharacterIdentifierStart,
-/* 98 - b */ CharacterIdentifierStart,
-/* 99 - c */ CharacterIdentifierStart,
-/* 100 - d */ CharacterIdentifierStart,
-/* 101 - e */ CharacterIdentifierStart,
-/* 102 - f */ CharacterIdentifierStart,
-/* 103 - g */ CharacterIdentifierStart,
-/* 104 - h */ CharacterIdentifierStart,
-/* 105 - i */ CharacterIdentifierStart,
-/* 106 - j */ CharacterIdentifierStart,
-/* 107 - k */ CharacterIdentifierStart,
-/* 108 - l */ CharacterIdentifierStart,
-/* 109 - m */ CharacterIdentifierStart,
-/* 110 - n */ CharacterIdentifierStart,
-/* 111 - o */ CharacterIdentifierStart,
-/* 112 - p */ CharacterIdentifierStart,
-/* 113 - q */ CharacterIdentifierStart,
-/* 114 - r */ CharacterIdentifierStart,
-/* 115 - s */ CharacterIdentifierStart,
-/* 116 - t */ CharacterIdentifierStart,
-/* 117 - u */ CharacterCaselessU,
-/* 118 - v */ CharacterIdentifierStart,
-/* 119 - w */ CharacterIdentifierStart,
-/* 120 - x */ CharacterIdentifierStart,
-/* 121 - y */ CharacterIdentifierStart,
-/* 122 - z */ CharacterIdentifierStart,
-/* 123 - { */ CharacterEndConditionQuery,
-/* 124 - | */ CharacterVerticalBar,
-/* 125 - } */ CharacterOther,
-/* 126 - ~ */ CharacterTilde,
-/* 127 - Delete */ CharacterOther,
-};
-
-// Utility functions for the CSS tokenizer.
-
-template <typename CharacterType>
-static inline bool isCSSLetter(CharacterType character)
-{
- return character >= 128 || typesOfASCIICharacters[character] <= CharacterDash;
-}
-
-template <typename CharacterType>
-static inline bool isCSSEscape(CharacterType character)
-{
- return character >= ' ' && character != 127;
-}
-
-template <typename CharacterType>
-static inline bool isURILetter(CharacterType character)
-{
- return (character >= '*' && character != 127) || (character >= '#' && character <= '&') || character == '!';
-}
-
-template <typename CharacterType>
-static inline bool isIdentifierStartAfterDash(CharacterType* currentCharacter)
-{
- return isASCIIAlpha(currentCharacter[0]) || currentCharacter[0] == '_' || currentCharacter[0] >= 128
- || (currentCharacter[0] == '\\' && isCSSEscape(currentCharacter[1]));
-}
-
-template <typename CharacterType>
-static inline bool isCustomPropertyIdentifier(CharacterType* currentCharacter)
-{
- return isASCIIAlpha(currentCharacter[0]) || currentCharacter[0] == '_' || currentCharacter[0] >= 128
- || (currentCharacter[0] == '\\' && isCSSEscape(currentCharacter[1]));
-}
-
-template <typename CharacterType>
-static inline bool isEqualToCSSIdentifier(CharacterType* cssString, const char* constantString)
-{
- // Compare an character memory data with a zero terminated string.
- do {
- // The input must be part of an identifier if constantString
- // contains '-'. Otherwise toASCIILowerUnchecked('\r') would be equal to '-'.
- ASSERT(isASCIILower(*constantString) || *constantString == '-');
- ASSERT(*constantString != '-' || isCSSLetter(*cssString));
- if (toASCIILowerUnchecked(*cssString++) != *constantString++)
- return false;
- } while (*constantString);
- return true;
-}
-
-template <typename CharacterType>
-static inline bool isEqualToCSSCaseSensitiveIdentifier(CharacterType* string, const char* constantString)
-{
- do {
- if (*string++ != *constantString++)
- return false;
- } while (*constantString);
- return true;
-}
-
-template <typename CharacterType>
-static CharacterType* checkAndSkipEscape(CharacterType* currentCharacter)
-{
- // Returns with 0, if escape check is failed. Otherwise
- // it returns with the following character.
- ASSERT(*currentCharacter == '\\');
-
- ++currentCharacter;
- if (!isCSSEscape(*currentCharacter))
- return nullptr;
-
- if (isASCIIHexDigit(*currentCharacter)) {
- int length = 6;
-
- do {
- ++currentCharacter;
- } while (isASCIIHexDigit(*currentCharacter) && --length);
-
- // Optional space after the escape sequence.
- if (isHTMLSpace(*currentCharacter))
- ++currentCharacter;
- return currentCharacter;
- }
- return currentCharacter + 1;
-}
-
-template <typename CharacterType>
-static inline CharacterType* skipWhiteSpace(CharacterType* currentCharacter)
-{
- while (isHTMLSpace(*currentCharacter))
- ++currentCharacter;
- return currentCharacter;
-}
-
-// Main CSS tokenizer functions.
-
-template <>
-LChar* CSSParserString::characters<LChar>() const { return characters8(); }
-
-template <>
-UChar* CSSParserString::characters<UChar>() const { return characters16(); }
-
-template <>
-inline LChar*& CSSParser::currentCharacter<LChar>()
-{
- return m_currentCharacter8;
-}
-
-template <>
-inline UChar*& CSSParser::currentCharacter<UChar>()
-{
- return m_currentCharacter16;
-}
-
-UChar*& CSSParser::currentCharacter16()
-{
- if (!m_currentCharacter16) {
- m_dataStart16 = std::make_unique<UChar[]>(m_length);
- m_currentCharacter16 = m_dataStart16.get();
- }
-
- return m_currentCharacter16;
-}
-
-template <>
-inline LChar* CSSParser::tokenStart<LChar>()
-{
- return m_tokenStart.ptr8;
-}
-
-template <>
-inline UChar* CSSParser::tokenStart<UChar>()
-{
- return m_tokenStart.ptr16;
-}
-
-CSSParser::Location CSSParser::currentLocation()
-{
- Location location;
- location.lineNumber = m_tokenStartLineNumber;
- location.columnNumber = m_tokenStartColumnNumber;
-
- ASSERT(location.lineNumber >= 0);
- ASSERT(location.columnNumber >= 0);
-
- if (location.lineNumber == m_sheetStartLineNumber)
- location.columnNumber += m_sheetStartColumnNumber;
-
- if (is8BitSource())
- location.token.init(tokenStart<LChar>(), currentCharacter<LChar>() - tokenStart<LChar>());
- else
- location.token.init(tokenStart<UChar>(), currentCharacter<UChar>() - tokenStart<UChar>());
-
- return location;
-}
-
-template <typename CharacterType>
-inline bool CSSParser::isIdentifierStart()
-{
- // Check whether an identifier is started.
- return isIdentifierStartAfterDash((*currentCharacter<CharacterType>() != '-') ? currentCharacter<CharacterType>() : currentCharacter<CharacterType>() + 1);
-}
-
-template <typename CharacterType>
-static inline CharacterType* checkAndSkipString(CharacterType* currentCharacter, int quote)
-{
- // Returns with 0, if string check is failed. Otherwise
- // it returns with the following character. This is necessary
- // since we cannot revert escape sequences, thus strings
- // must be validated before parsing.
- while (true) {
- if (UNLIKELY(*currentCharacter == quote)) {
- // String parsing is successful.
- return currentCharacter + 1;
- }
- if (UNLIKELY(!*currentCharacter)) {
- // String parsing is successful up to end of input.
- return currentCharacter;
- }
- if (UNLIKELY(*currentCharacter <= '\r' && (*currentCharacter == '\n' || (*currentCharacter | 0x1) == '\r'))) {
- // String parsing is failed for character '\n', '\f' or '\r'.
- return nullptr;
- }
-
- if (LIKELY(currentCharacter[0] != '\\'))
- ++currentCharacter;
- else if (currentCharacter[1] == '\n' || currentCharacter[1] == '\f')
- currentCharacter += 2;
- else if (currentCharacter[1] == '\r')
- currentCharacter += currentCharacter[2] == '\n' ? 3 : 2;
- else {
- currentCharacter = checkAndSkipEscape(currentCharacter);
- if (!currentCharacter)
- return nullptr;
- }
- }
-}
-
-template <typename CharacterType>
-unsigned CSSParser::parseEscape(CharacterType*& src)
-{
- ASSERT(*src == '\\' && isCSSEscape(src[1]));
-
- unsigned unicode = 0;
-
- ++src;
- if (isASCIIHexDigit(*src)) {
-
- int length = 6;
-
- do {
- unicode = (unicode << 4) + toASCIIHexValue(*src++);
- } while (--length && isASCIIHexDigit(*src));
-
- if (unicode > UCHAR_MAX_VALUE)
- unicode = replacementCharacter;
-
- // Optional space after the escape sequence.
- if (isHTMLSpace(*src))
- ++src;
-
- return unicode;
- }
-
- return *currentCharacter<CharacterType>()++;
-}
-
-template <>
-inline void CSSParser::UnicodeToChars<LChar>(LChar*& result, unsigned unicode)
-{
- ASSERT(unicode <= 0xff);
- *result = unicode;
-
- ++result;
-}
-
-template <>
-inline void CSSParser::UnicodeToChars<UChar>(UChar*& result, unsigned unicode)
-{
- // Replace unicode with a surrogate pairs when it is bigger than 0xffff
- if (U16_LENGTH(unicode) == 2) {
- *result++ = U16_LEAD(unicode);
- *result = U16_TRAIL(unicode);
- } else
- *result = unicode;
-
- ++result;
-}
-
-template <typename SrcCharacterType, typename DestCharacterType>
-inline bool CSSParser::parseIdentifierInternal(SrcCharacterType*& src, DestCharacterType*& result, bool& hasEscape)
-{
- hasEscape = false;
- do {
- if (LIKELY(*src != '\\'))
- *result++ = *src++;
- else {
- hasEscape = true;
- SrcCharacterType* savedEscapeStart = src;
- unsigned unicode = parseEscape<SrcCharacterType>(src);
- if (unicode > 0xff && sizeof(DestCharacterType) == 1) {
- src = savedEscapeStart;
- return false;
- }
- UnicodeToChars(result, unicode);
- }
- } while (isCSSLetter(src[0]) || (src[0] == '\\' && isCSSEscape(src[1])));
-
- return true;
-}
-
-template <typename CharacterType>
-inline void CSSParser::parseIdentifier(CharacterType*& result, CSSParserString& resultString, bool& hasEscape)
-{
- CharacterType* start = currentCharacter<CharacterType>();
- if (UNLIKELY(!parseIdentifierInternal(currentCharacter<CharacterType>(), result, hasEscape))) {
- // Found an escape we couldn't handle with 8 bits, copy what has been recognized and continue
- ASSERT(is8BitSource());
- UChar*& result16 = currentCharacter16();
- UChar* start16 = result16;
- int i = 0;
- for (; i < result - start; ++i)
- result16[i] = start[i];
-
- result16 += i;
-
- parseIdentifierInternal(currentCharacter<CharacterType>(), result16, hasEscape);
-
- result += result16 - start16;
- resultString.init(start16, result16 - start16);
-
- return;
- }
-
- resultString.init(start, result - start);
-}
-
-template <typename SrcCharacterType, typename DestCharacterType>
-inline bool CSSParser::parseStringInternal(SrcCharacterType*& src, DestCharacterType*& result, UChar quote)
-{
- while (true) {
- if (UNLIKELY(*src == quote)) {
- // String parsing is done.
- ++src;
- return true;
- }
- if (UNLIKELY(!*src)) {
- // String parsing is done, but don't advance pointer if at the end of input.
- return true;
- }
- ASSERT(*src > '\r' || (*src < '\n' && *src) || *src == '\v');
-
- if (LIKELY(src[0] != '\\'))
- *result++ = *src++;
- else if (src[1] == '\n' || src[1] == '\f')
- src += 2;
- else if (src[1] == '\r')
- src += src[2] == '\n' ? 3 : 2;
- else {
- SrcCharacterType* savedEscapeStart = src;
- unsigned unicode = parseEscape<SrcCharacterType>(src);
- if (unicode > 0xff && sizeof(DestCharacterType) == 1) {
- src = savedEscapeStart;
- return false;
- }
- UnicodeToChars(result, unicode);
- }
- }
-
- return true;
-}
-
-template <typename CharacterType>
-inline void CSSParser::parseString(CharacterType*& result, CSSParserString& resultString, UChar quote)
-{
- CharacterType* start = currentCharacter<CharacterType>();
-
- if (UNLIKELY(!parseStringInternal(currentCharacter<CharacterType>(), result, quote))) {
- // Found an escape we couldn't handle with 8 bits, copy what has been recognized and continue
- ASSERT(is8BitSource());
- UChar*& result16 = currentCharacter16();
- UChar* start16 = result16;
- int i = 0;
- for (; i < result - start; ++i)
- result16[i] = start[i];
-
- result16 += i;
-
- parseStringInternal(currentCharacter<CharacterType>(), result16, quote);
-
- resultString.init(start16, result16 - start16);
- return;
- }
-
- resultString.init(start, result - start);
-}
-
-template <typename CharacterType>
-inline bool CSSParser::findURI(CharacterType*& start, CharacterType*& end, UChar& quote)
-{
- start = skipWhiteSpace(currentCharacter<CharacterType>());
-
- if (*start == '"' || *start == '\'') {
- quote = *start++;
- end = checkAndSkipString(start, quote);
- if (!end)
- return false;
- } else {
- quote = 0;
- end = start;
- while (isURILetter(*end)) {
- if (LIKELY(*end != '\\'))
- ++end;
- else {
- end = checkAndSkipEscape(end);
- if (!end)
- return false;
- }
- }
- }
-
- end = skipWhiteSpace(end);
- if (*end != ')')
- return false;
-
- return true;
-}
-
-template <typename SrcCharacterType, typename DestCharacterType>
-inline bool CSSParser::parseURIInternal(SrcCharacterType*& src, DestCharacterType*& dest, UChar quote)
-{
- if (quote) {
- ASSERT(quote == '"' || quote == '\'');
- return parseStringInternal(src, dest, quote);
- }
-
- while (isURILetter(*src)) {
- if (LIKELY(*src != '\\'))
- *dest++ = *src++;
- else {
- unsigned unicode = parseEscape<SrcCharacterType>(src);
- if (unicode > 0xff && sizeof(DestCharacterType) == 1)
- return false;
- UnicodeToChars(dest, unicode);
- }
- }
-
- return true;
-}
-
-template <typename CharacterType>
-inline void CSSParser::parseURI(CSSParserString& string)
-{
- CharacterType* uriStart;
- CharacterType* uriEnd;
- UChar quote;
- if (!findURI(uriStart, uriEnd, quote))
- return;
-
- CharacterType* dest = currentCharacter<CharacterType>() = uriStart;
- if (LIKELY(parseURIInternal(currentCharacter<CharacterType>(), dest, quote)))
- string.init(uriStart, dest - uriStart);
- else {
- // An escape sequence was encountered that can't be stored in 8 bits.
- // Reset the current character to the start of the URI and re-parse with
- // a 16-bit destination.
- ASSERT(is8BitSource());
- UChar* uriStart16 = currentCharacter16();
- currentCharacter<CharacterType>() = uriStart;
- bool result = parseURIInternal(currentCharacter<CharacterType>(), currentCharacter16(), quote);
- ASSERT_UNUSED(result, result);
- string.init(uriStart16, currentCharacter16() - uriStart16);
- }
-
- currentCharacter<CharacterType>() = uriEnd + 1;
- m_token = URI;
-}
-
-template <typename CharacterType>
-inline bool CSSParser::parseUnicodeRange()
-{
- CharacterType* character = currentCharacter<CharacterType>() + 1;
- int length = 6;
- ASSERT(*currentCharacter<CharacterType>() == '+');
-
- while (isASCIIHexDigit(*character) && length) {
- ++character;
- --length;
- }
-
- if (length && *character == '?') {
- // At most 5 hex digit followed by a question mark.
- do {
- ++character;
- --length;
- } while (*character == '?' && length);
- currentCharacter<CharacterType>() = character;
- return true;
- }
-
- if (length < 6) {
- // At least one hex digit.
- if (character[0] == '-' && isASCIIHexDigit(character[1])) {
- // Followed by a dash and a hex digit.
- ++character;
- length = 6;
- do {
- ++character;
- } while (--length && isASCIIHexDigit(*character));
- }
- currentCharacter<CharacterType>() = character;
- return true;
- }
- return false;
-}
-
-template <typename CharacterType>
-bool CSSParser::parseNthChild()
-{
- CharacterType* character = currentCharacter<CharacterType>();
-
- while (isASCIIDigit(*character))
- ++character;
- if (isASCIIAlphaCaselessEqual(*character, 'n')) {
- currentCharacter<CharacterType>() = character + 1;
- return true;
- }
- return false;
-}
-
-template <typename CharacterType>
-bool CSSParser::parseNthChildExtra()
-{
- CharacterType* character = skipWhiteSpace(currentCharacter<CharacterType>());
- if (*character != '+' && *character != '-')
- return false;
-
- character = skipWhiteSpace(character + 1);
- if (!isASCIIDigit(*character))
- return false;
-
- do {
- ++character;
- } while (isASCIIDigit(*character));
-
- currentCharacter<CharacterType>() = character;
- return true;
-}
-
-template <typename CharacterType>
-inline bool CSSParser::detectFunctionTypeToken(int length)
-{
- ASSERT(length > 0);
- CharacterType* name = tokenStart<CharacterType>();
-
- switch (length) {
- case 3:
- if (isASCIIAlphaCaselessEqual(name[0], 'n') && isASCIIAlphaCaselessEqual(name[1], 'o') && isASCIIAlphaCaselessEqual(name[2], 't')) {
- m_token = NOTFUNCTION;
- return true;
- }
- if (isASCIIAlphaCaselessEqual(name[0], 'u') && isASCIIAlphaCaselessEqual(name[1], 'r') && isASCIIAlphaCaselessEqual(name[2], 'l')) {
- m_token = URI;
- return true;
- }
- if (isASCIIAlphaCaselessEqual(name[0], 'v') && isASCIIAlphaCaselessEqual(name[1], 'a') && isASCIIAlphaCaselessEqual(name[2], 'r')) {
- m_token = VARFUNCTION;
- return true;
- }
-#if ENABLE(VIDEO_TRACK)
- if (isASCIIAlphaCaselessEqual(name[0], 'c') && isASCIIAlphaCaselessEqual(name[1], 'u') && isASCIIAlphaCaselessEqual(name[2], 'e')) {
- m_token = CUEFUNCTION;
- return true;
- }
-#endif
-#if ENABLE(CSS_SELECTORS_LEVEL4)
- if (isASCIIAlphaCaselessEqual(name[0], 'd') && isASCIIAlphaCaselessEqual(name[1], 'i') && isASCIIAlphaCaselessEqual(name[2], 'r')) {
- m_token = DIRFUNCTION;
- return true;
- }
-#endif
- return false;
-
- case 4:
- if (isEqualToCSSIdentifier(name, "calc")) {
- m_token = CALCFUNCTION;
- return true;
- }
- if (isEqualToCSSIdentifier(name, "lang")) {
- m_token = LANGFUNCTION;
- return true;
- }
-#if ENABLE(CSS_SELECTORS_LEVEL4)
- if (isEqualToCSSIdentifier(name, "role")) {
- m_token = ROLEFUNCTION;
- return true;
- }
-#endif
- if (isEqualToCSSIdentifier(name, "host")) {
- m_token = HOSTFUNCTION;
- return true;
- }
- return false;
-
- case 7:
- if (isEqualToCSSIdentifier(name, "matches")) {
- m_token = MATCHESFUNCTION;
- return true;
- }
- if (isEqualToCSSIdentifier(name, "slotted")) {
- m_token = SLOTTEDFUNCTION;
- return true;
- }
- return false;
-
- case 9:
- if (isEqualToCSSIdentifier(name, "nth-child")) {
- m_token = NTHCHILDFUNCTIONS;
- m_parsingMode = NthChildMode;
- return true;
- }
- return false;
-
- case 11:
- if (isEqualToCSSIdentifier(name, "nth-of-type")) {
- m_parsingMode = NthChildMode;
- return true;
- }
- return false;
-
- case 14:
- if (isEqualToCSSIdentifier(name, "nth-last-child")) {
- m_token = NTHCHILDFUNCTIONS;
- m_parsingMode = NthChildMode;
- return true;
- }
- return false;
-
- case 16:
- if (isEqualToCSSIdentifier(name, "nth-last-of-type")) {
- m_parsingMode = NthChildMode;
- return true;
- }
- return false;
- }
-
- return false;
-}
-
-template <typename CharacterType>
-inline void CSSParser::detectMediaQueryToken(int length)
-{
- ASSERT(m_parsingMode == MediaQueryMode);
- CharacterType* name = tokenStart<CharacterType>();
-
- if (length == 3) {
- if (isASCIIAlphaCaselessEqual(name[0], 'a') && isASCIIAlphaCaselessEqual(name[1], 'n') && isASCIIAlphaCaselessEqual(name[2], 'd'))
- m_token = MEDIA_AND;
- else if (isASCIIAlphaCaselessEqual(name[0], 'n') && isASCIIAlphaCaselessEqual(name[1], 'o') && isASCIIAlphaCaselessEqual(name[2], 't'))
- m_token = MEDIA_NOT;
- } else if (length == 4) {
- if (isASCIIAlphaCaselessEqual(name[0], 'o') && isASCIIAlphaCaselessEqual(name[1], 'n')
- && isASCIIAlphaCaselessEqual(name[2], 'l') && isASCIIAlphaCaselessEqual(name[3], 'y'))
- m_token = MEDIA_ONLY;
- }
-}
-
-template <typename CharacterType>
-inline void CSSParser::detectNumberToken(CharacterType* type, int length)
-{
- ASSERT(length > 0);
-
- switch (toASCIILowerUnchecked(type[0])) {
- case 'c':
- if (length == 2 && isASCIIAlphaCaselessEqual(type[1], 'm'))
- m_token = CMS;
- else if (length == 2 && isASCIIAlphaCaselessEqual(type[1], 'h'))
- m_token = CHS;
- return;
-
- case 'd':
- if (length == 3 && isASCIIAlphaCaselessEqual(type[1], 'e') && isASCIIAlphaCaselessEqual(type[2], 'g'))
- m_token = DEGS;
-#if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY)
- else if (length > 2 && isASCIIAlphaCaselessEqual(type[1], 'p')) {
- if (length == 4) {
- // There is a discussion about the name of this unit on www-style.
- // Keep this compile time guard in place until that is resolved.
- // http://lists.w3.org/Archives/Public/www-style/2012May/0915.html
- if (isASCIIAlphaCaselessEqual(type[2], 'p') && isASCIIAlphaCaselessEqual(type[3], 'x'))
- m_token = DPPX;
- else if (isASCIIAlphaCaselessEqual(type[2], 'c') && isASCIIAlphaCaselessEqual(type[3], 'm'))
- m_token = DPCM;
- } else if (length == 3 && isASCIIAlphaCaselessEqual(type[2], 'i'))
- m_token = DPI;
- }
-#endif
- return;
-
- case 'e':
- if (length == 2) {
- if (isASCIIAlphaCaselessEqual(type[1], 'm'))
- m_token = EMS;
- else if (isASCIIAlphaCaselessEqual(type[1], 'x'))
- m_token = EXS;
- }
- return;
-
- case 'f':
- if (length == 2 && isASCIIAlphaCaselessEqual(type[1], 'r'))
- m_token = FR;
- return;
- case 'g':
- if (length == 4 && isASCIIAlphaCaselessEqual(type[1], 'r')
- && isASCIIAlphaCaselessEqual(type[2], 'a') && isASCIIAlphaCaselessEqual(type[3], 'd'))
- m_token = GRADS;
- return;
-
- case 'h':
- if (length == 2 && isASCIIAlphaCaselessEqual(type[1], 'z'))
- m_token = HERTZ;
- return;
-
- case 'i':
- if (length == 2 && isASCIIAlphaCaselessEqual(type[1], 'n'))
- m_token = INS;
- return;
-
- case 'k':
- if (length == 3 && isASCIIAlphaCaselessEqual(type[1], 'h') && isASCIIAlphaCaselessEqual(type[2], 'z'))
- m_token = KHERTZ;
- return;
-
- case 'm':
- if (length == 2) {
- if (isASCIIAlphaCaselessEqual(type[1], 'm'))
- m_token = MMS;
- else if (isASCIIAlphaCaselessEqual(type[1], 's'))
- m_token = MSECS;
- }
- return;
-
- case 'p':
- if (length == 2) {
- if (isASCIIAlphaCaselessEqual(type[1], 'x'))
- m_token = PXS;
- else if (isASCIIAlphaCaselessEqual(type[1], 't'))
- m_token = PTS;
- else if (isASCIIAlphaCaselessEqual(type[1], 'c'))
- m_token = PCS;
- }
- return;
-
- case 'r':
- if (length == 3) {
- if (isASCIIAlphaCaselessEqual(type[1], 'a') && isASCIIAlphaCaselessEqual(type[2], 'd'))
- m_token = RADS;
- else if (isASCIIAlphaCaselessEqual(type[1], 'e') && isASCIIAlphaCaselessEqual(type[2], 'm'))
- m_token = REMS;
- }
- return;
-
- case 's':
- if (length == 1)
- m_token = SECS;
- return;
-
- case 't':
- if (length == 4 && isASCIIAlphaCaselessEqual(type[1], 'u')
- && isASCIIAlphaCaselessEqual(type[2], 'r') && isASCIIAlphaCaselessEqual(type[3], 'n'))
- m_token = TURNS;
- return;
- case 'v':
- if (length == 2) {
- if (isASCIIAlphaCaselessEqual(type[1], 'w'))
- m_token = VW;
- else if (isASCIIAlphaCaselessEqual(type[1], 'h'))
- m_token = VH;
- } else if (length == 4 && isASCIIAlphaCaselessEqual(type[1], 'm')) {
- if (isASCIIAlphaCaselessEqual(type[2], 'i') && isASCIIAlphaCaselessEqual(type[3], 'n'))
- m_token = VMIN;
- else if (isASCIIAlphaCaselessEqual(type[2], 'a') && isASCIIAlphaCaselessEqual(type[3], 'x'))
- m_token = VMAX;
- }
- return;
-
- default:
- if (type[0] == '_' && length == 5 && type[1] == '_' && isASCIIAlphaCaselessEqual(type[2], 'q')
- && isASCIIAlphaCaselessEqual(type[3], 'e') && isASCIIAlphaCaselessEqual(type[4], 'm'))
- m_token = QEMS;
- return;
- }
-}
-
-template <typename CharacterType>
-inline void CSSParser::detectDashToken(int length)
-{
- CharacterType* name = tokenStart<CharacterType>();
-
- if (length == 11) {
- if (isASCIIAlphaCaselessEqual(name[10], 'y') && isEqualToCSSIdentifier(name + 1, "webkit-an"))
- m_token = ANYFUNCTION;
- else if (isASCIIAlphaCaselessEqual(name[10], 'n') && isEqualToCSSIdentifier(name + 1, "webkit-mi"))
- m_token = MINFUNCTION;
- else if (isASCIIAlphaCaselessEqual(name[10], 'x') && isEqualToCSSIdentifier(name + 1, "webkit-ma"))
- m_token = MAXFUNCTION;
- } else if (length == 12 && isEqualToCSSIdentifier(name + 1, "webkit-calc"))
- m_token = CALCFUNCTION;
-}
-
-template <typename CharacterType>
-inline void CSSParser::detectAtToken(int length, bool hasEscape)
-{
- CharacterType* name = tokenStart<CharacterType>();
- ASSERT(name[0] == '@' && length >= 2);
-
- // charset, font-face, import, media, namespace, page, supports,
- // -webkit-keyframes, and -webkit-mediaquery are not affected by hasEscape.
- switch (toASCIILowerUnchecked(name[1])) {
- case 'b':
- if (hasEscape)
- return;
-
- switch (length) {
- case 12:
- if (isEqualToCSSIdentifier(name + 2, "ottom-left"))
- m_token = BOTTOMLEFT_SYM;
- return;
-
- case 13:
- if (isEqualToCSSIdentifier(name + 2, "ottom-right"))
- m_token = BOTTOMRIGHT_SYM;
- return;
-
- case 14:
- if (isEqualToCSSIdentifier(name + 2, "ottom-center"))
- m_token = BOTTOMCENTER_SYM;
- return;
-
- case 19:
- if (isEqualToCSSIdentifier(name + 2, "ottom-left-corner"))
- m_token = BOTTOMLEFTCORNER_SYM;
- return;
-
- case 20:
- if (isEqualToCSSIdentifier(name + 2, "ottom-right-corner"))
- m_token = BOTTOMRIGHTCORNER_SYM;
- return;
- }
- return;
-
- case 'c':
- if (length == 8 && isEqualToCSSIdentifier(name + 2, "harset"))
- m_token = CHARSET_SYM;
- return;
-
- case 'f':
- if (length == 10 && isEqualToCSSIdentifier(name + 2, "ont-face"))
- m_token = FONT_FACE_SYM;
- return;
-
- case 'i':
- if (length == 7 && isEqualToCSSIdentifier(name + 2, "mport")) {
- m_parsingMode = MediaQueryMode;
- m_token = IMPORT_SYM;
- }
- return;
-
- case 'k':
- if (length == 10 && isEqualToCSSIdentifier(name + 2, "eyframes"))
- m_token = KEYFRAMES_SYM;
- else if (length == 14 && !hasEscape && isEqualToCSSIdentifier(name + 2, "eyframe-rule"))
- m_token = KEYFRAME_RULE_SYM;
- return;
-
- case 'l':
- if (hasEscape)
- return;
-
- if (length == 9) {
- if (isEqualToCSSIdentifier(name + 2, "eft-top"))
- m_token = LEFTTOP_SYM;
- } else if (length == 12) {
- // Checking the last character first could further reduce the possibile cases.
- if (isASCIIAlphaCaselessEqual(name[11], 'e') && isEqualToCSSIdentifier(name + 2, "eft-middl"))
- m_token = LEFTMIDDLE_SYM;
- else if (isASCIIAlphaCaselessEqual(name[11], 'm') && isEqualToCSSIdentifier(name + 2, "eft-botto"))
- m_token = LEFTBOTTOM_SYM;
- }
- return;
-
- case 'm':
- if (length == 6 && isEqualToCSSIdentifier(name + 2, "edia")) {
- m_parsingMode = MediaQueryMode;
- m_token = MEDIA_SYM;
- }
- return;
-
- case 'n':
- if (length == 10 && isEqualToCSSIdentifier(name + 2, "amespace"))
- m_token = NAMESPACE_SYM;
- return;
-
- case 'p':
- if (length == 5 && isEqualToCSSIdentifier(name + 2, "age"))
- m_token = PAGE_SYM;
- return;
-
- case 'r':
- if (hasEscape)
- return;
-
- if (length == 10) {
- if (isEqualToCSSIdentifier(name + 2, "ight-top"))
- m_token = RIGHTTOP_SYM;
- } else if (length == 13) {
- // Checking the last character first could further reduce the possibile cases.
- if (isASCIIAlphaCaselessEqual(name[12], 'e') && isEqualToCSSIdentifier(name + 2, "ight-middl"))
- m_token = RIGHTMIDDLE_SYM;
- else if (isASCIIAlphaCaselessEqual(name[12], 'm') && isEqualToCSSIdentifier(name + 2, "ight-botto"))
- m_token = RIGHTBOTTOM_SYM;
- }
- return;
-
- case 's':
- if (length == 9 && isEqualToCSSIdentifier(name + 2, "upports")) {
- m_parsingMode = SupportsMode;
- m_token = SUPPORTS_SYM;
- }
- return;
-
- case 't':
- if (hasEscape)
- return;
-
- switch (length) {
- case 9:
- if (isEqualToCSSIdentifier(name + 2, "op-left"))
- m_token = TOPLEFT_SYM;
- return;
-
- case 10:
- if (isEqualToCSSIdentifier(name + 2, "op-right"))
- m_token = TOPRIGHT_SYM;
- return;
-
- case 11:
- if (isEqualToCSSIdentifier(name + 2, "op-center"))
- m_token = TOPCENTER_SYM;
- return;
-
- case 16:
- if (isEqualToCSSIdentifier(name + 2, "op-left-corner"))
- m_token = TOPLEFTCORNER_SYM;
- return;
-
- case 17:
- if (isEqualToCSSIdentifier(name + 2, "op-right-corner"))
- m_token = TOPRIGHTCORNER_SYM;
- return;
- }
- return;
-
- case '-':
- switch (length) {
- case 13:
- if (!hasEscape && isEqualToCSSIdentifier(name + 2, "webkit-rule"))
- m_token = WEBKIT_RULE_SYM;
- return;
-
- case 14:
- if (hasEscape)
- return;
-
- // Checking the last character first could further reduce the possibile cases.
- if (isASCIIAlphaCaselessEqual(name[13], 's') && isEqualToCSSIdentifier(name + 2, "webkit-decl"))
- m_token = WEBKIT_DECLS_SYM;
- else if (isASCIIAlphaCaselessEqual(name[13], 'e') && isEqualToCSSIdentifier(name + 2, "webkit-valu"))
- m_token = WEBKIT_VALUE_SYM;
- return;
-
- case 15:
- if (hasEscape)
- return;
-
-#if ENABLE(CSS_REGIONS)
- if (isASCIIAlphaCaselessEqual(name[14], 'n') && isEqualToCSSIdentifier(name + 2, "webkit-regio"))
- m_token = WEBKIT_REGION_RULE_SYM;
-#endif
- return;
-
- case 17:
- if (hasEscape)
- return;
-
- if (isASCIIAlphaCaselessEqual(name[16], 'r') && isEqualToCSSIdentifier(name + 2, "webkit-selecto"))
- m_token = WEBKIT_SELECTOR_SYM;
-#if ENABLE(CSS_DEVICE_ADAPTATION)
- else if (isASCIIAlphaCaselessEqual(name[16], 't') && isEqualToCSSIdentifier(name + 2, "webkit-viewpor"))
- m_token = WEBKIT_VIEWPORT_RULE_SYM;
-#endif
- return;
-
- case 18:
- if (isEqualToCSSIdentifier(name + 2, "webkit-keyframes"))
- m_token = KEYFRAMES_SYM;
- else if (isEqualToCSSIdentifier(name + 2, "webkit-sizesattr"))
- m_token = WEBKIT_SIZESATTR_SYM;
- return;
-
- case 19:
- if (isEqualToCSSIdentifier(name + 2, "webkit-mediaquery")) {
- m_parsingMode = MediaQueryMode;
- m_token = WEBKIT_MEDIAQUERY_SYM;
- }
- return;
-
- case 22:
- if (!hasEscape && isEqualToCSSIdentifier(name + 2, "webkit-keyframe-rule"))
- m_token = KEYFRAME_RULE_SYM;
- return;
-
- case 27:
- if (isEqualToCSSIdentifier(name + 2, "webkit-supports-condition")) {
- m_parsingMode = SupportsMode;
- m_token = WEBKIT_SUPPORTS_CONDITION_SYM;
- }
- return;
- }
- }
-}
-
-template <typename CharacterType>
-inline void CSSParser::detectSupportsToken(int length)
-{
- ASSERT(m_parsingMode == SupportsMode);
- CharacterType* name = tokenStart<CharacterType>();
-
- if (length == 2) {
- if (isASCIIAlphaCaselessEqual(name[0], 'o') && isASCIIAlphaCaselessEqual(name[1], 'r'))
- m_token = SUPPORTS_OR;
- } else if (length == 3) {
- if (isASCIIAlphaCaselessEqual(name[0], 'a') && isASCIIAlphaCaselessEqual(name[1], 'n') && isASCIIAlphaCaselessEqual(name[2], 'd'))
- m_token = SUPPORTS_AND;
- else if (isASCIIAlphaCaselessEqual(name[0], 'n') && isASCIIAlphaCaselessEqual(name[1], 'o') && isASCIIAlphaCaselessEqual(name[2], 't'))
- m_token = SUPPORTS_NOT;
- }
-}
-
-template <typename SrcCharacterType>
-int CSSParser::realLex(void* yylvalWithoutType)
-{
- YYSTYPE* yylval = static_cast<YYSTYPE*>(yylvalWithoutType);
- // Write pointer for the next character.
- SrcCharacterType* result;
- CSSParserString resultString;
- bool hasEscape;
-
- // The input buffer is terminated by a \0 character, so
- // it is safe to read one character ahead of a known non-null.
-#ifndef NDEBUG
- // In debug we check with an ASSERT that the length is > 0 for string types.
- yylval->string.clear();
-#endif
-
-restartAfterComment:
- result = currentCharacter<SrcCharacterType>();
- setTokenStart(result);
- m_tokenStartLineNumber = m_lineNumber;
- m_tokenStartColumnNumber = tokenStartOffset() - m_columnOffsetForLine;
- m_token = *currentCharacter<SrcCharacterType>();
- ++currentCharacter<SrcCharacterType>();
-
- switch ((m_token <= 127) ? typesOfASCIICharacters[m_token] : CharacterIdentifierStart) {
- case CharacterCaselessU:
- if (UNLIKELY(*currentCharacter<SrcCharacterType>() == '+')) {
- if (parseUnicodeRange<SrcCharacterType>()) {
- m_token = UNICODERANGE;
- yylval->string.init(tokenStart<SrcCharacterType>(), currentCharacter<SrcCharacterType>() - tokenStart<SrcCharacterType>());
- break;
- }
- }
- FALLTHROUGH; // To CharacterIdentifierStart.
-
- case CharacterIdentifierStart:
- --currentCharacter<SrcCharacterType>();
- parseIdentifier(result, yylval->string, hasEscape);
- m_token = IDENT;
-
- if (UNLIKELY(*currentCharacter<SrcCharacterType>() == '(')) {
- if (m_parsingMode == SupportsMode && !hasEscape) {
- detectSupportsToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
- if (m_token != IDENT)
- break;
- }
- m_token = FUNCTION;
- bool shouldSkipParenthesis = true;
- if (!hasEscape) {
- bool detected = detectFunctionTypeToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
- if (!detected && m_parsingMode == MediaQueryMode) {
- // ... and(max-width: 480px) ... looks like a function, but in fact it is not,
- // so run more detection code in the MediaQueryMode.
- detectMediaQueryToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
- shouldSkipParenthesis = false;
- }
- }
-
- if (LIKELY(shouldSkipParenthesis)) {
- ++currentCharacter<SrcCharacterType>();
- ++result;
- ++yylval->string.m_length;
- }
-
- if (token() == URI) {
- m_token = FUNCTION;
- // Check whether it is really an URI.
- if (yylval->string.is8Bit())
- parseURI<LChar>(yylval->string);
- else
- parseURI<UChar>(yylval->string);
- }
- } else if (UNLIKELY(m_parsingMode != NormalMode) && !hasEscape) {
- if (m_parsingMode == MediaQueryMode)
- detectMediaQueryToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
- else if (m_parsingMode == SupportsMode)
- detectSupportsToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
- else if (m_parsingMode == NthChildMode && isASCIIAlphaCaselessEqual(tokenStart<SrcCharacterType>()[0], 'n')) {
- if (result - tokenStart<SrcCharacterType>() == 1) {
- // String "n" is IDENT but "n+1" is NTH.
- if (parseNthChildExtra<SrcCharacterType>()) {
- m_token = NTH;
- yylval->string.m_length = currentCharacter<SrcCharacterType>() - tokenStart<SrcCharacterType>();
- }
- } else if (result - tokenStart<SrcCharacterType>() >= 2 && tokenStart<SrcCharacterType>()[1] == '-') {
- // String "n-" is IDENT but "n-1" is NTH.
- // Set currentCharacter to '-' to continue parsing.
- SrcCharacterType* nextCharacter = result;
- currentCharacter<SrcCharacterType>() = tokenStart<SrcCharacterType>() + 1;
- if (parseNthChildExtra<SrcCharacterType>()) {
- m_token = NTH;
- yylval->string.setLength(currentCharacter<SrcCharacterType>() - tokenStart<SrcCharacterType>());
- } else {
- // Revert the change to currentCharacter if unsuccessful.
- currentCharacter<SrcCharacterType>() = nextCharacter;
- }
- }
- }
- }
- if (m_parsingMode == NthChildMode && m_token == IDENT && yylval->string.length() == 2 && equalLettersIgnoringASCIICase(yylval->string, "of")) {
- m_parsingMode = NormalMode;
- m_token = NTHCHILDSELECTORSEPARATOR;
- }
- break;
-
- case CharacterDot:
- if (!isASCIIDigit(currentCharacter<SrcCharacterType>()[0]))
- break;
- FALLTHROUGH; // To CharacterNumber.
-
- case CharacterNumber: {
- bool dotSeen = (m_token == '.');
-
- while (true) {
- if (!isASCIIDigit(currentCharacter<SrcCharacterType>()[0])) {
- // Only one dot is allowed for a number,
- // and it must be followed by a digit.
- if (currentCharacter<SrcCharacterType>()[0] != '.' || dotSeen || !isASCIIDigit(currentCharacter<SrcCharacterType>()[1]))
- break;
- dotSeen = true;
- }
- ++currentCharacter<SrcCharacterType>();
- }
-
- if (UNLIKELY(m_parsingMode == NthChildMode) && !dotSeen && isASCIIAlphaCaselessEqual(*currentCharacter<SrcCharacterType>(), 'n')) {
- // "[0-9]+n" is always an NthChild.
- ++currentCharacter<SrcCharacterType>();
- parseNthChildExtra<SrcCharacterType>();
- m_token = NTH;
- yylval->string.init(tokenStart<SrcCharacterType>(), currentCharacter<SrcCharacterType>() - tokenStart<SrcCharacterType>());
- break;
- }
-
- // Use SVG parser for numbers on SVG presentation attributes.
- if (m_context.mode == SVGAttributeMode) {
- // We need to take care of units like 'em' or 'ex'.
- SrcCharacterType* character = currentCharacter<SrcCharacterType>();
- if (isASCIIAlphaCaselessEqual(*character, 'e')) {
- ASSERT(character - tokenStart<SrcCharacterType>() > 0);
- ++character;
- if (*character == '-' || *character == '+' || isASCIIDigit(*character)) {
- ++character;
- while (isASCIIDigit(*character))
- ++character;
- // Use FLOATTOKEN if the string contains exponents.
- dotSeen = true;
- currentCharacter<SrcCharacterType>() = character;
- }
- }
- if (!parseSVGNumber(tokenStart<SrcCharacterType>(), character - tokenStart<SrcCharacterType>(), yylval->number))
- break;
- } else
- yylval->number = charactersToDouble(tokenStart<SrcCharacterType>(), currentCharacter<SrcCharacterType>() - tokenStart<SrcCharacterType>());
-
- // Type of the function.
- if (isIdentifierStart<SrcCharacterType>()) {
- SrcCharacterType* type = currentCharacter<SrcCharacterType>();
- result = currentCharacter<SrcCharacterType>();
-
- parseIdentifier(result, resultString, hasEscape);
-
- m_token = DIMEN;
- if (!hasEscape)
- detectNumberToken(type, currentCharacter<SrcCharacterType>() - type);
-
- if (m_token == DIMEN) {
- // The decoded number is overwritten, but this is intentional.
- yylval->string.init(tokenStart<SrcCharacterType>(), currentCharacter<SrcCharacterType>() - tokenStart<SrcCharacterType>());
- }
- } else if (*currentCharacter<SrcCharacterType>() == '%') {
- // Although the CSS grammar says {num}% we follow
- // webkit at the moment which uses {num}%+.
- do {
- ++currentCharacter<SrcCharacterType>();
- } while (*currentCharacter<SrcCharacterType>() == '%');
- m_token = PERCENTAGE;
- } else
- m_token = dotSeen ? FLOATTOKEN : INTEGER;
- break;
- }
-
- case CharacterDash:
- if (isIdentifierStartAfterDash(currentCharacter<SrcCharacterType>())) {
- --currentCharacter<SrcCharacterType>();
- parseIdentifier(result, resultString, hasEscape);
- m_token = IDENT;
-
- if (*currentCharacter<SrcCharacterType>() == '(') {
- m_token = FUNCTION;
- if (!hasEscape)
- detectDashToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
- ++currentCharacter<SrcCharacterType>();
- ++result;
- } else if (UNLIKELY(m_parsingMode == NthChildMode) && !hasEscape && isASCIIAlphaCaselessEqual(tokenStart<SrcCharacterType>()[1], 'n')) {
- if (result - tokenStart<SrcCharacterType>() == 2) {
- // String "-n" is IDENT but "-n+1" is NTH.
- if (parseNthChildExtra<SrcCharacterType>()) {
- m_token = NTH;
- result = currentCharacter<SrcCharacterType>();
- }
- } else if (result - tokenStart<SrcCharacterType>() >= 3 && tokenStart<SrcCharacterType>()[2] == '-') {
- // String "-n-" is IDENT but "-n-1" is NTH.
- // Set currentCharacter to second '-' of '-n-' to continue parsing.
- SrcCharacterType* nextCharacter = result;
- currentCharacter<SrcCharacterType>() = tokenStart<SrcCharacterType>() + 2;
- if (parseNthChildExtra<SrcCharacterType>()) {
- m_token = NTH;
- result = currentCharacter<SrcCharacterType>();
- } else {
- // Revert the change to currentCharacter if unsuccessful.
- currentCharacter<SrcCharacterType>() = nextCharacter;
- }
- }
- }
- resultString.setLength(result - tokenStart<SrcCharacterType>());
- yylval->string = resultString;
- } else if (currentCharacter<SrcCharacterType>()[0] == '-' && currentCharacter<SrcCharacterType>()[1] == '>') {
- currentCharacter<SrcCharacterType>() += 2;
- m_token = SGML_CD;
- } else if (currentCharacter<SrcCharacterType>()[0] == '-') {
- --currentCharacter<SrcCharacterType>();
- parseIdentifier(result, resultString, hasEscape);
- m_token = CUSTOM_PROPERTY;
- yylval->string = resultString;
- } else if (UNLIKELY(m_parsingMode == NthChildMode)) {
- // "-[0-9]+n" is always an NthChild.
- if (parseNthChild<SrcCharacterType>()) {
- parseNthChildExtra<SrcCharacterType>();
- m_token = NTH;
- yylval->string.init(tokenStart<SrcCharacterType>(), currentCharacter<SrcCharacterType>() - tokenStart<SrcCharacterType>());
- }
- }
- break;
-
- case CharacterOther:
- // m_token is simply the current character.
- break;
-
- case CharacterNull:
- // Do not advance pointer at the end of input.
- --currentCharacter<SrcCharacterType>();
- break;
-
- case CharacterWhiteSpace:
- m_token = WHITESPACE;
- // Might start with a '\n'.
- --currentCharacter<SrcCharacterType>();
- do {
- if (*currentCharacter<SrcCharacterType>() == '\n') {
- ++m_lineNumber;
- m_columnOffsetForLine = currentCharacterOffset() + 1;
- }
- ++currentCharacter<SrcCharacterType>();
- } while (*currentCharacter<SrcCharacterType>() <= ' ' && (typesOfASCIICharacters[*currentCharacter<SrcCharacterType>()] == CharacterWhiteSpace));
- break;
-
- case CharacterEndConditionQuery: {
- bool isParsingCondition = m_parsingMode == MediaQueryMode || m_parsingMode == SupportsMode;
- if (isParsingCondition)
- m_parsingMode = NormalMode;
- break;
- }
-
- case CharacterEndNthChild:
- if (m_parsingMode == NthChildMode)
- m_parsingMode = NormalMode;
- break;
-
- case CharacterQuote:
- if (checkAndSkipString(currentCharacter<SrcCharacterType>(), m_token)) {
- ++result;
- parseString<SrcCharacterType>(result, yylval->string, m_token);
- m_token = STRING;
- }
- break;
-
- case CharacterExclamationMark: {
- SrcCharacterType* start = skipWhiteSpace(currentCharacter<SrcCharacterType>());
- if (isEqualToCSSIdentifier(start, "important")) {
- m_token = IMPORTANT_SYM;
- currentCharacter<SrcCharacterType>() = start + 9;
- }
- break;
- }
-
- case CharacterHashmark: {
- SrcCharacterType* start = currentCharacter<SrcCharacterType>();
- result = currentCharacter<SrcCharacterType>();
-
- if (isASCIIDigit(*currentCharacter<SrcCharacterType>())) {
- // This must be a valid hex number token.
- do {
- ++currentCharacter<SrcCharacterType>();
- } while (isASCIIHexDigit(*currentCharacter<SrcCharacterType>()));
- m_token = HEX;
- yylval->string.init(start, currentCharacter<SrcCharacterType>() - start);
- } else if (isIdentifierStart<SrcCharacterType>()) {
- m_token = IDSEL;
- parseIdentifier(result, yylval->string, hasEscape);
- if (!hasEscape) {
- // Check whether the identifier is also a valid hex number.
- SrcCharacterType* current = start;
- m_token = HEX;
- do {
- if (!isASCIIHexDigit(*current)) {
- m_token = IDSEL;
- break;
- }
- ++current;
- } while (current < result);
- }
- }
- break;
- }
-
- case CharacterSlash:
- // Ignore comments. They are not even considered as white spaces.
- if (*currentCharacter<SrcCharacterType>() == '*') {
- ++currentCharacter<SrcCharacterType>();
- while (currentCharacter<SrcCharacterType>()[0] != '*' || currentCharacter<SrcCharacterType>()[1] != '/') {
- if (*currentCharacter<SrcCharacterType>() == '\n') {
- ++m_lineNumber;
- m_columnOffsetForLine = currentCharacterOffset() + 1;
- } else if (*currentCharacter<SrcCharacterType>() == '\0') {
- // Unterminated comments are simply ignored.
- currentCharacter<SrcCharacterType>() -= 2;
- break;
- }
- ++currentCharacter<SrcCharacterType>();
- }
- currentCharacter<SrcCharacterType>() += 2;
- goto restartAfterComment;
- }
- break;
-
- case CharacterDollar:
- if (*currentCharacter<SrcCharacterType>() == '=') {
- ++currentCharacter<SrcCharacterType>();
- m_token = ENDSWITH;
- }
- break;
-
- case CharacterAsterisk:
- if (*currentCharacter<SrcCharacterType>() == '=') {
- ++currentCharacter<SrcCharacterType>();
- m_token = CONTAINS;
- }
- break;
-
- case CharacterPlus:
- if (UNLIKELY(m_parsingMode == NthChildMode)) {
- // Simplest case. "+[0-9]*n" is always NthChild.
- if (parseNthChild<SrcCharacterType>()) {
- parseNthChildExtra<SrcCharacterType>();
- m_token = NTH;
- yylval->string.init(tokenStart<SrcCharacterType>(), currentCharacter<SrcCharacterType>() - tokenStart<SrcCharacterType>());
- }
- }
- break;
-
- case CharacterLess:
- if (currentCharacter<SrcCharacterType>()[0] == '!' && currentCharacter<SrcCharacterType>()[1] == '-' && currentCharacter<SrcCharacterType>()[2] == '-') {
- currentCharacter<SrcCharacterType>() += 3;
- m_token = SGML_CD;
- }
- break;
-
- case CharacterAt:
- if (isIdentifierStart<SrcCharacterType>()) {
- m_token = ATKEYWORD;
- ++result;
- parseIdentifier(result, resultString, hasEscape);
- detectAtToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>(), hasEscape);
- }
- break;
-
- case CharacterBackSlash:
- if (isCSSEscape(*currentCharacter<SrcCharacterType>())) {
- --currentCharacter<SrcCharacterType>();
- parseIdentifier(result, yylval->string, hasEscape);
- m_token = IDENT;
- }
- if (m_parsingMode == NthChildMode && m_token == IDENT && yylval->string.length() == 2 && equalLettersIgnoringASCIICase(yylval->string, "of")) {
- m_parsingMode = NormalMode;
- m_token = NTHCHILDSELECTORSEPARATOR;
- }
- break;
-
- case CharacterXor:
- if (*currentCharacter<SrcCharacterType>() == '=') {
- ++currentCharacter<SrcCharacterType>();
- m_token = BEGINSWITH;
- }
- break;
-
- case CharacterVerticalBar:
- if (*currentCharacter<SrcCharacterType>() == '=') {
- ++currentCharacter<SrcCharacterType>();
- m_token = DASHMATCH;
- }
- break;
-
- case CharacterTilde:
- if (*currentCharacter<SrcCharacterType>() == '=') {
- ++currentCharacter<SrcCharacterType>();
- m_token = INCLUDES;
- }
- break;
-
- default:
- ASSERT_NOT_REACHED();
- break;
- }
-
- return token();
-}
-
-RefPtr<StyleRuleImport> CSSParser::createImportRule(const CSSParserString& url, RefPtr<MediaQuerySet>&& media)
-{
- if (!media || !m_allowImportRules) {
- popRuleData();
- return nullptr;
- }
- auto rule = StyleRuleImport::create(url, media.releaseNonNull());
- processAndAddNewRuleToSourceTreeIfNeeded();
- return WTFMove(rule);
-}
-
-Ref<StyleRuleMedia> CSSParser::createMediaRule(RefPtr<MediaQuerySet>&& media, RuleList* rules)
-{
- m_allowImportRules = m_allowNamespaceDeclarations = false;
- RefPtr<StyleRuleMedia> rule;
- RuleList emptyRules;
- if (!media) {
- // To comply with w3c test suite expectation, create an empty media query
- // even when it is syntactically incorrect.
- rule = StyleRuleMedia::create(MediaQuerySet::create(), emptyRules);
- } else {
- media->shrinkToFit();
- rule = StyleRuleMedia::create(media.releaseNonNull(), rules ? *rules : emptyRules);
- }
- processAndAddNewRuleToSourceTreeIfNeeded();
- return rule.releaseNonNull();
-}
-
-Ref<StyleRuleMedia> CSSParser::createEmptyMediaRule(RuleList* rules)
-{
- return createMediaRule(MediaQuerySet::create(), rules);
-}
-
-Ref<StyleRuleSupports> CSSParser::createSupportsRule(bool conditionIsSupported, RuleList* rules)
-{
- m_allowImportRules = m_allowNamespaceDeclarations = false;
-
- RefPtr<CSSRuleSourceData> data = popSupportsRuleData();
- String conditionText;
- unsigned conditionOffset = data->ruleHeaderRange.start + 9;
- unsigned conditionLength = data->ruleHeaderRange.length() - 9;
-
- if (is8BitSource())
- conditionText = String(m_dataStart8.get() + conditionOffset, conditionLength).stripWhiteSpace();
- else
- conditionText = String(m_dataStart16.get() + conditionOffset, conditionLength).stripWhiteSpace();
-
- RefPtr<StyleRuleSupports> rule;
- if (rules)
- rule = StyleRuleSupports::create(conditionText, conditionIsSupported, *rules);
- else {
- RuleList emptyRules;
- rule = StyleRuleSupports::create(conditionText, conditionIsSupported, emptyRules);
- }
-
- processAndAddNewRuleToSourceTreeIfNeeded();
-
- return rule.releaseNonNull();
-}
-
-void CSSParser::markSupportsRuleHeaderStart()
-{
- if (!m_supportsRuleDataStack)
- m_supportsRuleDataStack = std::make_unique<RuleSourceDataList>();
-
- auto data = CSSRuleSourceData::create(StyleRule::Supports);
- data->ruleHeaderRange.start = tokenStartOffset();
- m_supportsRuleDataStack->append(WTFMove(data));
-}
-
-void CSSParser::markSupportsRuleHeaderEnd()
-{
- ASSERT(m_supportsRuleDataStack && !m_supportsRuleDataStack->isEmpty());
-
- if (is8BitSource())
- m_supportsRuleDataStack->last()->ruleHeaderRange.end = tokenStart<LChar>() - m_dataStart8.get();
- else
- m_supportsRuleDataStack->last()->ruleHeaderRange.end = tokenStart<UChar>() - m_dataStart16.get();
-}
-
-Ref<CSSRuleSourceData> CSSParser::popSupportsRuleData()
-{
- ASSERT(m_supportsRuleDataStack && !m_supportsRuleDataStack->isEmpty());
- return m_supportsRuleDataStack->takeLast();
-}
-
-void CSSParser::processAndAddNewRuleToSourceTreeIfNeeded()
-{
- if (!isExtractingSourceData())
- return;
- markRuleBodyEnd();
- Ref<CSSRuleSourceData> rule = *popRuleData();
- fixUnparsedPropertyRanges(rule);
- addNewRuleToSourceTree(WTFMove(rule));
-}
-
-void CSSParser::addNewRuleToSourceTree(Ref<CSSRuleSourceData>&& rule)
-{
- // Precondition: (isExtractingSourceData()).
- if (!m_ruleSourceDataResult)
- return;
- if (m_currentRuleDataStack->isEmpty())
- m_ruleSourceDataResult->append(WTFMove(rule));
- else
- m_currentRuleDataStack->last()->childRules.append(WTFMove(rule));
-}
-
-RefPtr<CSSRuleSourceData> CSSParser::popRuleData()
-{
- if (!m_ruleSourceDataResult)
- return nullptr;
-
- ASSERT(!m_currentRuleDataStack->isEmpty());
- m_currentRuleData = nullptr;
- return m_currentRuleDataStack->takeLast();
-}
-
-void CSSParser::syntaxError(const Location& location, SyntaxErrorType error)
-{
- if (!isLoggingErrors())
- return;
-
</del><span class="cx"> StringBuilder builder;
</span><del>- switch (error) {
- case PropertyDeclarationError:
- builder.appendLiteral("Invalid CSS property declaration at: ");
- break;
- default:
- builder.appendLiteral("Unexpected CSS token: ");
- break;
- }
-
- if (location.token.is8Bit())
- builder.append(location.token.characters8(), location.token.length());
- else
- builder.append(location.token.characters16(), location.token.length());
-
- logError(builder.toString(), location.lineNumber, location.columnNumber);
-
- m_ignoreErrorsInDeclaration = true;
-}
-
-bool CSSParser::isLoggingErrors()
-{
- return m_logErrors && !m_ignoreErrorsInDeclaration;
-}
-
-void CSSParser::logError(const String& message, int lineNumber, int columnNumber)
-{
- PageConsoleClient& console = m_styleSheet->singleOwnerDocument()->page()->console();
- console.addMessage(MessageSource::CSS, MessageLevel::Warning, message, m_styleSheet->baseURL().string(), lineNumber + 1, columnNumber + 1);
-}
-
-Ref<StyleRuleKeyframes> CSSParser::createKeyframesRule(const String& name, std::unique_ptr<Vector<RefPtr<StyleKeyframe>>> keyframes)
-{
- m_allowImportRules = m_allowNamespaceDeclarations = false;
- Ref<StyleRuleKeyframes> rule = StyleRuleKeyframes::create();
- for (auto& keyFrame : *keyframes)
- rule->parserAppendKeyframe(WTFMove(keyFrame));
- rule->setName(name);
- processAndAddNewRuleToSourceTreeIfNeeded();
- return rule;
-}
-
-RefPtr<StyleRule> CSSParser::createStyleRule(Vector<std::unique_ptr<CSSParserSelector>>* selectors)
-{
- RefPtr<StyleRule> rule;
- if (selectors) {
- m_allowImportRules = false;
- m_allowNamespaceDeclarations = false;
- rule = StyleRule::create(createStyleProperties());
- rule->parserAdoptSelectorVector(*selectors);
- processAndAddNewRuleToSourceTreeIfNeeded();
- } else
- popRuleData();
- clearProperties();
- return rule;
-}
-
-RefPtr<StyleRuleFontFace> CSSParser::createFontFaceRule()
-{
- m_allowImportRules = m_allowNamespaceDeclarations = false;
- for (auto& property : m_parsedProperties) {
- if (property.id() == CSSPropertyFontFamily && (!is<CSSValueList>(*property.value()) || downcast<CSSValueList>(*property.value()).length() != 1)) {
- // Unlike font-family property, font-family descriptor in @font-face rule
- // has to be a value list with exactly one family name. It cannot have a
- // have 'initial' value and cannot 'inherit' from parent.
- // See http://dev.w3.org/csswg/css3-fonts/#font-family-desc
- clearProperties();
- popRuleData();
- return nullptr;
- }
- }
- auto rule = StyleRuleFontFace::create(createStyleProperties());
- clearProperties();
- processAndAddNewRuleToSourceTreeIfNeeded();
- return WTFMove(rule);
-}
-
-void CSSParser::addNamespace(const AtomicString& prefix, const AtomicString& uri)
-{
- if (!m_styleSheet || !m_allowNamespaceDeclarations)
- return;
- m_allowImportRules = false;
- m_styleSheet->parserAddNamespace(prefix, uri);
- if (prefix.isEmpty() && !uri.isNull())
- m_defaultNamespace = uri;
-}
-
-QualifiedName CSSParser::determineNameInNamespace(const AtomicString& prefix, const AtomicString& localName)
-{
- if (prefix.isNull())
- return QualifiedName(nullAtom, localName, nullAtom); // No namespace. If an element/attribute has a namespace, we won't match it.
- if (prefix.isEmpty())
- return QualifiedName(emptyAtom, localName, emptyAtom); // Empty namespace.
- if (prefix == starAtom)
- return QualifiedName(prefix, localName, starAtom); // We'll match any namespace.
-
- if (!m_styleSheet)
- return QualifiedName(prefix, localName, m_defaultNamespace);
- return QualifiedName(prefix, localName, m_styleSheet->namespaceURIFromPrefix(prefix));
-}
-
-void CSSParser::rewriteSpecifiersWithNamespaceIfNeeded(CSSParserSelector& specifiers)
-{
- if (m_defaultNamespace != starAtom || specifiers.isCustomPseudoElement()) {
- QualifiedName elementName(nullAtom, starAtom, m_defaultNamespace);
- rewriteSpecifiersWithElementName(elementName, specifiers, /*tagIsForNamespaceRule*/true);
- }
-}
-
-void CSSParser::rewriteSpecifiersWithElementName(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector& specifiers)
-{
- QualifiedName tag(determineNameInNamespace(namespacePrefix, elementName));
- rewriteSpecifiersWithElementName(tag, specifiers, false);
-}
-
-void CSSParser::rewriteSpecifiersWithElementName(const QualifiedName& tag, CSSParserSelector& specifiers, bool tagIsForNamespaceRule)
-{
- if (!specifiers.isCustomPseudoElement()) {
- if (tag == anyQName())
- return;
- if (!specifiers.isPseudoElementCueFunction())
- specifiers.prependTagSelector(tag, tagIsForNamespaceRule);
- return;
- }
-
- CSSParserSelector* lastShadowDescendant = &specifiers;
- CSSParserSelector* history = &specifiers;
- while (history->tagHistory()) {
- history = history->tagHistory();
- if (history->isCustomPseudoElement() || history->hasShadowDescendant())
- lastShadowDescendant = history;
- }
-
- if (lastShadowDescendant->tagHistory()) {
- if (tag != anyQName())
- lastShadowDescendant->tagHistory()->prependTagSelector(tag, tagIsForNamespaceRule);
- return;
- }
-
- // For shadow-ID pseudo-elements to be correctly matched, the ShadowDescendant combinator has to be used.
- // We therefore create a new Selector with that combinator here in any case, even if matching any (host) element in any namespace (i.e. '*').
- lastShadowDescendant->setTagHistory(std::make_unique<CSSParserSelector>(tag));
- lastShadowDescendant->setRelation(CSSSelector::ShadowDescendant);
-}
-
-std::unique_ptr<CSSParserSelector> CSSParser::rewriteSpecifiers(std::unique_ptr<CSSParserSelector> specifiers, std::unique_ptr<CSSParserSelector> newSpecifier)
-{
- if (newSpecifier->isCustomPseudoElement() || newSpecifier->isPseudoElementCueFunction()) {
- // Unknown pseudo element always goes at the top of selector chain.
- newSpecifier->appendTagHistory(CSSSelector::ShadowDescendant, WTFMove(specifiers));
- return newSpecifier;
- }
- if (specifiers->isCustomPseudoElement()) {
- // Specifiers for unknown pseudo element go right behind it in the chain.
- specifiers->insertTagHistory(CSSSelector::Subselector, WTFMove(newSpecifier), CSSSelector::ShadowDescendant);
- return specifiers;
- }
- specifiers->appendTagHistory(CSSSelector::Subselector, WTFMove(newSpecifier));
- return specifiers;
-}
-
-RefPtr<StyleRulePage> CSSParser::createPageRule(std::unique_ptr<CSSParserSelector> pageSelector)
-{
- // FIXME: Margin at-rules are ignored.
- m_allowImportRules = m_allowNamespaceDeclarations = false;
- if (pageSelector) {
- auto rule = StyleRulePage::create(createStyleProperties());
- Vector<std::unique_ptr<CSSParserSelector>> selectorVector;
- selectorVector.append(WTFMove(pageSelector));
- rule->parserAdoptSelectorVector(selectorVector);
- processAndAddNewRuleToSourceTreeIfNeeded();
- clearProperties();
- return WTFMove(rule);
- }
-
- popRuleData();
- clearProperties();
- return nullptr;
-}
-
-std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> CSSParser::createSelectorVector()
-{
- if (m_recycledSelectorVector) {
- m_recycledSelectorVector->shrink(0);
- return WTFMove(m_recycledSelectorVector);
- }
- return std::make_unique<Vector<std::unique_ptr<CSSParserSelector>>>();
-}
-
-void CSSParser::recycleSelectorVector(std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> vector)
-{
- if (vector && !m_recycledSelectorVector)
- m_recycledSelectorVector = WTFMove(vector);
-}
-
-RefPtr<StyleRuleRegion> CSSParser::createRegionRule(Vector<std::unique_ptr<CSSParserSelector>>* regionSelector, RuleList* rules)
-{
- if (!regionSelector || !rules) {
- popRuleData();
</del><ins>+ builder.append("@font-face { ");
+ builder.append(getPropertyNameString(propertyID));
+ builder.append(" : ");
+ builder.append(propertyValue);
+ builder.append("; }");
+ RefPtr<StyleRuleBase> rule = parseRule(context, nullptr, builder.toString());
+ if (!rule || !rule->isFontFaceRule())
</ins><span class="cx"> return nullptr;
</span><del>- }
-
- m_allowImportRules = m_allowNamespaceDeclarations = false;
-
- auto regionRule = StyleRuleRegion::create(regionSelector, *rules);
-
- if (isExtractingSourceData())
- addNewRuleToSourceTree(CSSRuleSourceData::createUnknown());
-
- return WTFMove(regionRule);
</del><ins>+ return downcast<StyleRuleFontFace>(*rule.get()).properties().getPropertyCSSValue(propertyID);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSParser::createMarginAtRule(CSSSelector::MarginBoxType /* marginBox */)
-{
- // FIXME: Implement margin at-rule here, using:
- // - marginBox: margin box
- // - m_parsedProperties: properties at [m_numParsedPropertiesBeforeMarginBox, m_parsedProperties.size()] are for this at-rule.
- // Don't forget to also update the action for page symbol in CSSGrammar.y such that margin at-rule data is cleared if page_selector is invalid.
-
- endDeclarationsForMarginBox();
</del><span class="cx"> }
</span><del>-
-void CSSParser::startDeclarationsForMarginBox()
-{
- m_numParsedPropertiesBeforeMarginBox = m_parsedProperties.size();
-}
-
-void CSSParser::endDeclarationsForMarginBox()
-{
- rollbackLastProperties(m_parsedProperties.size() - m_numParsedPropertiesBeforeMarginBox);
- m_numParsedPropertiesBeforeMarginBox = invalidParsedPropertiesCount;
-}
-
-RefPtr<StyleKeyframe> CSSParser::createKeyframe(CSSParserValueList& keys)
-{
- // Create a key string from the passed keys
- StringBuilder keyString;
- for (unsigned i = 0; i < keys.size(); ++i) {
- // Just as per the comment below, we ignore keyframes with
- // invalid key values (plain numbers or unknown identifiers)
- // marked as CSSPrimitiveValue::CSS_UNKNOWN during parsing.
- if (keys.valueAt(i)->unit == CSSPrimitiveValue::CSS_UNKNOWN) {
- clearProperties();
- return nullptr;
- }
-
- ASSERT(keys.valueAt(i)->unit == CSSPrimitiveValue::CSS_NUMBER);
- float key = static_cast<float>(keys.valueAt(i)->fValue);
- if (key < 0 || key > 100) {
- // As per http://www.w3.org/TR/css3-animations/#keyframes,
- // "If a keyframe selector specifies negative percentage values
- // or values higher than 100%, then the keyframe will be ignored."
- clearProperties();
- return nullptr;
- }
- if (i != 0)
- keyString.append(',');
- keyString.appendNumber(key);
- keyString.append('%');
- }
-
- auto keyframe = StyleKeyframe::create(createStyleProperties());
- keyframe->setKeyText(keyString.toString());
-
- clearProperties();
-
- return WTFMove(keyframe);
-}
-
-void CSSParser::invalidBlockHit()
-{
- if (m_styleSheet && !m_hadSyntacticallyValidCSSRule)
- m_styleSheet->setHasSyntacticallyValidCSSHeader(false);
-}
-
-void CSSParser::updateLastMediaLine(MediaQuerySet& media)
-{
- media.setLastLine(m_lineNumber);
-}
-
-template <typename CharacterType>
-static inline void fixUnparsedProperties(const CharacterType* characters, CSSRuleSourceData& ruleData)
-{
- auto& propertyData = ruleData.styleSourceData->propertyData;
- unsigned size = propertyData.size();
- if (!size)
- return;
-
- unsigned styleStart = ruleData.ruleBodyRange.start;
- auto* nextData = &propertyData[0];
- for (unsigned i = 0; i < size; ++i) {
- auto* currentData = nextData;
- nextData = i < size - 1 ? &propertyData[i + 1] : 0;
-
- if (currentData->parsedOk)
- continue;
- if (currentData->range.end > 0 && characters[styleStart + currentData->range.end - 1] == ';')
- continue;
-
- unsigned propertyEndInStyleSheet;
- if (!nextData)
- propertyEndInStyleSheet = ruleData.ruleBodyRange.end - 1;
- else
- propertyEndInStyleSheet = styleStart + nextData->range.start - 1;
-
- while (isHTMLSpace(characters[propertyEndInStyleSheet]))
- --propertyEndInStyleSheet;
-
- // propertyEndInStyleSheet points at the last property text character.
- unsigned newPropertyEnd = propertyEndInStyleSheet - styleStart + 1; // Exclusive of the last property text character.
- if (currentData->range.end != newPropertyEnd) {
- currentData->range.end = newPropertyEnd;
- unsigned valueStartInStyleSheet = styleStart + currentData->range.start + currentData->name.length();
- while (valueStartInStyleSheet < propertyEndInStyleSheet && characters[valueStartInStyleSheet] != ':')
- ++valueStartInStyleSheet;
- if (valueStartInStyleSheet < propertyEndInStyleSheet)
- ++valueStartInStyleSheet; // Shift past the ':'.
- while (valueStartInStyleSheet < propertyEndInStyleSheet && isHTMLSpace(characters[valueStartInStyleSheet]))
- ++valueStartInStyleSheet;
- // Need to exclude the trailing ';' from the property value.
- currentData->value = String(characters + valueStartInStyleSheet, propertyEndInStyleSheet - valueStartInStyleSheet + (characters[propertyEndInStyleSheet] == ';' ? 0 : 1));
- }
- }
-}
-
-void CSSParser::fixUnparsedPropertyRanges(CSSRuleSourceData& ruleData)
-{
- if (!ruleData.styleSourceData)
- return;
-
- if (is8BitSource()) {
- fixUnparsedProperties<LChar>(m_dataStart8.get() + m_parsedTextPrefixLength, ruleData);
- return;
- }
-
- fixUnparsedProperties<UChar>(m_dataStart16.get() + m_parsedTextPrefixLength, ruleData);
-}
-
-void CSSParser::markRuleHeaderStart(StyleRule::Type ruleType)
-{
- if (!isExtractingSourceData())
- return;
-
- // Pop off data for a previous invalid rule.
- if (m_currentRuleData)
- m_currentRuleDataStack->removeLast();
-
- auto data = CSSRuleSourceData::create(ruleType);
- data->ruleHeaderRange.start = tokenStartOffset();
- m_currentRuleData = data.copyRef();
- m_currentRuleDataStack->append(WTFMove(data));
-}
-
-template <typename CharacterType>
-inline void CSSParser::setRuleHeaderEnd(const CharacterType* dataStart)
-{
- CharacterType* listEnd = tokenStart<CharacterType>();
- while (listEnd > dataStart + 1) {
- if (isHTMLSpace(*(listEnd - 1)))
- --listEnd;
- else
- break;
- }
-
- m_currentRuleDataStack->last()->ruleHeaderRange.end = listEnd - dataStart;
-}
-
-void CSSParser::markRuleHeaderEnd()
-{
- if (!isExtractingSourceData())
- return;
- ASSERT(!m_currentRuleDataStack->isEmpty());
-
- if (is8BitSource())
- setRuleHeaderEnd<LChar>(m_dataStart8.get());
- else
- setRuleHeaderEnd<UChar>(m_dataStart16.get());
-}
-
-void CSSParser::markSelectorStart()
-{
- if (!isExtractingSourceData() || m_nestedSelectorLevel)
- return;
- ASSERT(!m_selectorRange.end);
-
- m_selectorRange.start = tokenStartOffset();
-}
-
-void CSSParser::markSelectorEnd()
-{
- if (!isExtractingSourceData() || m_nestedSelectorLevel)
- return;
- ASSERT(!m_selectorRange.end);
- ASSERT(m_currentRuleDataStack->size());
-
- m_selectorRange.end = tokenStartOffset();
- m_currentRuleDataStack->last()->selectorRanges.append(m_selectorRange);
- m_selectorRange.start = 0;
- m_selectorRange.end = 0;
-}
-
-void CSSParser::markRuleBodyStart()
-{
- if (!isExtractingSourceData())
- return;
- m_currentRuleData = nullptr;
- unsigned offset = tokenStartOffset();
- if (tokenStartChar() == '{')
- ++offset; // Skip the rule body opening brace.
- ASSERT(!m_currentRuleDataStack->isEmpty());
- m_currentRuleDataStack->last()->ruleBodyRange.start = offset;
-}
-
-void CSSParser::markRuleBodyEnd()
-{
- // Precondition: (!isExtractingSourceData())
- unsigned offset = tokenStartOffset();
- ASSERT(!m_currentRuleDataStack->isEmpty());
- m_currentRuleDataStack->last()->ruleBodyRange.end = offset;
-}
-
-void CSSParser::markPropertyStart()
-{
- m_ignoreErrorsInDeclaration = false;
- if (!isExtractingSourceData())
- return;
- if (m_currentRuleDataStack->isEmpty() || !m_currentRuleDataStack->last()->styleSourceData)
- return;
-
- m_propertyRange.start = tokenStartOffset();
-}
-
-void CSSParser::markPropertyEnd(bool isImportantFound, bool isPropertyParsed)
-{
- if (!isExtractingSourceData())
- return;
- if (m_currentRuleDataStack->isEmpty() || !m_currentRuleDataStack->last()->styleSourceData)
- return;
-
- unsigned offset = tokenStartOffset();
- if (tokenStartChar() == ';') // Include semicolon into the property text.
- ++offset;
- m_propertyRange.end = offset;
- if (m_propertyRange.start != std::numeric_limits<unsigned>::max() && !m_currentRuleDataStack->isEmpty()) {
- // This stuff is only executed when the style data retrieval is requested by client.
- const unsigned start = m_propertyRange.start;
- const unsigned end = m_propertyRange.end;
- ASSERT_WITH_SECURITY_IMPLICATION(start < end);
- String propertyString;
- if (is8BitSource())
- propertyString = String(m_dataStart8.get() + start, end - start).stripWhiteSpace();
- else
- propertyString = String(m_dataStart16.get() + start, end - start).stripWhiteSpace();
- if (propertyString.endsWith(';'))
- propertyString = propertyString.left(propertyString.length() - 1);
- size_t colonIndex = propertyString.find(':');
- ASSERT(colonIndex != notFound);
-
- String name = propertyString.left(colonIndex).stripWhiteSpace();
- String value = propertyString.substring(colonIndex + 1, propertyString.length()).stripWhiteSpace();
- // The property range is relative to the declaration start offset.
- SourceRange& topRuleBodyRange = m_currentRuleDataStack->last()->ruleBodyRange;
- m_currentRuleDataStack->last()->styleSourceData->propertyData.append(
- CSSPropertySourceData(name, value, isImportantFound, false, isPropertyParsed, SourceRange(start - topRuleBodyRange.start, end - topRuleBodyRange.start)));
- }
- resetPropertyRange();
-}
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-Ref<StyleRuleViewport> CSSParser::createViewportRule()
-{
- m_allowImportRules = m_allowNamespaceDeclarations = false;
-
- auto rule = StyleRuleViewport::create(createStyleProperties());
- clearProperties();
-
- processAndAddNewRuleToSourceTreeIfNeeded();
-
- return rule;
-}
-
-bool CSSParser::parseViewportProperty(CSSPropertyID propId, bool important)
-{
- if (!m_valueList->current())
- return false;
-
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
-
- CSSValueID id = valueWithCalculation.value().id;
- bool validPrimitive = false;
-
- switch (propId) {
- case CSSPropertyMinWidth: // auto | device-width | device-height | <length> | <percentage>
- case CSSPropertyMaxWidth:
- case CSSPropertyMinHeight:
- case CSSPropertyMaxHeight:
- if (id == CSSValueAuto || id == CSSValueDeviceWidth || id == CSSValueDeviceHeight)
- validPrimitive = true;
- else
- validPrimitive = (!id && validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg));
- break;
- case CSSPropertyWidth: // shorthand
- return parseViewportShorthand(propId, CSSPropertyMinWidth, CSSPropertyMaxWidth, important);
- case CSSPropertyHeight:
- return parseViewportShorthand(propId, CSSPropertyMinHeight, CSSPropertyMaxHeight, important);
- case CSSPropertyMinZoom: // auto | <number> | <percentage>
- case CSSPropertyMaxZoom:
- case CSSPropertyZoom:
- if (id == CSSValueAuto)
- validPrimitive = true;
- else
- validPrimitive = (!id && validateUnit(valueWithCalculation, FNumber | FPercent | FNonNeg));
- break;
- case CSSPropertyUserZoom: // zoom | fixed
- if (id == CSSValueZoom || id == CSSValueFixed)
- validPrimitive = true;
- break;
- case CSSPropertyOrientation: // auto | portrait | landscape
- if (id == CSSValueAuto || id == CSSValuePortrait || id == CSSValueLandscape)
- validPrimitive = true;
- default:
- break;
- }
-
- RefPtr<CSSValue> parsedValue;
- if (validPrimitive) {
- parsedValue = parseValidPrimitive(id, valueWithCalculation);
- m_valueList->next();
- }
-
- if (!parsedValue)
- return false;
-
- if (m_valueList->current() && !inShorthand())
- return false;
-
- addProperty(propId, parsedValue.releaseNonNull(), important);
- return true;
-}
-
-bool CSSParser::parseViewportShorthand(CSSPropertyID propId, CSSPropertyID first, CSSPropertyID second, bool important)
-{
- unsigned numValues = m_valueList->size();
-
- if (numValues > 2)
- return false;
-
- ShorthandScope scope(this, propId);
-
- if (!parseViewportProperty(first, important))
- return false;
-
- // If just one value is supplied, the second value
- // is implicitly initialized with the first value.
- if (numValues == 1)
- m_valueList->previous();
-
- return parseViewportProperty(second, important);
-}
-#endif
-
-#if ENABLE(LEGACY_CSS_VENDOR_PREFIXES)
-static bool isAppleLegacyCSSPropertyKeyword(const char* propertyKeyword, unsigned length)
-{
- static const char applePrefix[] = "-apple-";
- static const char applePayPrefix[] = "-apple-pay-";
-
- return hasPrefix(propertyKeyword, length, applePrefix)
- && !hasPrefix(propertyKeyword, length, applePayPrefix);
-}
-#endif
-
-template <typename CharacterType>
-static CSSPropertyID cssPropertyID(const CharacterType* propertyName, unsigned length)
-{
- char buffer[maxCSSPropertyNameLength + 1 + 1]; // 1 to turn "apple"/"khtml" into "webkit", 1 for null character
-
- for (unsigned i = 0; i != length; ++i) {
- CharacterType c = propertyName[i];
- if (c == 0 || c >= 0x7F)
- return CSSPropertyInvalid; // illegal character
- buffer[i] = toASCIILower(c);
- }
- buffer[length] = '\0';
-
- const char* name = buffer;
- if (buffer[0] == '-') {
-#if ENABLE(LEGACY_CSS_VENDOR_PREFIXES)
- // If the prefix is -apple- or -khtml-, change it to -webkit-.
- // This makes the string one character longer.
- if (RuntimeEnabledFeatures::sharedFeatures().legacyCSSVendorPrefixesEnabled()
- && (isAppleLegacyCSSPropertyKeyword(buffer, length) || hasPrefix(buffer, length, "-khtml-"))) {
- memmove(buffer + 7, buffer + 6, length + 1 - 6);
- memcpy(buffer, "-webkit", 7);
- ++length;
- }
-#endif
-#if PLATFORM(IOS)
- cssPropertyNameIOSAliasing(buffer, name, length);
-#endif
- }
-
- const Property* hashTableEntry = findProperty(name, length);
- return hashTableEntry ? static_cast<CSSPropertyID>(hashTableEntry->id) : CSSPropertyInvalid;
-}
-
-CSSPropertyID cssPropertyID(const String& string)
-{
- unsigned length = string.length();
-
- if (!length)
- return CSSPropertyInvalid;
- if (length > maxCSSPropertyNameLength)
- return CSSPropertyInvalid;
-
- return string.is8Bit() ? cssPropertyID(string.characters8(), length) : cssPropertyID(string.characters16(), length);
-}
-
-CSSPropertyID cssPropertyID(const CSSParserString& string)
-{
- unsigned length = string.length();
-
- if (!length)
- return CSSPropertyInvalid;
- if (length > maxCSSPropertyNameLength)
- return CSSPropertyInvalid;
-
- return string.is8Bit() ? cssPropertyID(string.characters8(), length) : cssPropertyID(string.characters16(), length);
-}
-
-#if PLATFORM(IOS)
-void cssPropertyNameIOSAliasing(const char* propertyName, const char*& propertyNameAlias, unsigned& newLength)
-{
- if (!strcmp(propertyName, "-webkit-hyphenate-locale")) {
- // Worked in iOS 4.2.
- static const char webkitLocale[] = "-webkit-locale";
- propertyNameAlias = webkitLocale;
- newLength = strlen(webkitLocale);
- }
-}
-#endif
-
-static bool isAppleLegacyCSSValueKeyword(const char* valueKeyword, unsigned length)
-{
- static const char applePrefix[] = "-apple-";
- static const char appleSystemPrefix[] = "-apple-system-";
- static const char applePayPrefix[] = "-apple-pay-";
- static const char* appleWirelessPlaybackTargetActive = getValueName(CSSValueAppleWirelessPlaybackTargetActive);
-
- return hasPrefix(valueKeyword, length, applePrefix)
- && !hasPrefix(valueKeyword, length, appleSystemPrefix)
- && !hasPrefix(valueKeyword, length, applePayPrefix)
- && !WTF::equal(reinterpret_cast<const LChar*>(valueKeyword), reinterpret_cast<const LChar*>(appleWirelessPlaybackTargetActive), length);
-}
-
-template <typename CharacterType>
-static CSSValueID cssValueKeywordID(const CharacterType* valueKeyword, unsigned length)
-{
- char buffer[maxCSSValueKeywordLength + 1 + 1]; // 1 to turn "apple"/"khtml" into "webkit", 1 for null character
-
- for (unsigned i = 0; i != length; ++i) {
- CharacterType c = valueKeyword[i];
- if (c == 0 || c >= 0x7F)
- return CSSValueInvalid; // illegal keyword.
- buffer[i] = WTF::toASCIILower(c);
- }
- buffer[length] = '\0';
-
- if (buffer[0] == '-') {
- // If the prefix is -apple- or -khtml-, change it to -webkit-.
- // This makes the string one character longer.
- // On iOS we don't want to change values starting with -apple-system to -webkit-system.
- // FIXME: Remove this mangling without breaking the web.
- if (isAppleLegacyCSSValueKeyword(buffer, length) || hasPrefix(buffer, length, "-khtml-")) {
- memmove(buffer + 7, buffer + 6, length + 1 - 6);
- memcpy(buffer, "-webkit", 7);
- ++length;
- }
- }
-
- const Value* hashTableEntry = findValue(buffer, length);
- return hashTableEntry ? static_cast<CSSValueID>(hashTableEntry->id) : CSSValueInvalid;
-}
-
-CSSValueID cssValueKeywordID(const CSSParserString& string)
-{
- unsigned length = string.length();
- if (!length)
- return CSSValueInvalid;
- if (length > maxCSSValueKeywordLength)
- return CSSValueInvalid;
-
- return string.is8Bit() ? cssValueKeywordID(string.characters8(), length) : cssValueKeywordID(string.characters16(), length);
-}
-
-bool isValidNthToken(const CSSParserString& token)
-{
- // The tokenizer checks for the construct of an+b.
- // However, since the {ident} rule precedes the {nth} rule, some of those
- // tokens are identified as string literal. Furthermore we need to accept
- // "odd" and "even" which does not match to an+b.
- return equalLettersIgnoringASCIICase(token, "odd")
- || equalLettersIgnoringASCIICase(token, "even")
- || equalLettersIgnoringASCIICase(token, "n")
- || equalLettersIgnoringASCIICase(token, "-n");
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSParser.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -22,82 +22,25 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "CSSCalculationValue.h"
-#include "CSSFunctionValue.h"
-#include "CSSGradientValue.h"
</del><span class="cx"> #include "CSSParserMode.h"
</span><del>-#include "CSSParserValues.h"
-#include "CSSProperty.h"
-#include "CSSPropertyNames.h"
-#include "CSSPropertySourceData.h"
-#include "CSSValueKeywords.h"
-#include "Color.h"
-#include "ColorSpace.h"
-#include "MediaQuery.h"
-#include "StyleRuleImport.h"
-#include <memory>
-#include <wtf/HashMap.h>
-#include <wtf/Vector.h>
-#include <wtf/text/AtomicString.h>
-#include <wtf/text/TextPosition.h>
</del><ins>+#include "CSSValue.h"
+#include "WritingMode.h"
+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><del>-#if ENABLE(CSS_GRID_LAYOUT)
-#include "GridArea.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class AnimationParseContext;
-class CSSBorderImageSliceValue;
-class CSSContentDistributionValue;
</del><span class="cx"> class CSSParserObserver;
</span><del>-class CSSPrimitiveValue;
</del><span class="cx"> class CSSSelectorList;
</span><del>-class CSSValue;
-class CSSValueList;
-class CSSBasicShape;
-class CSSBasicShapeCircle;
-class CSSBasicShapeEllipse;
-class CSSBasicShapeInset;
-class CSSBasicShapePath;
-class CSSBasicShapePolygon;
-class CSSGridLineNamesValue;
-class CSSImageSetValue;
-class CSSVariableDependentValue;
-class Document;
</del><ins>+class Color;
</ins><span class="cx"> class Element;
</span><span class="cx"> class ImmutableStyleProperties;
</span><del>-class MediaQueryExpression;
-class MediaQuerySet;
</del><span class="cx"> class MutableStyleProperties;
</span><del>-class SVGColor;
-class SVGPaint;
-class StyleKeyframe;
-class StylePropertyShorthand;
-class StyleRule;
</del><span class="cx"> class StyleRuleBase;
</span><del>-class StyleRuleFontFace;
-class StyleRuleKeyframes;
-class StyleRuleMedia;
-class StyleRulePage;
-class StyleRuleRegion;
-class StyleRuleSupports;
-class StyleRuleViewport;
</del><span class="cx"> class StyleKeyframe;
</span><span class="cx"> class StyleSheetContents;
</span><del>-class StyledElement;
-class WebKitCSSTransformValue;
</del><span class="cx">
</span><span class="cx"> class CSSParser {
</span><del>- friend inline int cssyylex(void*, CSSParser*);
-
</del><span class="cx"> public:
</span><del>- struct Location;
- enum SyntaxErrorType {
- PropertyDeclarationError,
- GeneralSyntaxError
- };
-
</del><span class="cx"> enum class ParseResult {
</span><span class="cx"> Changed,
</span><span class="cx"> Unchanged,
</span><span class="lines">@@ -104,33 +47,16 @@
</span><span class="cx"> Error
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class ValueWithCalculation {
- public:
- explicit ValueWithCalculation(CSSParserValue& value)
- : m_value(value)
- { }
-
- CSSParserValue& value() const { return m_value; }
- operator CSSParserValue&() { return m_value; }
-
- RefPtr<CSSCalcValue> calculation() const { return m_calculation; }
- void setCalculation(RefPtr<CSSCalcValue>&& calculation)
- {
- ASSERT(isCalculation(m_value));
- m_calculation = WTFMove(calculation);
- }
-
- private:
- CSSParserValue& m_value;
- RefPtr<CSSCalcValue> m_calculation;
- };
-
</del><span class="cx"> WEBCORE_EXPORT CSSParser(const CSSParserContext&);
</span><span class="cx"> WEBCORE_EXPORT ~CSSParser();
</span><span class="cx">
</span><del>- void parseSheet(StyleSheetContents*, const String&, const TextPosition&, RuleSourceDataList*, bool logErrors);
- RefPtr<StyleRuleBase> parseRule(StyleSheetContents*, const String&);
- RefPtr<StyleKeyframe> parseKeyframeRule(StyleSheetContents*, const String&);
</del><ins>+ void parseSheet(StyleSheetContents*, const String&);
+
+ static RefPtr<StyleRuleBase> parseRule(const CSSParserContext&, StyleSheetContents*, const String&);
+
+ RefPtr<StyleKeyframe> parseKeyframeRule(const String&);
+ static std::unique_ptr<Vector<double>> parseKeyframeKeyList(const String&);
+
</ins><span class="cx"> bool parseSupportsCondition(const String&);
</span><span class="cx">
</span><span class="cx"> static void parseSheetForInspector(const CSSParserContext&, StyleSheetContents*, const String&, CSSParserObserver&);
</span><span class="lines">@@ -137,665 +63,26 @@
</span><span class="cx"> static void parseDeclarationForInspector(const CSSParserContext&, const String&, CSSParserObserver&);
</span><span class="cx">
</span><span class="cx"> static ParseResult parseValue(MutableStyleProperties&, CSSPropertyID, const String&, bool important, const CSSParserContext&, StyleSheetContents*);
</span><del>- static ParseResult parseCustomPropertyValue(MutableStyleProperties&, const AtomicString& propertyName, const String&, bool important, const CSSParserContext&, StyleSheetContents*);
</del><ins>+ static ParseResult parseCustomPropertyValue(MutableStyleProperties&, const AtomicString& propertyName, const String&, bool important, const CSSParserContext&);
+
+ static RefPtr<CSSValue> parseFontFaceDescriptor(CSSPropertyID, const String&, const CSSParserContext&);
</ins><span class="cx">
</span><del>- static Color parseColor(const String&, bool strict = false);
- static bool isValidSystemColorValue(CSSValueID);
- static Color parseSystemColor(const String&, Document*);
- static RefPtr<CSSValueList> parseFontFaceValue(const AtomicString&);
- RefPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ident, ValueWithCalculation&);
</del><ins>+ static RefPtr<CSSValue> parseSingleValue(CSSPropertyID, const String&, const CSSParserContext& = strictCSSParserContext());
</ins><span class="cx">
</span><del>- // FIXME-NEWPARSER: Can remove the last two arguments once the new parser is turned on.
- WEBCORE_EXPORT bool parseDeclaration(MutableStyleProperties&, const String&, RefPtr<CSSRuleSourceData>&&, StyleSheetContents* contextStyleSheet);
</del><ins>+ WEBCORE_EXPORT bool parseDeclaration(MutableStyleProperties&, const String&);
</ins><span class="cx"> static Ref<ImmutableStyleProperties> parseInlineStyleDeclaration(const String&, Element*);
</span><del>-
- void addProperty(CSSPropertyID, RefPtr<CSSValue>&&, bool important, bool implicit = false);
- void rollbackLastProperties(int num);
- bool hasProperties() const { return !m_parsedProperties.isEmpty(); }
- void addExpandedPropertyForValue(CSSPropertyID propId, Ref<CSSValue>&&, bool);
-
- bool parseValue(CSSPropertyID, bool important);
- bool parseShorthand(CSSPropertyID, const StylePropertyShorthand&, bool important);
- bool parse4Values(CSSPropertyID, const CSSPropertyID* properties, bool important);
- bool parseContent(CSSPropertyID, bool important);
- bool parseQuotes(CSSPropertyID, bool important);
- bool parseAlt(CSSPropertyID, bool important);
</del><span class="cx">
</span><del>- bool parseCustomPropertyDeclaration(bool important, CSSValueID);
-
- RefPtr<CSSPrimitiveValue> parseAttr(CSSParserValueList& args);
-
- RefPtr<CSSPrimitiveValue> parseBackgroundColor();
-
- struct SourceSize {
- MediaQueryExpression expression;
- Ref<CSSValue> length;
-
- SourceSize(SourceSize&&);
- SourceSize(MediaQueryExpression&&, Ref<CSSValue>&&);
- };
- Vector<SourceSize> parseSizesAttribute(StringView);
- std::optional<SourceSize> sourceSize(MediaQueryExpression&&, CSSParserValue&);
-
- bool parseFillImage(CSSParserValueList&, RefPtr<CSSValue>&);
-
- enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 };
- enum FillPositionParsingMode { ResolveValuesAsPercent = 0, ResolveValuesAsKeyword = 1 };
- RefPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSParserValueList&, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillPositionParsingMode = ResolveValuesAsPercent);
- RefPtr<CSSPrimitiveValue> parsePositionX(CSSParserValueList&);
- RefPtr<CSSPrimitiveValue> parsePositionY(CSSParserValueList&);
- void parse2ValuesFillPosition(CSSParserValueList&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&);
- bool isPotentialPositionValue(CSSParserValue&);
- void parseFillPosition(CSSParserValueList&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&);
- void parse3ValuesFillPosition(CSSParserValueList&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&, Ref<CSSPrimitiveValue>&&, Ref<CSSPrimitiveValue>&&);
- void parse4ValuesFillPosition(CSSParserValueList&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&, Ref<CSSPrimitiveValue>&&, Ref<CSSPrimitiveValue>&&);
-
- void parseFillRepeat(RefPtr<CSSValue>&, RefPtr<CSSValue>&);
- RefPtr<CSSPrimitiveValue> parseFillSize(CSSPropertyID, bool &allowComma);
-
- bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
- bool parseFillShorthand(CSSPropertyID, const CSSPropertyID* properties, int numProperties, bool important);
-
- void addFillValue(RefPtr<CSSValue>& lval, Ref<CSSValue>&& rval);
- void addAnimationValue(RefPtr<CSSValue>& lval, Ref<CSSValue>&& rval);
-
- RefPtr<CSSPrimitiveValue> parseAnimationDelay();
- RefPtr<CSSPrimitiveValue> parseAnimationDirection();
- RefPtr<CSSPrimitiveValue> parseAnimationDuration();
- RefPtr<CSSPrimitiveValue> parseAnimationFillMode();
- RefPtr<CSSPrimitiveValue> parseAnimationIterationCount();
- RefPtr<CSSPrimitiveValue> parseAnimationName();
- RefPtr<CSSPrimitiveValue> parseAnimationPlayState();
- RefPtr<CSSPrimitiveValue> parseAnimationProperty(AnimationParseContext&);
- RefPtr<CSSValue> parseAnimationTimingFunction();
-#if ENABLE(CSS_ANIMATIONS_LEVEL_2)
- RefPtr<CSSValue> parseAnimationTrigger();
-#endif
- static std::unique_ptr<Vector<double>> parseKeyframeKeyList(const String&);
-
- bool parseTransformOriginShorthand(RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSValue>&);
- std::optional<double> parseCubicBezierTimingFunctionValue(CSSParserValueList&);
- std::optional<double> parseSpringTimingFunctionValue(CSSParserValueList&);
- bool parseAnimationProperty(CSSPropertyID, RefPtr<CSSValue>&, AnimationParseContext&);
- bool parseTransitionShorthand(CSSPropertyID, bool important);
- bool parseAnimationShorthand(CSSPropertyID, bool important);
-
- bool isSpringTimingFunctionEnabled() const;
-
- RefPtr<CSSPrimitiveValue> parseColumnWidth();
- RefPtr<CSSPrimitiveValue> parseColumnCount();
- bool parseColumnsShorthand(bool important);
-
-#if ENABLE(TEXT_AUTOSIZING)
- bool isTextAutosizingEnabled() const;
-#endif
-
-#if ENABLE(CSS_GRID_LAYOUT)
- bool isCSSGridLayoutEnabled() const;
- RefPtr<CSSValue> parseGridPosition();
- bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
- enum TrackListType { GridTemplate, GridTemplateNoRepeat, GridAuto };
- RefPtr<CSSValue> parseGridTemplateColumns(TrackListType = GridTemplate);
- bool parseGridTemplateRowsAndAreasAndColumns(bool important);
- bool parseGridTemplateShorthand(bool important);
- bool parseGridShorthand(bool important);
- bool parseGridAreaShorthand(bool important);
- bool parseGridGapShorthand(bool important);
- bool parseSingleGridAreaLonghand(RefPtr<CSSValue>&);
- RefPtr<CSSValue> parseGridTrackList(TrackListType);
- bool parseGridTrackRepeatFunction(CSSValueList&, bool& isAutoRepeat, bool& allTracksAreFixedSized);
- RefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList);
- RefPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue&);
- bool parseGridTemplateAreasRow(NamedGridAreaMap&, const unsigned, unsigned&);
- RefPtr<CSSValue> parseGridTemplateAreas();
- bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNamesValue* = nullptr);
- RefPtr<CSSValue> parseGridAutoFlow(CSSParserValueList&);
-#endif
-
- bool parseDashboardRegions(CSSPropertyID, bool important);
-
- bool parseClipShape(CSSPropertyID, bool important);
-
- bool parseLegacyPosition(CSSPropertyID, bool important);
- bool parseItemPositionOverflowPosition(CSSPropertyID, bool important);
- RefPtr<CSSContentDistributionValue> parseContentDistributionOverflowPosition();
-
- RefPtr<CSSValue> parseShapeProperty(CSSPropertyID);
-
- RefPtr<CSSValueList> parseBasicShapeAndOrBox(CSSPropertyID propId);
- RefPtr<CSSPrimitiveValue> parseBasicShape();
- RefPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue&);
- RefPtr<CSSBasicShapeCircle> parseBasicShapeCircle(CSSParserValueList&);
- RefPtr<CSSBasicShapeEllipse> parseBasicShapeEllipse(CSSParserValueList&);
- RefPtr<CSSBasicShapePolygon> parseBasicShapePolygon(CSSParserValueList&);
- RefPtr<CSSBasicShapePath> parseBasicShapePath(CSSParserValueList&);
- RefPtr<CSSBasicShapeInset> parseBasicShapeInset(CSSParserValueList&);
-
- bool parseFont(bool important);
- void parseSystemFont(bool important);
- RefPtr<CSSValueList> parseFontFamily();
-
- bool parseCounter(CSSPropertyID, int defaultValue, bool important);
- RefPtr<CSSPrimitiveValue> parseCounterContent(CSSParserValueList& args, bool counters);
-
- bool parseRGBParameters(CSSParserValue&, int* colorValues, bool parseAlpha);
- bool parseHSLParameters(CSSParserValue&, double* colorValues, bool parseAlpha);
- std::optional<std::pair<std::array<double, 4>, ColorSpace>> parseColorFunctionParameters(CSSParserValue&);
- RefPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = nullptr);
- Color parseColorFromValue(CSSParserValue&);
</del><span class="cx"> void parseSelector(const String&, CSSSelectorList&);
</span><span class="cx">
</span><del>- template<typename StringType>
- static Color fastParseColor(const StringType&, bool strict);
-
- bool parseLineHeight(bool important);
- bool parseFontSize(bool important);
- bool parseFontWeight(bool important);
- bool parseFontSynthesis(bool important);
- bool parseFontFaceSrc();
- bool parseFontFaceUnicodeRange();
-
- bool parseSVGValue(CSSPropertyID propId, bool important);
- RefPtr<SVGPaint> parseSVGPaint();
- RefPtr<SVGColor> parseSVGColor();
- RefPtr<CSSValueList> parseSVGStrokeDasharray();
- RefPtr<CSSValueList> parsePaintOrder();
-
- // CSS3 Parsing Routines (for properties specific to CSS3)
- RefPtr<CSSValueList> parseShadow(CSSParserValueList&, CSSPropertyID);
- bool parseBorderImage(CSSPropertyID, RefPtr<CSSValue>&, bool important = false);
- bool parseBorderImageRepeat(RefPtr<CSSValue>&);
- bool parseBorderImageSlice(CSSPropertyID, RefPtr<CSSBorderImageSliceValue>&);
- bool parseBorderImageWidth(RefPtr<CSSPrimitiveValue>&);
- bool parseBorderImageOutset(RefPtr<CSSPrimitiveValue>&);
- bool parseBorderRadius(CSSPropertyID, bool important);
-
- bool parseAspectRatio(bool important);
-
- bool parseReflect(CSSPropertyID, bool important);
-
- bool parseFlex(CSSParserValueList& args, bool important);
-
- // Image generators
- bool parseCanvas(CSSParserValueList&, RefPtr<CSSValue>&);
- bool parseNamedImage(CSSParserValueList&, RefPtr<CSSValue>&);
-
- bool parseDeprecatedGradient(CSSParserValueList&, RefPtr<CSSValue>&);
- bool parseDeprecatedLinearGradient(CSSParserValueList&, RefPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseDeprecatedRadialGradient(CSSParserValueList&, RefPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseLinearGradient(CSSParserValueList&, RefPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseRadialGradient(CSSParserValueList&, RefPtr<CSSValue>&, CSSGradientRepeat repeating);
- bool parseGradientColorStops(CSSParserValueList&, CSSGradientValue&, bool expectComma);
-
- bool parseCrossfade(CSSParserValueList&, RefPtr<CSSValue>&, bool prefixed);
-
-#if ENABLE(CSS_IMAGE_RESOLUTION)
- RefPtr<CSSValueList> parseImageResolution();
-#endif
-
- RefPtr<CSSImageSetValue> parseImageSet();
-
- bool parseFilterImage(CSSParserValueList&, RefPtr<CSSValue>&);
-
- bool parseFilter(CSSParserValueList&, RefPtr<CSSValueList>&);
- RefPtr<CSSFunctionValue> parseBuiltinFilterArguments(CSSValueID, CSSParserValueList&);
-
- RefPtr<CSSValue> parseClipPath();
-
- static bool isBlendMode(CSSValueID);
- static bool isCompositeOperator(CSSValueID);
-
- RefPtr<CSSValueList> parseTransform();
- RefPtr<WebKitCSSTransformValue> parseTransformValue(CSSParserValue&);
- bool parseTransformOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, CSSPropertyID& propId3, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSValue>&);
- bool parsePerspectiveOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&);
-
- bool parseTextEmphasisStyle(bool important);
- bool parseTextEmphasisPosition(bool important);
-
- void addTextDecorationProperty(CSSPropertyID, RefPtr<CSSValue>&&, bool important);
- bool parseTextDecoration(CSSPropertyID propId, bool important);
- bool parseTextDecorationSkip(bool important);
- bool parseTextUnderlinePosition(bool important);
-
- RefPtr<CSSValueList> parseTextIndent();
-
- bool parseHangingPunctuation(bool important);
-
- bool parseLineBoxContain(bool important);
- RefPtr<CSSCalcValue> parseCalculation(CSSParserValue&, ValueRange);
-
- bool parseFontFeatureTag(CSSValueList&);
- bool parseFontFeatureSettings(bool important);
-
- bool parseFontVariationTag(CSSValueList&);
- bool parseFontVariationSettings(bool important);
-
- bool parseFlowThread(CSSPropertyID, bool important);
- bool parseRegionThread(CSSPropertyID, bool important);
-
- bool parseFontVariantLigatures(bool important, bool unknownIsFailure, bool implicit);
- bool parseFontVariantNumeric(bool important, bool unknownIsFailure, bool implicit);
- bool parseFontVariantEastAsian(bool important, bool unknownIsFailure, bool implicit);
- bool parseFontVariant(bool important);
-
- bool parseWillChange(bool important);
-
- // Faster than doing a new/delete each time since it keeps one vector.
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> createSelectorVector();
- void recycleSelectorVector(std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>);
-
- RefPtr<StyleRuleImport> createImportRule(const CSSParserString&, RefPtr<MediaQuerySet>&&);
- RefPtr<StyleKeyframe> createKeyframe(CSSParserValueList&);
- Ref<StyleRuleKeyframes> createKeyframesRule(const String&, std::unique_ptr<Vector<RefPtr<StyleKeyframe>>>);
-
- typedef Vector<RefPtr<StyleRuleBase>> RuleList;
- Ref<StyleRuleMedia> createMediaRule(RefPtr<MediaQuerySet>&&, RuleList*);
- Ref<StyleRuleMedia> createEmptyMediaRule(RuleList*);
- RefPtr<StyleRule> createStyleRule(Vector<std::unique_ptr<CSSParserSelector>>* selectors);
- RefPtr<StyleRuleFontFace> createFontFaceRule();
- RefPtr<StyleRulePage> createPageRule(std::unique_ptr<CSSParserSelector> pageSelector);
- RefPtr<StyleRuleRegion> createRegionRule(Vector<std::unique_ptr<CSSParserSelector>>* regionSelector, RuleList* rules);
- void createMarginAtRule(CSSSelector::MarginBoxType);
- Ref<StyleRuleSupports> createSupportsRule(bool conditionIsSupported, RuleList*);
- void markSupportsRuleHeaderStart();
- void markSupportsRuleHeaderEnd();
- Ref<CSSRuleSourceData> popSupportsRuleData();
-
- void startDeclarationsForMarginBox();
- void endDeclarationsForMarginBox();
-
- void addNamespace(const AtomicString& prefix, const AtomicString& uri);
- QualifiedName determineNameInNamespace(const AtomicString& prefix, const AtomicString& localName);
-
- void rewriteSpecifiersWithElementName(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector&);
- void rewriteSpecifiersWithElementName(const QualifiedName& tagName, CSSParserSelector&, bool isNamespacePlaceholder = false);
- void rewriteSpecifiersWithNamespaceIfNeeded(CSSParserSelector&);
- std::unique_ptr<CSSParserSelector> rewriteSpecifiers(std::unique_ptr<CSSParserSelector>, std::unique_ptr<CSSParserSelector>);
-
- void invalidBlockHit();
-
- void updateLastMediaLine(MediaQuerySet&);
-
- void clearProperties();
-
- Ref<ImmutableStyleProperties> createStyleProperties();
-
- static const unsigned invalidParsedPropertiesCount;
-
- CSSParserContext m_context;
-
- bool m_important { false };
- CSSPropertyID m_id { CSSPropertyInvalid };
- AtomicString m_customPropertyName;
- StyleSheetContents* m_styleSheet { nullptr };
- RefPtr<StyleRuleBase> m_rule;
- RefPtr<StyleKeyframe> m_keyframe;
- std::unique_ptr<MediaQuery> m_mediaQuery;
- std::unique_ptr<CSSParserValueList> m_valueList;
- bool m_supportsCondition { false };
-
- ParsedPropertyVector m_parsedProperties;
- CSSSelectorList* m_selectorListForParseSelector { nullptr };
-
- unsigned m_numParsedPropertiesBeforeMarginBox { invalidParsedPropertiesCount };
-
- int m_inParseShorthand { 0 };
- CSSPropertyID m_currentShorthand { CSSPropertyInvalid };
- bool m_implicitShorthand { false };
-
- bool m_hadSyntacticallyValidCSSRule { false };
- bool m_logErrors { false };
- bool m_ignoreErrorsInDeclaration { false };
-
- AtomicString m_defaultNamespace { starAtom };
-
- // tokenizer methods and data
- size_t m_parsedTextPrefixLength { 0 };
- unsigned m_nestedSelectorLevel { 0 };
- SourceRange m_selectorRange;
- SourceRange m_propertyRange { std::numeric_limits<unsigned>::max(), std::numeric_limits<unsigned>::max() };
- std::unique_ptr<RuleSourceDataList> m_currentRuleDataStack;
- RefPtr<CSSRuleSourceData> m_currentRuleData;
- RuleSourceDataList* m_ruleSourceDataResult { nullptr };
-
- void fixUnparsedPropertyRanges(CSSRuleSourceData&);
- void markRuleHeaderStart(StyleRule::Type);
- void markRuleHeaderEnd();
-
- void startNestedSelectorList() { ++m_nestedSelectorLevel; }
- void endNestedSelectorList() { --m_nestedSelectorLevel; }
- void markSelectorStart();
- void markSelectorEnd();
-
- void markRuleBodyStart();
- void markRuleBodyEnd();
- void markPropertyStart();
- void markPropertyEnd(bool isImportantFound, bool isPropertyParsed);
- void processAndAddNewRuleToSourceTreeIfNeeded();
- void addNewRuleToSourceTree(Ref<CSSRuleSourceData>&&);
- RefPtr<CSSRuleSourceData> popRuleData();
- void resetPropertyRange() { m_propertyRange.start = m_propertyRange.end = std::numeric_limits<unsigned>::max(); }
- bool isExtractingSourceData() const { return !!m_currentRuleDataStack; }
- void syntaxError(const Location&, SyntaxErrorType = GeneralSyntaxError);
-
- inline int lex(void* yylval) { return (this->*m_lexFunc)(yylval); }
-
- int token() { return m_token; }
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
- void markViewportRuleBodyStart() { m_inViewport = true; }
- void markViewportRuleBodyEnd() { m_inViewport = false; }
- Ref<StyleRuleViewport> createViewportRule();
-#endif
-
- Ref<CSSPrimitiveValue> createPrimitiveNumericValue(ValueWithCalculation&);
- Ref<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue&);
-
- static URL completeURL(const CSSParserContext&, const String& url);
-
- Location currentLocation();
- static bool isCalculation(CSSParserValue&);
-
- void setCustomPropertyName(const AtomicString& propertyName) { m_customPropertyName = propertyName; }
-
</del><span class="cx"> RefPtr<CSSValue> parseValueWithVariableReferences(CSSPropertyID, const CSSValue&, const CustomPropertyValueMap& customProperties, TextDirection, WritingMode);
</span><span class="cx">
</span><del>-private:
- bool is8BitSource() { return m_is8BitSource; }
</del><ins>+ static Color parseColor(const String&, bool strict = false);
+ static Color parseSystemColor(const String&, Document*);
</ins><span class="cx">
</span><del>- template <typename SourceCharacterType>
- int realLex(void* yylval);
-
- UChar*& currentCharacter16();
-
- template <typename CharacterType>
- inline CharacterType*& currentCharacter();
-
- template <typename CharacterType>
- inline CharacterType* tokenStart();
-
- template <typename CharacterType>
- inline void setTokenStart(CharacterType*);
-
- inline unsigned tokenStartOffset();
- inline UChar tokenStartChar();
-
- inline unsigned currentCharacterOffset();
-
- template <typename CharacterType>
- inline bool isIdentifierStart();
-
- template <typename CharacterType>
- unsigned parseEscape(CharacterType*&);
- template <typename DestCharacterType>
- inline void UnicodeToChars(DestCharacterType*&, unsigned);
- template <typename SrcCharacterType, typename DestCharacterType>
- inline bool parseIdentifierInternal(SrcCharacterType*&, DestCharacterType*&, bool&);
-
- template <typename CharacterType>
- inline void parseIdentifier(CharacterType*&, CSSParserString&, bool&);
-
- template <typename SrcCharacterType, typename DestCharacterType>
- inline bool parseStringInternal(SrcCharacterType*&, DestCharacterType*&, UChar);
-
- template <typename CharacterType>
- inline void parseString(CharacterType*&, CSSParserString& resultString, UChar);
-
- template <typename CharacterType>
- inline bool findURI(CharacterType*& start, CharacterType*& end, UChar& quote);
-
- template <typename SrcCharacterType, typename DestCharacterType>
- inline bool parseURIInternal(SrcCharacterType*&, DestCharacterType*&, UChar quote);
-
- template <typename CharacterType>
- inline void parseURI(CSSParserString&);
- template <typename CharacterType>
- inline bool parseUnicodeRange();
- template <typename CharacterType>
- bool parseNthChild();
- template <typename CharacterType>
- bool parseNthChildExtra();
- template <typename CharacterType>
- inline bool detectFunctionTypeToken(int);
- template <typename CharacterType>
- inline void detectMediaQueryToken(int);
- template <typename CharacterType>
- inline void detectNumberToken(CharacterType*, int);
- template <typename CharacterType>
- inline void detectDashToken(int);
- template <typename CharacterType>
- inline void detectAtToken(int, bool);
- template <typename CharacterType>
- inline void detectSupportsToken(int);
-
- template <typename CharacterType>
- inline void setRuleHeaderEnd(const CharacterType*);
-
- void setStyleSheet(StyleSheetContents* styleSheet) { m_styleSheet = styleSheet; }
-
- inline bool inStrictMode() const { return m_context.mode == UASheetMode || m_context.mode == HTMLStandardMode || m_context.mode == SVGAttributeMode; }
- inline bool inQuirksMode() const { return m_context.mode == HTMLQuirksMode; }
-
- URL completeURL(const String& url) const;
-
- void recheckAtKeyword(const UChar* str, int len);
-
- template<unsigned prefixLength, unsigned suffixLength>
- void setupParser(const char (&prefix)[prefixLength], StringView string, const char (&suffix)[suffixLength])
- {
- setupParser(prefix, prefixLength - 1, string, suffix, suffixLength - 1);
- }
- void setupParser(const char* prefix, unsigned prefixLength, StringView, const char* suffix, unsigned suffixLength);
- bool inShorthand() const { return m_inParseShorthand; }
-
- bool isValidSize(ValueWithCalculation&);
-
- bool isGeneratedImageValue(CSSParserValue&) const;
- bool parseGeneratedImage(CSSParserValueList&, RefPtr<CSSValue>&);
-
- ParseResult parseValue(MutableStyleProperties&, CSSPropertyID, const String&, bool important, StyleSheetContents* contextStyleSheet);
-
- // FIXME-NEWPARSER: Remove once old parser is gone.
- Ref<ImmutableStyleProperties> parseDeclarationDeprecated(const String&, StyleSheetContents* contextStyleSheet);
-
- RefPtr<CSSBasicShapeInset> parseInsetRoundedCorners(Ref<CSSBasicShapeInset>&&, CSSParserValueList&);
-
- enum SizeParameterType {
- None,
- Auto,
- Length,
- PageSize,
- Orientation,
- };
-
- bool parsePage(CSSPropertyID propId, bool important);
- bool parseSize(CSSPropertyID propId, bool important);
- SizeParameterType parseSizeParameter(CSSValueList& parsedValues, CSSParserValue&, SizeParameterType prevParamType);
-
-#if ENABLE(CSS_SCROLL_SNAP)
- bool parseNonElementSnapPoints(CSSPropertyID propId, bool important);
- bool parseScrollSnapDestination(CSSPropertyID propId, bool important);
- bool parseScrollSnapCoordinate(CSSPropertyID propId, bool important);
- bool parseScrollSnapPositions(RefPtr<CSSValue>& cssValueX, RefPtr<CSSValue>& cssValueY);
-#endif
-
- bool parseFontFaceSrcURI(CSSValueList&);
- bool parseFontFaceSrcLocal(CSSValueList&);
-
- bool parseColorFromString(const String&);
-
-#if ENABLE(CSS_GRID_LAYOUT)
- bool parseIntegerOrCustomIdentFromGridPosition(RefPtr<CSSPrimitiveValue>& numericValue, RefPtr<CSSPrimitiveValue>& gridLineName);
-#endif
-
- enum ParsingMode {
- NormalMode,
- MediaQueryMode,
- SupportsMode,
- NthChildMode
- };
-
- ParsingMode m_parsingMode { NormalMode };
- bool m_is8BitSource { false };
- std::unique_ptr<LChar[]> m_dataStart8;
- std::unique_ptr<UChar[]> m_dataStart16;
- LChar* m_currentCharacter8 { nullptr };
- UChar* m_currentCharacter16 { nullptr };
- union {
- LChar* ptr8;
- UChar* ptr16;
- } m_tokenStart { nullptr };
- unsigned m_length { 0 };
- int m_token { 0 };
- int m_lineNumber { 0 };
- int m_tokenStartLineNumber { 0 };
- int m_tokenStartColumnNumber { 0 };
- int m_columnOffsetForLine { 0 };
-
- int m_sheetStartLineNumber { 0 };
- int m_sheetStartColumnNumber { 0 };
-
- bool m_allowImportRules { true };
- bool m_allowNamespaceDeclarations { true };
-
-#if ENABLE(CSS_DEVICE_ADAPTATION)
- bool parseViewportProperty(CSSPropertyID propId, bool important);
- bool parseViewportShorthand(CSSPropertyID propId, CSSPropertyID first, CSSPropertyID second, bool important);
-
- bool inViewport() const { return m_inViewport; }
- bool m_inViewport { false };
-#endif
-
- bool useLegacyBackgroundSizeShorthandBehavior() const;
-
- int (CSSParser::*m_lexFunc)(void*);
-
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> m_recycledSelectorVector;
-
- std::unique_ptr<RuleSourceDataList> m_supportsRuleDataStack;
-
- // defines units allowed for a certain property, used in parseUnit
- enum Units {
- FUnknown = 0x0000,
- FInteger = 0x0001,
- FNumber = 0x0002, // Real Numbers
- FPercent = 0x0004,
- FLength = 0x0008,
- FAngle = 0x0010,
- FTime = 0x0020,
- FFrequency = 0x0040,
- FPositiveInteger = 0x0080,
- FRelative = 0x0100,
-#if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY)
- FResolution = 0x0200,
-#endif
- FNonNeg = 0x0400
- };
-
- friend inline Units operator|(Units a, Units b)
- {
- return static_cast<Units>(static_cast<unsigned>(a) | static_cast<unsigned>(b));
- }
-
- enum ReleaseParsedCalcValueCondition {
- ReleaseParsedCalcValue,
- DoNotReleaseParsedCalcValue
- };
-
- bool isLoggingErrors();
- void logError(const String& message, int lineNumber, int columnNumber);
-
- bool validateCalculationUnit(ValueWithCalculation&, Units);
-
- bool shouldAcceptUnitLessValues(CSSParserValue&, Units, CSSParserMode);
-
- inline bool validateUnit(ValueWithCalculation& value, Units unitFlags) { return validateUnit(value, unitFlags, m_context.mode); }
- bool validateUnit(ValueWithCalculation&, Units, CSSParserMode);
-
- bool parseBorderImageQuad(Units, RefPtr<CSSPrimitiveValue>&);
- int parseColorInt(ValueWithCalculation&);
- double parseColorDouble(ValueWithCalculation&);
- double parsedDouble(ValueWithCalculation&);
-
- friend class TransformOperationInfo;
- friend class FilterOperationInfo;
-};
-
-CSSPropertyID cssPropertyID(const CSSParserString&);
-CSSPropertyID cssPropertyID(const String&);
-CSSValueID cssValueKeywordID(const CSSParserString&);
-#if PLATFORM(IOS)
-void cssPropertyNameIOSAliasing(const char* propertyName, const char*& propertyNameAlias, unsigned& newLength);
-#endif
-
-class ShorthandScope {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- ShorthandScope(CSSParser* parser, CSSPropertyID propId) : m_parser(parser)
- {
- if (!(m_parser->m_inParseShorthand++))
- m_parser->m_currentShorthand = propId;
- }
- ~ShorthandScope()
- {
- if (!(--m_parser->m_inParseShorthand))
- m_parser->m_currentShorthand = CSSPropertyInvalid;
- }
-
</del><span class="cx"> private:
</span><del>- CSSParser* m_parser;
-};
</del><ins>+ ParseResult parseValue(MutableStyleProperties&, CSSPropertyID, const String&, bool important);
</ins><span class="cx">
</span><del>-struct CSSParser::Location {
- int lineNumber;
- int columnNumber;
- CSSParserString token;
</del><ins>+ CSSParserContext m_context;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-bool isValidNthToken(const CSSParserString&);
-
-template <>
-inline void CSSParser::setTokenStart<LChar>(LChar* tokenStart)
-{
- m_tokenStart.ptr8 = tokenStart;
-}
-
-template <>
-inline void CSSParser::setTokenStart<UChar>(UChar* tokenStart)
-{
- m_tokenStart.ptr16 = tokenStart;
-}
-
-inline unsigned CSSParser::tokenStartOffset()
-{
- if (is8BitSource())
- return m_tokenStart.ptr8 - m_dataStart8.get();
- return m_tokenStart.ptr16 - m_dataStart16.get();
-}
-
-unsigned CSSParser::currentCharacterOffset()
-{
- if (is8BitSource())
- return m_currentCharacter8 - m_dataStart8.get();
- return m_currentCharacter16 - m_dataStart16.get();
-}
-
-inline UChar CSSParser::tokenStartChar()
-{
- if (is8BitSource())
- return *m_tokenStart.ptr8;
- return *m_tokenStart.ptr16;
-}
-
-inline bool isCustomPropertyName(const String& propertyName)
-{
- return propertyName.length() > 2 && propertyName.characterAt(0) == '-' && propertyName.characterAt(1) == '-';
-}
-
-inline int cssyylex(void* yylval, CSSParser* parser)
-{
- return parser->lex(yylval);
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserFastPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -692,6 +692,10 @@
</span><span class="cx"> return valueID == CSSValueHorizontal || valueID == CSSValueVertical || valueID == CSSValueInlineAxis || valueID == CSSValueBlockAxis;
</span><span class="cx"> case CSSPropertyWebkitBoxPack:
</span><span class="cx"> return valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueJustify;
</span><ins>+#if ENABLE(CURSOR_VISIBILITY)
+ case CSSPropertyWebkitCursorVisibility:
+ return valueID == CSSValueAuto || valueID == CSSValueAutoHide;
+#endif
</ins><span class="cx"> case CSSPropertyColumnFill:
</span><span class="cx"> return valueID == CSSValueAuto || valueID == CSSValueBalance;
</span><span class="cx"> case CSSPropertyWebkitColumnAxis:
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserMode.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserMode.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSParserMode.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -106,7 +106,6 @@
</span><span class="cx"> bool enforcesCSSMIMETypeInNoQuirksMode { true };
</span><span class="cx"> bool useLegacyBackgroundSizeShorthandBehavior { false };
</span><span class="cx"> bool springTimingFunctionEnabled { false };
</span><del>- bool useNewParser { false };
</del><span class="cx">
</span><span class="cx"> URL completeURL(const String& url) const
</span><span class="cx"> {
</span><span class="lines">@@ -145,11 +144,10 @@
</span><span class="cx"> & key.enforcesCSSMIMETypeInNoQuirksMode << 5
</span><span class="cx"> & key.useLegacyBackgroundSizeShorthandBehavior << 6
</span><span class="cx"> & key.springTimingFunctionEnabled << 7
</span><del>- & key.useNewParser << 8
</del><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><del>- & key.variationFontsEnabled << 9
</del><ins>+ & key.variationFontsEnabled << 8
</ins><span class="cx"> #endif
</span><del>- & key.mode << 10;
</del><ins>+ & key.mode << 9;
</ins><span class="cx"> hash ^= WTF::intHash(bits);
</span><span class="cx"> return hash;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserValues.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserValues.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSParserValues.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><span class="cx"> #include "CSSSelector.h"
</span><span class="cx"> #include "CSSSelectorList.h"
</span><del>-#include "CSSVariableValue.h"
</del><span class="cx"> #include "SelectorPseudoTypeMap.h"
</span><span class="cx">
</span><span class="cx"> #if COMPILER(MSVC)
</span><span class="lines">@@ -39,164 +38,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WTF;
</span><span class="cx">
</span><del>-void destroy(const CSSParserValue& value)
-{
- if (value.unit == CSSParserValue::Function)
- delete value.function;
- else if (value.unit == CSSParserValue::ValueList)
- delete value.valueList;
- else if (value.unit == CSSParserValue::Variable)
- delete value.variable;
-}
-
-CSSParserValueList::~CSSParserValueList()
-{
- for (auto& value : m_values)
- destroy(value);
-}
-
-void CSSParserValueList::addValue(const CSSParserValue& value)
-{
- m_values.append(value);
-}
-
-void CSSParserValueList::insertValueAt(unsigned i, const CSSParserValue& value)
-{
- m_values.insert(i, value);
-}
-
-void CSSParserValueList::extend(CSSParserValueList& other)
-{
- for (auto& value : other.m_values) {
- m_values.append(value);
- value.unit = 0; // We moved the CSSParserValue from the other list; this acts like std::move.
- }
-}
-
-bool CSSParserValueList::containsVariables() const
-{
- for (unsigned i = 0; i < size(); i++) {
- auto* parserValue = &m_values[i];
- if (parserValue->unit == CSSParserValue::Variable)
- return true;
- if (parserValue->unit == CSSParserValue::Function && parserValue->function->args
- && parserValue->function->args->containsVariables())
- return true;
- if (parserValue->unit == CSSParserValue::ValueList && parserValue->valueList->containsVariables())
- return true;
- }
- return false;
-}
-
-RefPtr<CSSValue> CSSParserValue::createCSSValue()
-{
- RefPtr<CSSValue> parsedValue;
- if (id)
- return CSSPrimitiveValue::createIdentifier(id);
-
- if (unit == CSSParserValue::Operator)
- return CSSPrimitiveValue::createParserOperator(iValue);
- if (unit == CSSParserValue::Function)
- return CSSFunctionValue::create(function);
- if (unit == CSSParserValue::Variable)
- return CSSVariableValue::create(variable);
- if (unit == CSSParserValue::ValueList)
- return CSSValueList::createFromParserValueList(*valueList);
-
- if (unit >= CSSParserValue::Q_EMS)
- return CSSPrimitiveValue::createAllowingMarginQuirk(fValue, CSSPrimitiveValue::CSS_EMS);
-
- CSSPrimitiveValue::UnitTypes primitiveUnit = static_cast<CSSPrimitiveValue::UnitTypes>(unit);
- switch (primitiveUnit) {
- case CSSPrimitiveValue::CSS_IDENT:
- case CSSPrimitiveValue::CSS_PROPERTY_ID:
- case CSSPrimitiveValue::CSS_VALUE_ID:
- return CSSPrimitiveValue::create(string, CSSPrimitiveValue::CSS_PARSER_IDENTIFIER);
- case CSSPrimitiveValue::CSS_NUMBER:
- return CSSPrimitiveValue::create(fValue, isInt ? CSSPrimitiveValue::CSS_PARSER_INTEGER : CSSPrimitiveValue::CSS_NUMBER);
- case CSSPrimitiveValue::CSS_STRING:
- case CSSPrimitiveValue::CSS_URI:
- case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR:
- case CSSPrimitiveValue::CSS_DIMENSION:
- case CSSPrimitiveValue::CSS_UNICODE_RANGE:
- case CSSPrimitiveValue::CSS_PARSER_WHITESPACE:
- return CSSPrimitiveValue::create(string, primitiveUnit);
- case CSSPrimitiveValue::CSS_PERCENTAGE:
- case CSSPrimitiveValue::CSS_EMS:
- case CSSPrimitiveValue::CSS_QUIRKY_EMS:
- case CSSPrimitiveValue::CSS_EXS:
- case CSSPrimitiveValue::CSS_PX:
- case CSSPrimitiveValue::CSS_CM:
- case CSSPrimitiveValue::CSS_MM:
- case CSSPrimitiveValue::CSS_IN:
- case CSSPrimitiveValue::CSS_PT:
- case CSSPrimitiveValue::CSS_PC:
- case CSSPrimitiveValue::CSS_DEG:
- case CSSPrimitiveValue::CSS_RAD:
- case CSSPrimitiveValue::CSS_GRAD:
- case CSSPrimitiveValue::CSS_MS:
- case CSSPrimitiveValue::CSS_S:
- case CSSPrimitiveValue::CSS_HZ:
- case CSSPrimitiveValue::CSS_KHZ:
- case CSSPrimitiveValue::CSS_VW:
- case CSSPrimitiveValue::CSS_VH:
- case CSSPrimitiveValue::CSS_VMIN:
- case CSSPrimitiveValue::CSS_VMAX:
- case CSSPrimitiveValue::CSS_TURN:
- case CSSPrimitiveValue::CSS_REMS:
- case CSSPrimitiveValue::CSS_CHS:
- case CSSPrimitiveValue::CSS_FR:
- return CSSPrimitiveValue::create(fValue, primitiveUnit);
- case CSSPrimitiveValue::CSS_UNKNOWN:
- case CSSPrimitiveValue::CSS_ATTR:
- case CSSPrimitiveValue::CSS_COUNTER:
- case CSSPrimitiveValue::CSS_RECT:
- case CSSPrimitiveValue::CSS_RGBCOLOR:
- case CSSPrimitiveValue::CSS_DPPX:
- case CSSPrimitiveValue::CSS_DPI:
- case CSSPrimitiveValue::CSS_DPCM:
- case CSSPrimitiveValue::CSS_PAIR:
-#if ENABLE(DASHBOARD_SUPPORT)
- case CSSPrimitiveValue::CSS_DASHBOARD_REGION:
-#endif
- case CSSPrimitiveValue::CSS_PARSER_OPERATOR:
- case CSSPrimitiveValue::CSS_PARSER_INTEGER:
- case CSSPrimitiveValue::CSS_PARSER_IDENTIFIER:
- case CSSPrimitiveValue::CSS_COUNTER_NAME:
- case CSSPrimitiveValue::CSS_SHAPE:
- case CSSPrimitiveValue::CSS_FONT_FAMILY:
- case CSSPrimitiveValue::CSS_QUAD:
-#if ENABLE(CSS_SCROLL_SNAP)
- case CSSPrimitiveValue::CSS_LENGTH_REPEAT:
-#endif
- case CSSPrimitiveValue::CSS_CALC:
- case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_NUMBER:
- case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH:
- return nullptr;
- }
-
- ASSERT_NOT_REACHED();
- return nullptr;
-}
-
-CSSParserSelector* CSSParserSelector::parsePagePseudoSelector(const CSSParserString& pseudoTypeString)
-{
- CSSSelector::PagePseudoClassType pseudoType;
- if (equalLettersIgnoringASCIICase(pseudoTypeString, "first"))
- pseudoType = CSSSelector::PagePseudoClassFirst;
- else if (equalLettersIgnoringASCIICase(pseudoTypeString, "left"))
- pseudoType = CSSSelector::PagePseudoClassLeft;
- else if (equalLettersIgnoringASCIICase(pseudoTypeString, "right"))
- pseudoType = CSSSelector::PagePseudoClassRight;
- else
- return nullptr;
-
- auto selector = std::make_unique<CSSParserSelector>();
- selector->m_selector->setMatch(CSSSelector::PagePseudoClass);
- selector->m_selector->setPagePseudoType(pseudoType);
- return selector.release();
-}
-
</del><span class="cx"> CSSParserSelector* CSSParserSelector::parsePagePseudoSelector(const AtomicString& pseudoTypeString)
</span><span class="cx"> {
</span><span class="cx"> CSSSelector::PagePseudoClassType pseudoType;
</span><span class="lines">@@ -215,27 +56,6 @@
</span><span class="cx"> return selector.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSParserSelector* CSSParserSelector::parsePseudoElementSelector(CSSParserString& pseudoTypeString)
-{
- pseudoTypeString.convertToASCIILowercaseInPlace();
- AtomicString name = pseudoTypeString;
-
- CSSSelector::PseudoElementType pseudoType = CSSSelector::parsePseudoElementType(name);
- if (pseudoType == CSSSelector::PseudoElementUnknown)
- return nullptr;
-
- auto selector = std::make_unique<CSSParserSelector>();
- selector->m_selector->setMatch(CSSSelector::PseudoElement);
- selector->m_selector->setPseudoElementType(pseudoType);
- if (pseudoType == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed) {
- ASSERT_WITH_MESSAGE(name == "-webkit-input-placeholder", "-webkit-input-placeholder is the only LegacyPrefix pseudo type.");
- if (name == "-webkit-input-placeholder")
- name = AtomicString("placeholder", AtomicString::ConstructFromLiteral);
- }
- selector->m_selector->setValue(name);
- return selector.release();
-}
-
</del><span class="cx"> CSSParserSelector* CSSParserSelector::parsePseudoElementSelectorFromStringView(StringView& pseudoTypeString)
</span><span class="cx"> {
</span><span class="cx"> AtomicString name = pseudoTypeString.toAtomicString();
</span><span class="lines">@@ -263,95 +83,6 @@
</span><span class="cx"> return selector.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK)
-CSSParserSelector* CSSParserSelector::parsePseudoElementCueFunctionSelector(const CSSParserString& functionIdentifier, Vector<std::unique_ptr<CSSParserSelector>>* parsedSelectorVector)
-{
- ASSERT_UNUSED(functionIdentifier, String(functionIdentifier) == "cue(");
-
- std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> selectorVector(parsedSelectorVector);
-
- if (!selectorVector)
- return nullptr;
-
- auto selector = std::make_unique<CSSParserSelector>();
- selector->m_selector->setMatch(CSSSelector::PseudoElement);
- selector->m_selector->setPseudoElementType(CSSSelector::PseudoElementCue);
- selector->adoptSelectorVector(*selectorVector);
- return selector.release();
-}
-#endif
-
-CSSParserSelector* CSSParserSelector::parsePseudoElementSlottedFunctionSelector(const CSSParserString& functionIdentifier, CSSParserSelector* parsedSelector)
-{
- ASSERT_UNUSED(functionIdentifier, String(functionIdentifier) == "slotted(");
-
- if (!parsedSelector)
- return nullptr;
-
- std::unique_ptr<CSSParserSelector> ownedParsedSelector(parsedSelector);
-
- for (auto* component = parsedSelector; component; component = component->tagHistory()) {
- if (component->matchesPseudoElement())
- return nullptr;
- }
-
- auto selectorVector = std::make_unique<Vector<std::unique_ptr<CSSParserSelector>>>();
- selectorVector->append(WTFMove(ownedParsedSelector));
-
- auto selector = std::make_unique<CSSParserSelector>();
- selector->m_selector->setMatch(CSSSelector::PseudoElement);
- selector->m_selector->setPseudoElementType(CSSSelector::PseudoElementSlotted);
- selector->adoptSelectorVector(*selectorVector);
- return selector.release();
-}
-
-CSSParserSelector* CSSParserSelector::parsePseudoClassHostFunctionSelector(const CSSParserString& functionIdentifier, CSSParserSelector* parsedSelector)
-{
- ASSERT_UNUSED(functionIdentifier, String(functionIdentifier) == "host(");
-
- if (!parsedSelector)
- return nullptr;
-
- std::unique_ptr<CSSParserSelector> ownedParsedSelector(parsedSelector);
-
- for (auto* component = parsedSelector; component; component = component->tagHistory()) {
- if (component->matchesPseudoElement())
- return nullptr;
- }
-
- auto selectorVector = std::make_unique<Vector<std::unique_ptr<CSSParserSelector>>>();
- selectorVector->append(WTFMove(ownedParsedSelector));
-
- auto selector = std::make_unique<CSSParserSelector>();
- selector->m_selector->setMatch(CSSSelector::PseudoClass);
- selector->m_selector->setPseudoClassType(CSSSelector::PseudoClassHost);
- selector->adoptSelectorVector(*selectorVector);
- return selector.release();
-}
-
-CSSParserSelector* CSSParserSelector::parsePseudoClassAndCompatibilityElementSelector(CSSParserString& pseudoTypeString)
-{
- if (pseudoTypeString.length() && pseudoTypeString[pseudoTypeString.length() - 1] == '(')
- return nullptr;
-
- PseudoClassOrCompatibilityPseudoElement pseudoType = parsePseudoClassAndCompatibilityElementString(pseudoTypeString);
- if (pseudoType.pseudoClass != CSSSelector::PseudoClassUnknown) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->m_selector->setMatch(CSSSelector::PseudoClass);
- selector->m_selector->setPseudoClassType(pseudoType.pseudoClass);
- return selector.release();
- }
- if (pseudoType.compatibilityPseudoElement != CSSSelector::PseudoElementUnknown) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->m_selector->setMatch(CSSSelector::PseudoElement);
- selector->m_selector->setPseudoElementType(pseudoType.compatibilityPseudoElement);
- AtomicString name = pseudoTypeString;
- selector->m_selector->setValue(name);
- return selector.release();
- }
- return nullptr;
-}
-
</del><span class="cx"> CSSParserSelector* CSSParserSelector::parsePseudoClassSelectorFromStringView(StringView& pseudoTypeString)
</span><span class="cx"> {
</span><span class="cx"> PseudoClassOrCompatibilityPseudoElement pseudoType = parsePseudoClassAndCompatibilityElementString(pseudoTypeString);
</span><span class="lines">@@ -404,16 +135,6 @@
</span><span class="cx"> m_selector->setSelectorList(WTFMove(selectorList));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSParserSelector::setLangArgumentList(const Vector<CSSParserString>& stringVector)
-{
- ASSERT_WITH_MESSAGE(!stringVector.isEmpty(), "No CSS Selector takes an empty argument list.");
- auto argumentList = std::make_unique<Vector<AtomicString>>();
- argumentList->reserveInitialCapacity(stringVector.size());
- for (const AtomicString& languageArgument : stringVector)
- argumentList->uncheckedAppend(languageArgument);
- m_selector->setLangArgumentList(WTFMove(argumentList));
-}
-
</del><span class="cx"> void CSSParserSelector::setLangArgumentList(std::unique_ptr<Vector<AtomicString>> argumentList)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_MESSAGE(!argumentList->isEmpty(), "No CSS Selector takes an empty argument list.");
</span><span class="lines">@@ -424,15 +145,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_selector->setSelectorList(WTFMove(selectorList));
</span><span class="cx"> }
</span><del>-
-void CSSParserSelector::setPseudoClassValue(const CSSParserString& pseudoClassString)
-{
- ASSERT(m_selector->match() == CSSSelector::PseudoClass);
</del><span class="cx">
</span><del>- PseudoClassOrCompatibilityPseudoElement pseudoType = parsePseudoClassAndCompatibilityElementString(pseudoClassString);
- m_selector->setPseudoClassType(pseudoType.pseudoClass);
-}
-
</del><span class="cx"> static bool selectorListMatchesPseudoElement(const CSSSelectorList* selectorList)
</span><span class="cx"> {
</span><span class="cx"> if (!selectorList)
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserValues.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -32,161 +32,6 @@
</span><span class="cx"> class CSSValue;
</span><span class="cx"> class QualifiedName;
</span><span class="cx">
</span><del>-// This should be a StringView but currently it can't because it's used as an element of a union in CSSParserValue.
-struct CSSParserString {
- void init(LChar* characters, unsigned length)
- {
- m_data.characters8 = characters;
- m_length = length;
- m_is8Bit = true;
- }
-
- void init(UChar* characters, unsigned length)
- {
- m_data.characters16 = characters;
- m_length = length;
- m_is8Bit = false;
- }
-
- void init(const String& string)
- {
- m_length = string.length();
- if (!m_length || string.is8Bit()) {
- m_data.characters8 = const_cast<LChar*>(string.characters8());
- m_is8Bit = true;
- } else {
- m_data.characters16 = const_cast<UChar*>(string.characters16());
- m_is8Bit = false;
- }
- }
-
- void clear()
- {
- m_data.characters8 = 0;
- m_length = 0;
- m_is8Bit = true;
- }
-
- bool is8Bit() const { return m_is8Bit; }
- LChar* characters8() const { ASSERT(is8Bit()); return m_data.characters8; }
- UChar* characters16() const { ASSERT(!is8Bit()); return m_data.characters16; }
- template<typename CharacterType> CharacterType* characters() const;
-
- unsigned length() const { return m_length; }
- void setLength(unsigned length) { m_length = length; }
-
- void convertToASCIILowercaseInPlace();
-
- UChar operator[](unsigned i) const
- {
- ASSERT_WITH_SECURITY_IMPLICATION(i < m_length);
- if (is8Bit())
- return m_data.characters8[i];
- return m_data.characters16[i];
- }
-
- operator String() const { return is8Bit() ? String(m_data.characters8, m_length) : String(m_data.characters16, m_length); }
- operator AtomicString() const { return is8Bit() ? AtomicString(m_data.characters8, m_length) : AtomicString(m_data.characters16, m_length); }
- StringView toStringView() const { return is8Bit() ? StringView(m_data.characters8, m_length) : StringView(m_data.characters16, m_length); }
-
- union {
- LChar* characters8;
- UChar* characters16;
- } m_data;
- unsigned m_length;
- bool m_is8Bit;
-};
-
-template<unsigned length> bool equalLettersIgnoringASCIICase(const CSSParserString&, const char (&lowercaseLetters)[length]);
-
-struct CSSParserFunction;
-struct CSSParserVariable;
-
-struct CSSParserValue {
- CSSValueID id;
- bool isInt;
- union {
- double fValue;
- int iValue;
- CSSParserString string;
- CSSParserFunction* function;
- CSSParserVariable* variable;
- CSSParserValueList* valueList;
- };
- enum {
- Operator = 0x100000,
- Function = 0x100001,
- ValueList = 0x100002,
- Q_EMS = 0x100003,
- Variable = 0x100004
- };
- int unit;
-
- void setFromValueList(std::unique_ptr<CSSParserValueList>);
-
- RefPtr<CSSValue> createCSSValue();
-};
-
-void destroy(const CSSParserValue&);
-
-class CSSParserValueList {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- CSSParserValueList()
- : m_current(0)
- {
- }
- ~CSSParserValueList();
-
- void addValue(const CSSParserValue&);
- void insertValueAt(unsigned, const CSSParserValue&);
- void extend(CSSParserValueList&);
-
- unsigned size() const { return m_values.size(); }
- unsigned currentIndex() { return m_current; }
- CSSParserValue* current() { return m_current < m_values.size() ? &m_values[m_current] : 0; }
- CSSParserValue* next() { ++m_current; return current(); }
- CSSParserValue* previous()
- {
- if (!m_current)
- return 0;
- --m_current;
- return current();
- }
- void setCurrentIndex(unsigned index)
- {
- ASSERT(index < m_values.size());
- if (index < m_values.size())
- m_current = index;
- }
-
- CSSParserValue* valueAt(unsigned i) { return i < m_values.size() ? &m_values[i] : 0; }
-
- void clear() { m_values.clear(); }
-
- String toString();
-
- bool containsVariables() const;
-
-private:
- unsigned m_current;
- Vector<CSSParserValue, 4> m_values;
-};
-
-struct CSSParserFunction {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- CSSParserString name;
- std::unique_ptr<CSSParserValueList> args;
-};
-
-struct CSSParserVariable {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- CSSParserString name; // The custom property name
- std::unique_ptr<CSSParserValueList> args; // The fallback args
-};
-
</del><span class="cx"> enum class CSSParserSelectorCombinator {
</span><span class="cx"> Child,
</span><span class="cx"> DescendantSpace,
</span><span class="lines">@@ -200,14 +45,6 @@
</span><span class="cx"> class CSSParserSelector {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- // FIXME-NEWPARSER: Remove the CSSParserString-based parsing functions once the old parser is gone.
- static CSSParserSelector* parsePagePseudoSelector(const CSSParserString& pseudoTypeString);
- static CSSParserSelector* parsePseudoElementSelector(CSSParserString& pseudoTypeString);
- static CSSParserSelector* parsePseudoElementCueFunctionSelector(const CSSParserString& functionIdentifier, Vector<std::unique_ptr<CSSParserSelector>>*);
- static CSSParserSelector* parsePseudoElementSlottedFunctionSelector(const CSSParserString& functionIdentifier, CSSParserSelector*);
- static CSSParserSelector* parsePseudoClassHostFunctionSelector(const CSSParserString& functionIdentifier, CSSParserSelector*);
- static CSSParserSelector* parsePseudoClassAndCompatibilityElementSelector(CSSParserString& pseudoTypeString);
-
</del><span class="cx"> static CSSParserSelector* parsePseudoClassSelectorFromStringView(StringView&);
</span><span class="cx"> static CSSParserSelector* parsePseudoElementSelectorFromStringView(StringView&);
</span><span class="cx"> static CSSParserSelector* parsePagePseudoSelector(const AtomicString&);
</span><span class="lines">@@ -239,11 +76,9 @@
</span><span class="cx"> void setPseudoElementType(CSSSelector::PseudoElementType type) { m_selector->setPseudoElementType(type); }
</span><span class="cx">
</span><span class="cx"> void adoptSelectorVector(Vector<std::unique_ptr<CSSParserSelector>>& selectorVector);
</span><del>- void setLangArgumentList(const Vector<CSSParserString>& stringVector);
</del><span class="cx"> void setLangArgumentList(std::unique_ptr<Vector<AtomicString>>);
</span><span class="cx"> void setSelectorList(std::unique_ptr<CSSSelectorList>);
</span><span class="cx">
</span><del>- void setPseudoClassValue(const CSSParserString& pseudoClassString);
</del><span class="cx"> CSSSelector::PseudoClassType pseudoClassType() const { return m_selector->pseudoClassType(); }
</span><span class="cx"> bool isCustomPseudoElement() const { return m_selector->isCustomPseudoElement(); }
</span><span class="cx">
</span><span class="lines">@@ -297,16 +132,4 @@
</span><span class="cx"> || pseudoElementType() == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void CSSParserValue::setFromValueList(std::unique_ptr<CSSParserValueList> valueList)
-{
- id = CSSValueInvalid;
- this->valueList = valueList.release();
- unit = ValueList;
</del><span class="cx"> }
</span><del>-
-template<unsigned length> inline bool equalLettersIgnoringASCIICase(const CSSParserString& string, const char (&lowercaseLetters)[length])
-{
- return WTF::equalLettersIgnoringASCIICaseCommon(string, lowercaseLetters);
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -89,6 +89,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+
+bool isCustomPropertyName(const String& propertyName)
+{
+ return propertyName.length() > 2 && propertyName.characterAt(0) == '-' && propertyName.characterAt(1) == '-';
+}
+
</ins><span class="cx"> static bool hasPrefix(const char* string, unsigned length, const char* prefix)
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="lines">@@ -101,7 +107,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-static void cssPropertyNameIOSAliasing(const char* propertyName, const char*& propertyNameAlias, unsigned& newLength)
</del><ins>+void cssPropertyNameIOSAliasing(const char* propertyName, const char*& propertyNameAlias, unsigned& newLength)
</ins><span class="cx"> {
</span><span class="cx"> if (!strcmp(propertyName, "-webkit-hyphenate-locale")) {
</span><span class="cx"> // Worked in iOS 4.2.
</span><span class="lines">@@ -244,7 +250,7 @@
</span><span class="cx"> for (unsigned i = 0; i < shorthandLength; ++i)
</span><span class="cx"> addProperty(longhands[i], property, value.copyRef(), important);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> bool CSSPropertyParser::parseValue(CSSPropertyID propertyID, bool important, const CSSParserTokenRange& range, const CSSParserContext& context, StyleSheetContents* styleSheetContents, ParsedPropertyVector& parsedProperties, StyleRule::Type ruleType)
</span><span class="cx"> {
</span><span class="cx"> int parsedPropertiesSize = parsedProperties.size();
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -108,5 +108,10 @@
</span><span class="cx">
</span><span class="cx"> CSSPropertyID cssPropertyID(StringView);
</span><span class="cx"> CSSValueID cssValueKeywordID(StringView);
</span><ins>+bool isCustomPropertyName(const String&);
</ins><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+void cssPropertyNameIOSAliasing(const char* propertyName, const char*& propertyNameAlias, unsigned& newLength);
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSSelectorParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -133,12 +133,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (simpleSelector.match() != CSSSelector::PseudoElement)
</span><span class="cx"> return 0;
</span><del>- // FIXME-NEWPARSER: These don't exist for us, so may need to revisit.
- // if (simpleSelector.pseudoElementType() == CSSSelector::PseudoContent)
- // return HasContentPseudoElement;
- // if (simpleSelector.pseudoElementType() == CSSSelector::PseudoShadow)
- // return 0;
-
</del><ins>+
</ins><span class="cx"> // FIXME: https://bugs.webkit.org/show_bug.cgi?id=161747
</span><span class="cx"> // The UASheetMode check is a work-around to allow this selector in mediaControls(New).css:
</span><span class="cx"> // input[type="range" i]::-webkit-media-slider-container > div {
</span><span class="lines">@@ -181,9 +176,6 @@
</span><span class="cx"> compoundFlags |= extractCompoundFlags(*end, m_context.mode);
</span><span class="cx"> }
</span><span class="cx"> end->setRelation(combinator);
</span><del>- // FIXME-NEWPARSER: Shadow stuff that we don't have.
- // if (previousCompoundFlags & HasContentPseudoElement)
- // end->setRelationIsAffectedByPseudoContent();
</del><span class="cx"> previousCompoundFlags = compoundFlags;
</span><span class="cx"> end->setTagHistory(WTFMove(selector));
</span><span class="cx">
</span><span class="lines">@@ -319,7 +311,7 @@
</span><span class="cx"> return selector;
</span><span class="cx"> }
</span><span class="cx"> prependTypeSelectorIfNeeded(namespacePrefix, elementName, compoundSelector.get());
</span><del>- return splitCompoundAtImplicitShadowCrossingCombinator(WTFMove(compoundSelector));
</del><ins>+ return splitCompoundAtImplicitShadowCrossingCombinator(WTFMove(compoundSelector), m_context);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CSSParserSelector> CSSSelectorParser::consumeSimpleSelector(CSSParserTokenRange& range)
</span><span class="lines">@@ -889,7 +881,7 @@
</span><span class="cx"> return compoundSelector;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<CSSParserSelector> CSSSelectorParser::splitCompoundAtImplicitShadowCrossingCombinator(std::unique_ptr<CSSParserSelector> compoundSelector)
</del><ins>+std::unique_ptr<CSSParserSelector> CSSSelectorParser::splitCompoundAtImplicitShadowCrossingCombinator(std::unique_ptr<CSSParserSelector> compoundSelector, const CSSParserContext& context)
</ins><span class="cx"> {
</span><span class="cx"> // The tagHistory is a linked list that stores combinator separated compound selectors
</span><span class="cx"> // from right-to-left. Yet, within a single compound selector, stores the simple selectors
</span><span class="lines">@@ -904,19 +896,17 @@
</span><span class="cx"> //
</span><span class="cx"> // Example: input#x::-webkit-clear-button -> [ ::-webkit-clear-button, input, #x ]
</span><span class="cx"> //
</span><del>- // Likewise, ::slotted() pseudo element has an implicit ShadowSlot combinator to its left
- // for finding matching slot element in other TreeScope.
- //
- // Example: slot[name=foo]::slotted(div) -> [ ::slotted(div), slot, [name=foo] ]
</del><span class="cx"> CSSParserSelector* splitAfter = compoundSelector.get();
</span><del>-
</del><span class="cx"> while (splitAfter->tagHistory() && !splitAfter->tagHistory()->needsImplicitShadowCombinatorForMatching())
</span><span class="cx"> splitAfter = splitAfter->tagHistory();
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!splitAfter || !splitAfter->tagHistory())
</span><span class="cx"> return compoundSelector;
</span><span class="cx">
</span><del>- std::unique_ptr<CSSParserSelector> secondCompound = splitAfter->releaseTagHistory();
</del><ins>+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=161747
+ // We have to recur, since we have rules in media controls like video::a::b. This should not be allowed, and
+ // we should remove this recursion once those rules are gone.
+ std::unique_ptr<CSSParserSelector> secondCompound = context.mode != UASheetMode ? splitAfter->releaseTagHistory() : splitCompoundAtImplicitShadowCrossingCombinator(splitAfter->releaseTagHistory(), context);
</ins><span class="cx"> secondCompound->appendTagHistory(CSSSelector::ShadowDescendant, WTFMove(compoundSelector));
</span><span class="cx"> return secondCompound;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSSelectorParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSSelectorParser.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> const AtomicString& determineNamespace(const AtomicString& prefix);
</span><span class="cx"> void prependTypeSelectorIfNeeded(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector*);
</span><span class="cx"> static std::unique_ptr<CSSParserSelector> addSimpleSelectorToCompound(std::unique_ptr<CSSParserSelector> compoundSelector, std::unique_ptr<CSSParserSelector> simpleSelector);
</span><del>- static std::unique_ptr<CSSParserSelector> splitCompoundAtImplicitShadowCrossingCombinator(std::unique_ptr<CSSParserSelector> compoundSelector);
</del><ins>+ static std::unique_ptr<CSSParserSelector> splitCompoundAtImplicitShadowCrossingCombinator(std::unique_ptr<CSSParserSelector> compoundSelector, const CSSParserContext&);
</ins><span class="cx">
</span><span class="cx"> const CSSParserContext& m_context;
</span><span class="cx"> RefPtr<StyleSheetContents> m_styleSheet; // FIXME: Should be const
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserSVGCSSParsercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/parser/SVGCSSParser.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/SVGCSSParser.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/css/parser/SVGCSSParser.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,353 +0,0 @@
</span><del>-/*
- Copyright (C) 2008 Eric Seidel <eric@webkit.org>
- Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
- 2004, 2005, 2007, 2010 Rob Buis <buis@kde.org>
- Copyright (C) 2005, 2006 Apple Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "config.h"
-
-#include "CSSInheritedValue.h"
-#include "CSSInitialValue.h"
-#include "CSSParser.h"
-#include "CSSPropertyNames.h"
-#include "CSSValueKeywords.h"
-#include "CSSValueList.h"
-#include "RenderTheme.h"
-#include "SVGPaint.h"
-
-#include <wtf/SetForScope.h>
-
-namespace WebCore {
-
-static bool isValidSystemControlColorValue(CSSValueID id)
-{
- return id >= CSSValueActiveborder && CSSParser::isValidSystemColorValue(id);
-}
-
-bool CSSParser::parseSVGValue(CSSPropertyID propId, bool important)
-{
- if (!m_valueList->current())
- return false;
- ValueWithCalculation valueWithCalculation(*m_valueList->current());
-
- CSSValueID id = valueWithCalculation.value().id;
-
- bool valid_primitive = false;
- RefPtr<CSSValue> parsedValue;
-
- switch (propId) {
- /* The comment to the right defines all valid value of these
- * properties as defined in SVG 1.1, Appendix N. Property index */
- case CSSPropertyBaselineShift:
- // baseline | super | sub | <percentage> | <length> | inherit
- if (id == CSSValueBaseline || id == CSSValueSub ||
- id >= CSSValueSuper)
- valid_primitive = true;
- else
- valid_primitive = validateUnit(valueWithCalculation, FLength | FPercent, SVGAttributeMode);
- break;
-
- case CSSPropertyEnableBackground:
- // accumulate | new [x] [y] [width] [height] | inherit
- if (id == CSSValueAccumulate) // TODO : new
- valid_primitive = true;
- break;
-
- case CSSPropertyMarkerStart:
- case CSSPropertyMarkerMid:
- case CSSPropertyMarkerEnd:
- case CSSPropertyMask:
- if (id == CSSValueNone)
- valid_primitive = true;
- else if (valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_URI) {
- parsedValue = CSSPrimitiveValue::create(valueWithCalculation.value().string, CSSPrimitiveValue::CSS_URI);
- if (parsedValue)
- m_valueList->next();
- }
- break;
-
- case CSSPropertyStrokeMiterlimit: // <miterlimit> | inherit
- valid_primitive = validateUnit(valueWithCalculation, FNumber | FNonNeg, SVGAttributeMode);
- break;
-
- case CSSPropertyStrokeOpacity: // <opacity-value> | inherit
- case CSSPropertyFillOpacity:
- case CSSPropertyStopOpacity:
- case CSSPropertyFloodOpacity:
- valid_primitive = (!id && validateUnit(valueWithCalculation, FNumber | FPercent, SVGAttributeMode));
- break;
-
- case CSSPropertyColorProfile: // auto | sRGB | <name> | <uri> inherit
- if (id == CSSValueAuto || id == CSSValueSrgb)
- valid_primitive = true;
- break;
-
- /* Start of supported CSS properties with validation. This is needed for parseShortHand to work
- * correctly and allows optimization in applyRule(..)
- */
-
- case CSSPropertyGlyphOrientationVertical: // auto | <angle> | inherit
- if (id == CSSValueAuto) {
- valid_primitive = true;
- break;
- }
- FALLTHROUGH;
-
- case CSSPropertyGlyphOrientationHorizontal: // <angle> (restricted to _deg_ per SVG 1.1 spec) | inherit
- if (valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_DEG || valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_NUMBER) {
- parsedValue = CSSPrimitiveValue::create(valueWithCalculation.value().fValue, CSSPrimitiveValue::CSS_DEG);
-
- if (parsedValue)
- m_valueList->next();
- }
- break;
- case CSSPropertyPaintOrder:
- if (id == CSSValueNormal)
- valid_primitive = true;
- else
- parsedValue = parsePaintOrder();
- break;
- case CSSPropertyFill: // <paint> | inherit
- case CSSPropertyStroke: // <paint> | inherit
- {
- if (id == CSSValueNone)
- parsedValue = SVGPaint::createNone();
- else if (id == CSSValueCurrentcolor)
- parsedValue = SVGPaint::createCurrentColor();
- else if (isValidSystemControlColorValue(id) || id == CSSValueMenu)
- parsedValue = SVGPaint::createColor(RenderTheme::defaultTheme()->systemColor(id));
- else if (valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_URI) {
- if (m_valueList->next()) {
- Color color = parseColorFromValue(*m_valueList->current());
- if (color.isValid())
- parsedValue = SVGPaint::createURIAndColor(valueWithCalculation.value().string, color);
- else if (m_valueList->current()->id == CSSValueNone)
- parsedValue = SVGPaint::createURIAndNone(valueWithCalculation.value().string);
- }
- if (!parsedValue)
- parsedValue = SVGPaint::createURI(valueWithCalculation.value().string);
- } else
- parsedValue = parseSVGPaint();
-
- if (parsedValue)
- m_valueList->next();
- }
- break;
-
- case CSSPropertyStopColor: // TODO : icccolor
- case CSSPropertyFloodColor:
- case CSSPropertyLightingColor:
- if (CSSParser::isValidSystemColorValue(id)
- || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen))
- parsedValue = SVGColor::createFromString(valueWithCalculation.value().string);
- else if (id == CSSValueCurrentcolor)
- parsedValue = SVGColor::createCurrentColor();
- else // TODO : svgcolor (iccColor)
- parsedValue = parseSVGColor();
-
- if (parsedValue)
- m_valueList->next();
-
- break;
-
- case CSSPropertyStrokeWidth: // <length> | inherit
- case CSSPropertyStrokeDashoffset:
- valid_primitive = validateUnit(valueWithCalculation, FLength | FPercent, SVGAttributeMode);
- break;
- case CSSPropertyStrokeDasharray: // none | <dasharray> | inherit
- if (id == CSSValueNone)
- valid_primitive = true;
- else
- parsedValue = parseSVGStrokeDasharray();
-
- break;
-
- case CSSPropertyKerning: // auto | normal | <length> | inherit
- if (id == CSSValueAuto || id == CSSValueNormal)
- valid_primitive = true;
- else
- valid_primitive = validateUnit(valueWithCalculation, FLength, SVGAttributeMode);
- break;
-
- case CSSPropertyClipPath: // <uri> | none | inherit
- case CSSPropertyFilter:
- if (id == CSSValueNone)
- valid_primitive = true;
- else if (valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_URI) {
- parsedValue = CSSPrimitiveValue::create(valueWithCalculation.value().string, (CSSPrimitiveValue::UnitTypes) valueWithCalculation.value().unit);
- if (parsedValue)
- m_valueList->next();
- }
- break;
- case CSSPropertyWebkitSvgShadow:
- if (id == CSSValueNone)
- valid_primitive = true;
- else {
- auto shadowValueList = parseShadow(*m_valueList, propId);
- if (shadowValueList) {
- addProperty(propId, WTFMove(shadowValueList), important);
- m_valueList->next();
- return true;
- }
- return false;
- }
- break;
-
- /* shorthand properties */
- case CSSPropertyMarker:
- {
- ShorthandScope scope(this, propId);
- SetForScope<bool> change(m_implicitShorthand, true);
- if (!parseValue(CSSPropertyMarkerStart, important))
- return false;
- if (m_valueList->current()) {
- rollbackLastProperties(1);
- return false;
- }
- CSSValue* value = m_parsedProperties.last().value();
- addProperty(CSSPropertyMarkerMid, value, important);
- addProperty(CSSPropertyMarkerEnd, value, important);
- return true;
- }
- case CSSPropertyCx:
- case CSSPropertyCy:
- case CSSPropertyR:
- case CSSPropertyRx:
- case CSSPropertyRy:
- case CSSPropertyX:
- case CSSPropertyY:
- valid_primitive = (!id && validateUnit(valueWithCalculation, FLength | FPercent));
- break;
- default:
- // If you crash here, it's because you added a css property and are not handling it
- // in either this switch statement or the one in CSSParser::parseValue
- ASSERT_WITH_MESSAGE(0, "unimplemented propertyID: %d", propId);
- return false;
- }
-
- if (valid_primitive) {
- if (id != 0)
- parsedValue = CSSPrimitiveValue::createIdentifier(id);
- else if (valueWithCalculation.value().unit == CSSPrimitiveValue::CSS_STRING)
- parsedValue = CSSPrimitiveValue::create(valueWithCalculation.value().string, (CSSPrimitiveValue::UnitTypes) valueWithCalculation.value().unit);
- else if (valueWithCalculation.value().unit >= CSSPrimitiveValue::CSS_NUMBER && valueWithCalculation.value().unit <= CSSPrimitiveValue::CSS_KHZ)
- parsedValue = CSSPrimitiveValue::create(valueWithCalculation.value().fValue, (CSSPrimitiveValue::UnitTypes) valueWithCalculation.value().unit);
- else if (valueWithCalculation.value().unit >= CSSParserValue::Q_EMS)
- parsedValue = CSSPrimitiveValue::createAllowingMarginQuirk(valueWithCalculation.value().fValue, CSSPrimitiveValue::CSS_EMS);
- if (isCalculation(valueWithCalculation))
- parsedValue = CSSPrimitiveValue::create(valueWithCalculation.calculation());
- m_valueList->next();
- }
- if (!parsedValue || (m_valueList->current() && !inShorthand()))
- return false;
-
- addProperty(propId, WTFMove(parsedValue), important);
- return true;
-}
-
-RefPtr<CSSValueList> CSSParser::parseSVGStrokeDasharray()
-{
- RefPtr<CSSValueList> ret = CSSValueList::createCommaSeparated();
- CSSParserValue* value = m_valueList->current();
- bool valid_primitive = true;
- while (value) {
- ValueWithCalculation valueWithCalculation(*value);
- valid_primitive = validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg, SVGAttributeMode);
- if (!valid_primitive)
- break;
- // FIXME: This code doesn't handle calculated values.
- if (value->id != 0)
- ret->append(CSSPrimitiveValue::createIdentifier(value->id));
- else if (value->unit >= CSSPrimitiveValue::CSS_NUMBER && value->unit <= CSSPrimitiveValue::CSS_KHZ)
- ret->append(CSSPrimitiveValue::create(value->fValue, (CSSPrimitiveValue::UnitTypes) value->unit));
- value = m_valueList->next();
- if (value && value->unit == CSSParserValue::Operator && value->iValue == ',')
- value = m_valueList->next();
- }
- if (!valid_primitive)
- return nullptr;
- return ret;
-}
-
-RefPtr<SVGPaint> CSSParser::parseSVGPaint()
-{
- Color color = parseColorFromValue(*m_valueList->current());
- if (!color.isValid())
- return nullptr;
- return SVGPaint::createColor(color);
-}
-
-RefPtr<SVGColor> CSSParser::parseSVGColor()
-{
- Color color = parseColorFromValue(*m_valueList->current());
- if (!color.isValid())
- return nullptr;
- return SVGColor::createFromColor(color);
-}
-
-RefPtr<CSSValueList> CSSParser::parsePaintOrder()
-{
- CSSParserValue* value = m_valueList->current();
-
- Vector<CSSValueID> paintTypeList;
- RefPtr<CSSPrimitiveValue> fill;
- RefPtr<CSSPrimitiveValue> stroke;
- RefPtr<CSSPrimitiveValue> markers;
- while (value) {
- if (value->id == CSSValueFill && !fill)
- fill = CSSPrimitiveValue::createIdentifier(value->id);
- else if (value->id == CSSValueStroke && !stroke)
- stroke = CSSPrimitiveValue::createIdentifier(value->id);
- else if (value->id == CSSValueMarkers && !markers)
- markers = CSSPrimitiveValue::createIdentifier(value->id);
- else
- return nullptr;
- paintTypeList.append(value->id);
- value = m_valueList->next();
- }
-
- // After parsing we serialize the paint-order list. Since it is not possible to
- // pop a last list items from CSSValueList without bigger cost, we create the
- // list after parsing.
- CSSValueID firstPaintOrderType = paintTypeList.at(0);
- auto paintOrderList = CSSValueList::createSpaceSeparated();
- switch (firstPaintOrderType) {
- case CSSValueFill:
- FALLTHROUGH;
- case CSSValueStroke:
- paintOrderList->append(firstPaintOrderType == CSSValueFill ? fill.releaseNonNull() : stroke.releaseNonNull());
- if (paintTypeList.size() > 1) {
- if (paintTypeList.at(1) == CSSValueMarkers)
- paintOrderList->append(markers.releaseNonNull());
- }
- break;
- case CSSValueMarkers:
- paintOrderList->append(markers.releaseNonNull());
- if (paintTypeList.size() > 1) {
- if (paintTypeList.at(1) == CSSValueStroke)
- paintOrderList->append(stroke.releaseNonNull());
- }
- break;
- default:
- ASSERT_NOT_REACHED();
- }
- return WTFMove(paintOrderList);
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoredomInlineStyleSheetOwnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> m_sheet->setMediaQueries(mediaQueries.releaseNonNull());
</span><span class="cx"> m_sheet->setTitle(element.title());
</span><span class="cx">
</span><del>- contents->parseStringAtPosition(text, m_startTextPosition, m_isParsingChildren);
</del><ins>+ contents->parseString(text);
</ins><span class="cx">
</span><span class="cx"> m_loading = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSParserObserver.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><ins>+#include "CSSPropertyParser.h"
</ins><span class="cx"> #include "CSSPropertySourceData.h"
</span><span class="cx"> #include "CSSRule.h"
</span><span class="cx"> #include "CSSRuleList.h"
</span><span class="lines">@@ -1332,11 +1333,8 @@
</span><span class="cx"> auto ruleSourceDataResult = std::make_unique<RuleSourceDataList>();
</span><span class="cx">
</span><span class="cx"> CSSParserContext context(parserContextForDocument(m_pageStyleSheet->ownerDocument()));
</span><del>- if (context.useNewParser) {
- StyleSheetHandler handler(m_parsedStyleSheet->text(), m_pageStyleSheet->ownerDocument(), ruleSourceDataResult.get());
- CSSParser::parseSheetForInspector(context, newStyleSheet.get(), m_parsedStyleSheet->text(), handler);
- } else
- CSSParser(context).parseSheet(newStyleSheet.get(), m_parsedStyleSheet->text(), TextPosition(), ruleSourceDataResult.get(), false);
</del><ins>+ StyleSheetHandler handler(m_parsedStyleSheet->text(), m_pageStyleSheet->ownerDocument(), ruleSourceDataResult.get());
+ CSSParser::parseSheetForInspector(context, newStyleSheet.get(), m_parsedStyleSheet->text(), handler);
</ins><span class="cx"> m_parsedStyleSheet->setSourceData(WTFMove(ruleSourceDataResult));
</span><span class="cx"> return m_parsedStyleSheet->hasSourceData();
</span><span class="cx"> }
</span><span class="lines">@@ -1575,17 +1573,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSParserContext context(parserContextForDocument(&m_element->document()));
</span><del>- if (context.useNewParser) {
- RuleSourceDataList ruleSourceDataResult;
- StyleSheetHandler handler(m_styleText, &m_element->document(), &ruleSourceDataResult);
- CSSParser::parseDeclarationForInspector(context, m_styleText, handler);
- return WTFMove(ruleSourceDataResult.first());
- }
-
- auto result = CSSRuleSourceData::create(StyleRule::Style);
- auto tempDeclaration = MutableStyleProperties::create();
- CSSParser(context).parseDeclaration(tempDeclaration, m_styleText, result.ptr(), nullptr);
- return result;
</del><ins>+ RuleSourceDataList ruleSourceDataResult;
+ StyleSheetHandler handler(m_styleText, &m_element->document(), &ruleSourceDataResult);
+ CSSParser::parseDeclarationForInspector(context, m_styleText, handler);
+ return WTFMove(ruleSourceDataResult.first());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationController.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationController.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/page/animation/AnimationController.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> #include "AnimationBase.h"
</span><span class="cx"> #include "AnimationControllerPrivate.h"
</span><span class="cx"> #include "AnimationEvent.h"
</span><del>-#include "CSSParser.h"
</del><span class="cx"> #include "CSSPropertyAnimation.h"
</span><ins>+#include "CSSPropertyParser.h"
</ins><span class="cx"> #include "CompositeAnimation.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "Frame.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "CSSCustomPropertyValue.h"
</span><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><del>-#include "CSSVariableDependentValue.h"
</del><span class="cx"> #include "CursorList.h"
</span><span class="cx"> #include "FloatRoundedRect.h"
</span><span class="cx"> #include "FontCascade.h"
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimateElementBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SVGAnimateElementBase.h"
</span><span class="cx">
</span><del>-#include "CSSParser.h"
</del><span class="cx"> #include "CSSPropertyNames.h"
</span><ins>+#include "CSSPropertyParser.h"
</ins><span class="cx"> #include "QualifiedName.h"
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "SVGAnimatorFactory.h"
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGAnimationElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGAnimationElement.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGAnimationElement.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/svg/SVGAnimationElement.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include "SVGAnimationElement.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSComputedStyleDeclaration.h"
</span><del>-#include "CSSParser.h"
</del><span class="cx"> #include "CSSPropertyNames.h"
</span><ins>+#include "CSSPropertyParser.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "FloatConversion.h"
</span><span class="cx"> #include "RenderObject.h"
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx">
</span><del>-#include "CSSParser.h"
</del><ins>+#include "CSSPropertyParser.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "Event.h"
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-09 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Remove the old CSS Parser
+ https://bugs.webkit.org/show_bug.cgi?id=165645
+
+ Reviewed by Daniel Bates.
+
+ * DOM/DOMCSS.mm:
+ (kitClass):
+ * DOM/DOMCSSRule.h:
+
</ins><span class="cx"> 2016-12-09 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCSSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCSS.mm (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCSS.mm 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebKit/mac/DOM/DOMCSS.mm 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -76,19 +76,16 @@
</span><span class="cx"> case DOM_PAGE_RULE:
</span><span class="cx"> return [DOMCSSPageRule class];
</span><span class="cx"> case DOM_KEYFRAMES_RULE:
</span><del>- return [DOMCSSRule class];
</del><ins>+ case DOM_NAMESPACE_RULE:
</ins><span class="cx"> case DOM_KEYFRAME_RULE:
</span><del>- return [DOMCSSRule class];
</del><span class="cx"> case DOM_SUPPORTS_RULE:
</span><del>- return [DOMCSSRule class];
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> case DOM_WEBKIT_VIEWPORT_RULE:
</span><del>- return [DOMCSSRule class];
</del><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> case DOM_WEBKIT_REGION_RULE:
</span><ins>+#endif
</ins><span class="cx"> return [DOMCSSRule class];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nil;
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMCSSRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMCSSRule.h (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMCSSRule.h 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Source/WebKit/mac/DOM/DOMCSSRule.h 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> DOM_PAGE_RULE = 6,
</span><span class="cx"> DOM_KEYFRAMES_RULE = 7,
</span><span class="cx"> DOM_KEYFRAME_RULE = 8,
</span><ins>+ DOM_NAMESPACE_RULE = 10,
</ins><span class="cx"> DOM_SUPPORTS_RULE = 12,
</span><span class="cx"> DOM_WEBKIT_REGION_RULE = 16,
</span><span class="cx"> DOM_WEBKIT_KEYFRAMES_RULE = 7,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Tools/ChangeLog 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-12-08 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Remove the old CSS Parser
+ https://bugs.webkit.org/show_bug.cgi?id=165645
+
+ Reviewed by Daniel Bates.
+
+ * TestWebKitAPI/Tests/WebCore/CSSParser.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-12-10 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [cmake] Include WTF, JSC, and WebCore headers automatically to targers using them
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/CSSParser.cpp (209665 => 209666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/CSSParser.cpp 2016-12-10 18:16:04 UTC (rev 209665)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/CSSParser.cpp 2016-12-10 18:31:13 UTC (rev 209666)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> auto properties = MutableStyleProperties::create();
</span><span class="cx">
</span><span class="cx"> for (auto& testCase : testCases) {
</span><del>- ASSERT_TRUE(parser.parseDeclaration(properties, testCase.input, nullptr, nullptr));
</del><ins>+ ASSERT_TRUE(parser.parseDeclaration(properties, testCase.input));
</ins><span class="cx"> RefPtr<CSSValue> value = properties->getPropertyCSSValue(testCase.propertyID);
</span><span class="cx">
</span><span class="cx"> ASSERT_TRUE(value->isValueList());
</span></span></pre>
</div>
</div>
</body>
</html>