8000 Unreviewed , reverting 258970@main · WebKit/WebKit@ddc1672 · GitHub
[go: up one dir, main page]
Skip to content

Commit ddc1672

Browse files
karlracklerkarlrackler
committed
Unreviewed , reverting 258970@main
* LayoutTests/imported/w3c/web-platform-tests/css/css-color/parsing/color-valid-color-mix-function-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-color/parsing/color-valid-color-mix-function.html: * Source/WebCore/CMakeLists.txt: * Source/WebCore/Sources.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/css/CSSPrimitiveValue.cpp: (WebCore::isValidCSSUnitTypeForDoubleConversion): (WebCore::isStringType): (WebCore::CSSPrimitiveValue::cleanup): (WebCore::CSSPrimitiveValue::unitTypeString): (WebCore::CSSPrimitiveValue::formatNumberForCustomCSSText const): (WebCore::CSSPrimitiveValue::equals const): * Source/WebCore/css/CSSPrimitiveValue.h: * Source/WebCore/css/CSSUnits.cpp: (WebCore::unitCategory): (WebCore::operator<<): * Source/WebCore/css/CSSUnits.h: * Source/WebCore/css/StyleColor.cpp: (WebCore::serializationForCSS): (WebCore::operator<<): (WebCore::StyleColor::resolveColor const): (WebCore::StyleColor::isCurrentColor const): (WebCore::StyleColor::copy): Deleted. (WebCore::StyleColor::isColorMix const): Deleted. (WebCore::StyleColor::resolveAbsoluteComponents): Deleted. (WebCore::resolveAbsoluteComponents): Deleted. (WebCore::resolveColor): Deleted. * Source/WebCore/css/StyleColor.h: (WebCore::CurrentColor::operator== const): (WebCore::CurrentColor::operator!= const): (WebCore::StyleColor::StyleColor): (WebCore::StyleColor::operator== const): (WebCore::StyleColor::operator!= const): (WebCore::StyleColor::currentColor): (WebCore::StyleColor::operator=): Deleted. (WebCore::operator==): Deleted. (WebCore::operator!=): Deleted. * Source/WebCore/css/calc/CSSCalcCategoryMapping.cpp: (WebCore::hasDoubleValue): * Source/WebCore/css/color/CSSResolvedColorMix.cpp: Removed. * Source/WebCore/css/color/CSSResolvedColorMix.h: Removed. * Source/WebCore/css/color/CSSUnresolvedColor.cpp: Removed. * Source/WebCore/css/color/CSSUnresolvedColor.h: Removed. * Source/WebCore/css/color/CSSUnresolvedColorMix.cpp: Removed. * Source/WebCore/css/parser/CSSParserContext.cpp: * Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp: (WebCore::CSSPropertyParserHelpers::consumeOriginColor): (WebCore::CSSPropertyParserHelpers::consumeOptionalAlpha): (WebCore::CSSPropertyParserHelpers::consumeOptionalAlphaAllowingSymbolTableIdent): (WebCore::CSSPropertyParserHelpers::parseRelativeRGBParameters): (WebCore::CSSPropertyParserHelpers::parseNonRelativeRGBParameters): (WebCore::CSSPropertyParserHelpers::parseRGBParameters): (WebCore::CSSPropertyParserHelpers::parseRelativeHSLParameters): (WebCore::CSSPropertyParserHelpers::parseNonRelativeHSLParameters): (WebCore::CSSPropertyParserHelpers::parseHSLParameters): (WebCore::CSSPropertyParserHelpers::parseHWBParameters): (WebCore::CSSPropertyParserHelpers::parseRelativeHWBParameters): (WebCore::CSSPropertyParserHelpers::parseNonRelativeHWBParameters): (WebCore::CSSPropertyParserHelpers::parseLabParameters): (WebCore::CSSPropertyParserHelpers::parseRelativeLabParameters): (WebCore::CSSPropertyParserHelpers::parseNonRelativeLabParameters): (WebCore::CSSPropertyParserHelpers::parseLCHParameters): (WebCore::CSSPropertyParserHelpers::parseRelativeLCHParameters): (WebCore::CSSPropertyParserHelpers::parseNonRelativeLCHParameters): (WebCore::CSSPropertyParserHelpers::parseColorFunctionForRGBTypes): (WebCore::CSSPropertyParserHelpers::parseRelativeColorFunctionForRGBTypes): (WebCore::CSSPropertyParserHelpers::parseColorFunctionForXYZTypes): (WebCore::CSSPropertyParserHelpers::parseRelativeColorFunctionForXYZTypes): (WebCore::CSSPropertyParserHelpers::parseRelativeColorFunctionParameters): (WebCore::CSSPropertyParserHelpers::parseNonRelativeColorFunctionParameters): (WebCore::CSSPropertyParserHelpers::parseColorFunctionParameters): (WebCore::CSSPropertyParserHelpers::parseColorContrastFunctionParameters): (WebCore::CSSPropertyParserHelpers::consumeColorMixComponent): (WebCore::CSSPropertyParserHelpers::normalizedMixPercentages): (WebCore::CSSPropertyParserHelpers::mixColorComponentsUsingColorInterpolationMethod): (WebCore::CSSPropertyParserHelpers::mixColorComponents): (WebCore::CSSPropertyParserHelpers::parseColorMixFunctionParameters): (WebCore::CSSPropertyParserHelpers::parseColorFunction): (WebCore::CSSPropertyParserHelpers::consumeColorWorkerSafe): (WebCore::CSSPropertyParserHelpers::consumeColor): (WebCore::CSSPropertyParserHelpers::consumeOriginColorRaw): Deleted. (WebCore::CSSPropertyParserHelpers::consumeOptionalAlphaRaw): Deleted. (WebCore::CSSPropertyParserHelpers::consumeOptionalAlphaRawAllowingSymbolTableIdent): Deleted. (WebCore::CSSPropertyParserHelpers::parseRelativeRGBParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseNonRelativeRGBParametersRaw): Deleted. (WebCore::CSSProper 8000 tyParserHelpers::parseRGBParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseRelativeHSLParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseNonRelativeHSLParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseHSLParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseHWBParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseRelativeHWBParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseNonRelativeHWBParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseLabParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseRelativeLabParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseNonRelativeLabParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseLCHParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseRelativeLCHParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseNonRelativeLCHParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseColorFunctionForRGBTypesRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseColorFunctionForXYZTypesRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseColorFunctionParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseColorContrastFunctionParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::consumeColorMixComponentRaw): Deleted. (WebCore::CSSPropertyParserHelpers::parseColorMixFunctionParametersRaw): Deleted. (WebCore::CSSPropertyParserHelpers::hasNonCalculatedZeroPercentage): Deleted. (WebCore::CSSPropertyParserHelpers::parseColorFunctionRaw): Deleted. * Source/WebCore/platform/graphics/ColorInterpolationMethod.cpp: (WebCore::serializationForCSS): Deleted. * Source/WebCore/platform/graphics/ColorInterpolationMethod.h: * Source/WebCore/style/ColorFromPrimitiveValue.cpp: (WebCore::Style::colorFromPrimitiveValue): Canonical link: https://commits.webkit.org/258987@main
1 parent a4467af commit ddc1672

22 files changed

+595
-1407
lines changed

‎LayoutTests/imported/w3c/web-platform-tests/css/css-color/parsing/color-valid-color-mix-function-expected.txt‎

Lines changed: 44 additions & 7 deletions
Large diffs are not rendered by default.

‎LayoutTests/imported/w3c/web-platform-tests/css/css-color/parsing/color-valid-color-mix-function.html‎

Lines changed: 310 additions & 282 deletions
Large diffs are not rendered by default.

‎Source/WebCore/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ set(WebCore_PRIVATE_INCLUDE_DIRECTORIES
8989
"${WEBCORE_DIR}/crypto/parameters"
9090
"${WEBCORE_DIR}/css"
9191
"${WEBCORE_DIR}/css/calc"
92-
"${WEBCORE_DIR}/css/color"
9392
"${WEBCORE_DIR}/css/parser"
9493
"${WEBCORE_DIR}/css/query"
9594
"${WEBCORE_DIR}/css/typedom"

‎Source/WebCore/Sources.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -857,9 +857,6 @@ css/calc/CSSCalcOperationNode.cpp
857857
css/calc/CSSCalcPrimitiveValueNode.cpp
858858
css/calc/CSSCalcSymbolTable.cpp
859859
css/calc/CSSCalcValue.cpp
860-
css/color/CSSResolvedColorMix.cpp
861-
css/color/CSSUnresolvedColor.cpp
862-
css/color/CSSUnresolvedColorMix.cpp
863860
css/parser/CSSAtRuleID.cpp
864861
css/parser/CSSCustomPropertySyntax.cpp
865862
css/parser/CSSParser.cpp

‎Source/WebCore/WebCore.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15944,10 +15944,6 @@
1594415944
BC024A9C270A789D00FD4C3F /* WebXRSession+AR.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = "WebXRSession+AR.idl"; sourceTree = "<group>"; };
1594515945
BC02A63B0E09A9CF004B6D2B /* CSSFunctionValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFunctionValue.h; sourceTree = "<group>"; };
1594615946
BC02A6450E09AAE9004B6D2B /* CSSFunctionValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFunctionValue.cpp; sourceTree = "<group>"; };
15947-
BC04A7C6296E53410003F9DB /* CSSResolvedColorMix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSResolvedColorMix.cpp; sourceTree = "<group>"; };
15948-
BC04A7C7296E53410003F9DB /* CSSResolvedColorMix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSResolvedColorMix.h; sourceTree = "<group>"; };
15949-
BC04A7C8296E57810003F9DB /* CSSUnresolvedColorMix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSUnresolvedColorMix.cpp; sourceTree = "<group>"; };
15950-
BC04A7C9296E57810003F9DB /* CSSUnresolvedColorMix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSUnresolvedColorMix.h; sourceTree = "<group>"; };
1595115947
BC06ED040BFD5BAE00856E9D /* JSHTMLTableSectionElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTableSectionElement.cpp; sourceTree = "<group>"; };
1595215948
BC06ED050BFD5BAE00856E9D /* JSHTMLTableSectionElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSHTMLTableSectionElement.h; sourceTree = "<group>"; };
1595315949
BC06ED990BFD660600856E9D /* JSHTMLTableColElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTableColElement.cpp; sourceTree = "<group>"; };
@@ -16288,8 +16284,6 @@
1628816284
BCB1E31628F36B5800FCAF0F /* StyleFilterImage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StyleFilterImage.cpp; sourceTree = "<group>"; };
1628916285
BCB1E31728F36B5800FCAF0F /* StyleFilterImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StyleFilterImage.h; sourceTree = "<group>"; };
1629016286
BCB2F88D275BEE57007231BF /* ColorNormalization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ColorNormalization.h; sourceTree = "<group>"; };
16291-
BCB3536F295D121700298CA3 /* CSSUnresolvedColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSUnresolvedColor.cpp; sourceTree = "<group>"; };
16292-
BCB35370295D121700298CA3 /* CSSUnresolvedColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSUnresolvedColor.h; sourceTree = "<group>"; };
1629316287
BCB4779725D46EFF005EF0C8 /* RenderModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderModel.h; sourceTree = "<group>"; };
1629416288
BCB4779825D46EFF005EF0C8 /* RenderModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderModel.cpp; sourceTree = "<group>"; };
1629516289
BCB92D4E1293550B00C8387F /* FontBaseline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontBaseline.h; sourceTree = "<group>"; };
@@ -30796,19 +30790,6 @@
3079630790
path = js;
3079730791
sourceTree = "<group>";
3079830792
};
30799-
BC29861A296B586100E4001F /* color */ = {
30800-
isa = PBXGroup;
30801-
children = (
30802-
BC04A7C6296E53410003F9DB /* CSSResolvedColorMix.cpp */,
30803-
BC04A7C7296E53410003F9DB /* CSSResolvedColorMix.h */,
30804-
BCB3536F295D121700298CA3 /* CSSUnresolvedColor.cpp */,
30805-
BCB35370295D121700298CA3 /* CSSUnresolvedColor.h */,
30806-
BC04A7C8296E57810003F9DB /* CSSUnresolvedColorMix.cpp */,
30807-
BC04A7C9296E57810003F9DB /* CSSUnresolvedColorMix.h */,
30808-
);
30809-
path = color;
30810-
sourceTree = "<group>";
30811-
};
3081230793
BC2B412227335E0C00A2D191 /* dummy */ = {
3081330794
isa = PBXGroup;
3081430795
children = (
@@ -33154,7 +33135,6 @@
3315433135
isa = PBXGroup;
3315533136
children = (
3315633137
BCF1644D26629F9A0002F7EF /* calc */,
33157-
BC29861A296B586100E4001F /* color */,
3315833138
946D37271D6CB2250077084F /* parser */,
3315933139
E4DA5E3E28A2867300849BCF /* query */,
3316033140
4BAFD0DA21921EAD00C0AB64 /* typedom */,

‎Source/WebCore/css/CSSPrimitiveValue.cpp‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "CSSPrimitiveValueMappings.h"
3030
#include "CSSPropertyNames.h"
3131
#include "CSSToLengthConversionData.h"
32-
#include "CSSUnresolvedColor.h"
3332
#include "CSSValueKeywords.h"
3433
#include "CSSValuePool.h"
3534
#include "CalculationCategory.h"
@@ -136,7 +135,6 @@ static inline bool isValidCSSUnitTypeForDoubleConversion(CSSUnitType unitType)
136135
case CSSUnitType::CSS_STRING:
137136
case CSSUnitType::CSS_UNICODE_RANGE:
138137
case CSSUnitType::CSS_UNKNOWN:
139-
case CSSUnitType::CSS_UNRESOLVED_COLOR:
140138
case CSSUnitType::CSS_URI:
141139
case CSSUnitType::CSS_VALUE_ID:
142140
return false;
@@ -223,7 +221,6 @@ static inline bool isStringType(CSSUnitType type)
223221
case CSSUnitType::CSS_TURN:
224222
case CSSUnitType::CSS_UNICODE_RANGE:
225223
case CSSUnitType::CSS_UNKNOWN:
226-
case CSSUnitType::CSS_UNRESOLVED_COLOR:
227224
case CSSUnitType::CSS_VALUE_ID:
228225
case CSSUnitType::CSS_VB:
229226
case CSSUnitType::CSS_VH:
@@ -492,13 +489,6 @@ void CSSPrimitiveValue::init(RefPtr<CSSCalcValue>&& c)
492489
m_value.calc = c.leakRef();
493490
}
494491

495-
CSSPrimitiveValue::CSSPrimitiveValue(Ref<CSSUnresolvedColor>&& unresolvedColor)
496-
: CSSValue(PrimitiveClass)
497-
{
498-
setPrimitiveUnitType(CSSUnitType::CSS_UNRESOLVED_COLOR);
499-
m_value.unresolvedColor = &unresolvedColor.leakRef();
500-
}
501-
502492
CSSPrimitiveValue::~CSSPrimitiveValue()
503493
{
504494
cleanup();
@@ -545,9 +535,6 @@ void CSSPrimitiveValue::cleanup()
545535
delete m_value.color;
546536
m_value.color = nullptr;
547537
break;
548-
case CSSUnitType::CSS_UNRESOLVED_COLOR:
549-
m_value.unresolvedColor->deref();
550-
break;
551538
case CSSUnitType::CSS_DIMENSION:
552539
case CSSUnitType::CSS_NUMBER:
553540
case CSSUnitType::CSS_INTEGER:
@@ -647,11 +634,6 @@ Ref<CSSPrimitiveValue> CSSPrimitiveValue::create(double value, CSSUnitType type)
647634
return adoptRef(*new CSSPrimitiveValue(value, type));
648635
}
649636

650-
Ref<CSSPrimitiveValue> CSSPrimitiveValue::create(Ref<CSSUnresolvedColor>&& value)
651-
{
652-
return adoptRef(*new CSSPrimitiveValue(WTFMove(value)));
653-
}
654-
655637
double CSSPrimitiveValue::computeDegrees() const
656638
{
657639
return computeDegrees(primitiveType(), doubleValue());
@@ -1341,7 +1323,6 @@ ASCIILiteral CSSPrimitiveValue::unitTypeString(CSSUnitType unitType)
13411323
case CSSUnitType::CSS_CALC:
13421324
case CSSUnitType::CSS_CALC_PERCENTAGE_WITH_NUMBER:
13431325
case CSSUnitType::CSS_CALC_PERCENTAGE_WITH_LENGTH:
1344-
case CSSUnitType::CSS_UNRESOLVED_COLOR:
13451326
case CSSUnitType::CSS_FONT_FAMILY:
13461327
case CSSUnitType::CSS_PROPERTY_ID:
13471328
case CSSUnitType::CSS_VALUE_ID:
@@ -1444,8 +1425,6 @@ ALWAYS_INLINE String CSSPrimitiveValue::formatNumberForCustomCSSText() const
14441425
return serializeFontFamily(m_value.string);
14451426
case CSSUnitType::CSS_URI:
14461427
return serializeURL(m_value.string);
1447- E86E
case CSSUnitType::CSS_UNRESOLVED_COLOR:
1448-
return m_value.unresolvedColor->serializationForCSS();
14491428
case CSSUnitType::CSS_VALUE_ID:
14501429
// Per the specification, we should lowercase keywords during serialization:
14511430
// https://www.w3.org/TR/cssom-1/#serialize-a-css-component-value
@@ -1655,8 +1634,6 @@ bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
16551634
return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
16561635
case CSSUnitType::CSS_SHAPE:
16571636
return m_value.shape && other.m_value.shape && m_value.shape->equals(*other.m_value.shape);
1658-
case CSSUnitType::CSS_UNRESOLVED_COLOR:
1659-
return m_value.unresolvedColor && other.m_value.unresolvedColor && m_value.unresolvedColor->equals(*other.m_value.unresolvedColor);
16601637
case CSSUnitType::CSS_IDENT:
16611638
case CSSUnitType::CSS_UNICODE_RANGE:
16621639
case CSSUnitType::CSS_CALC_PERCENTAGE_WITH_NUMBER:

‎Source/WebCore/css/CSSPrimitiveValue.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ namespace WebCore {
3737
class CSSBasicShape;
3838
class CSSCalcValue;
3939
class CSSToLengthConversionData;
40-
class CSSUnresolvedColor;
4140
class Counter;
4241
class DeprecatedCSSOMPrimitiveValue;
4342
class FontCascadeDescription;
@@ -113,7 +112,6 @@ class CSSPrimitiveValue final : public CSSValue {
113112
bool isDotsPerCentimeter() const { return primitiveType() == CSSUnitType::CSS_DPCM; }
114113
bool isX() const { return primitiveType() == CSSUnitType::CSS_X; }
115114
bool isResolution() const { return unitCategory(primitiveType()) == CSSUnitCategory::Resolution; }
116-
bool isUnresolvedColor() const { return primitiveUnitType() == CSSUnitType::CSS_UNRESOLVED_COLOR; }
117115
bool isViewportPercentageLength() const { return isViewportPercentageLength(primitiveUnitType()); }
118116
bool isValueID() const { return primitiveUnitType() == CSSUnitType::CSS_VALUE_ID; }
119117
bool isFlex() const { return primitiveType() == CSSUnitType::CSS_FR; }
@@ -127,7 +125,6 @@ class CSSPrimitiveValue final : public CSSValue {
127125
static Ref<CSSPrimitiveValue> create(const String& value, CSSUnitType type) { return adoptRef(*new CSSPrimitiveValue(value, type)); }
128126
static Ref<CSSPrimitiveValue> create(const Length& value, const RenderStyle& style) { return adoptRef(*new CSSPrimitiveValue(value, style)); }
129127
static Ref<CSSPrimitiveValue> create(const LengthSize& value, const RenderStyle& style) { return adoptRef(*new CSSPrimitiveValue(value, style)); }
130-
static Ref<CSSPrimitiveValue> create(Ref<CSSUnresolvedColor>&&);
131128

132129
template<typename T> static Ref<CSSPrimitiveValue> create(T&&);
133130
template<typename T> static Ref<CSSPrimitiveValue> create(T&&, CSSPropertyID);
@@ -176,7 +173,6 @@ class CSSPrimitiveValue final : public CSSValue {
176173
WEBCORE_EXPORT String stringValue() const;
177174

178175
const Color& color() const { ASSERT(primitiveUnitType() == CSSUnitType::CSS_RGBCOLOR); return *m_value.color; }
179-
const CSSUnresolvedColor& unresolvedColor() const { ASSERT(primitiveUnitType() == CSSUnitType::CSS_UNRESOLVED_COLOR); return *m_value.unresolvedColor; }
180176
Counter* counterValue() const { return primitiveUnitType() != CSSUnitType::CSS_COUNTER ? nullptr : m_value.counter; }
181177
CSSCalcValue* cssCalcValue() const { return primitiveUnitType() != CSSUnitType::CSS_CALC ? nullptr : m_value.calc; }
182178
Pair* pairValue() const { return primitiveUnitType() != CSSUnitType::CSS_PAIR ? nullptr : m_value.pair; }
@@ -216,7 +212,6 @@ class CSSPrimitiveValue final : public CSSValue {
216212
CSSPrimitiveValue(const LengthSize&, const RenderStyle&);
217213
CSSPrimitiveValue(const String&, CSSUnitType);
218214
CSSPrimitiveValue(double, CSSUnitType);
219-
explicit CSSPrimitiveValue(Ref<CSSUnresolvedColor>&&);
220215

221216
CSSPrimitiveValue(StaticCSSValueTag, CSSValueID);
222217
CSSPrimitiveValue(StaticCSSValueTag, const Color&);
@@ -272,7 +267,6 @@ class CSSPrimitiveValue final : public CSSValue {
272267
Rect* rect;
273268
Quad* quad;
274269
const Color* color;
275-
CSSUnresolvedColor* unresolvedColor;
276270
Pair* pair;
277271
CSSBasicShape* shape;
278272
CSSCalcValue* calc;
@@ -416,16 +410,6 @@ inline bool isValueID(const CSSPrimitiveValue* value, CSSValueID id)
416410
return valueID(value) == id;
417411
}
418412

419-
inline bool isValueID(const RefPtr<CSSPrimitiveValue>& value, CSSValueID id)
420-
{
421-
return valueID(value.get()) == id;
422-
}
423-
424-
inline bool isValueID(const Ref<CSSPrimitiveValue>& value, CSSValueID id)
425-
{
426-
return valueID(value.get()) == id;
427-
}
428-
429413
inline bool isValueID(const CSSValue& value, CSSValueID id)
430414
{
431415
return valueID(value) == id;

‎Source/WebCore/css/CSSUnits.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ CSSUnitCategory unitCategory(CSSUnitType type)
124124
case CSSUnitType::C D86D SS_STRING:
125125
case CSSUnitType::CSS_UNICODE_RANGE:
126126
case CSSUnitType::CSS_UNKNOWN:
127-
case CSSUnitType::CSS_UNRESOLVED_COLOR:
128127
case CSSUnitType::CSS_URI:
129128
case CSSUnitType::CSS_VALUE_ID:
130129
case CSSUnitType::CustomIdent:
@@ -266,7 +265,6 @@ TextStream& operator<<(TextStream& ts, CSSUnitType unitType)
266265
case CSSUnitType::CSS_CALC: ts << "calc"; break;
267266
case CSSUnitType::CSS_CALC_PERCENTAGE_WITH_NUMBER: ts << "calc_percentage_with_number"; break;
268267
case CSSUnitType::CSS_CALC_PERCENTAGE_WITH_LENGTH: ts << "calc_percentage_with_length"; break;
269-
case CSSUnitType::CSS_UNRESOLVED_COLOR: ts << "unresolved_color"; break;
270268
case CSSUnitType::CSS_FONT_FAMILY: ts << "font_family"; break;
271269
case CSSUnitType::CSS_PROPERTY_ID: ts << "property_id"; break;
272270
case CSSUnitType::CSS_VALUE_ID: ts << "value_id"; break;

‎Source/WebCore/css/CSSUnits.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ enum class CSSUnitType : uint8_t {
121121

122122
CSS_FONT_FAMILY,
123123

124-
CSS_UNRESOLVED_COLOR,
125-
126124
CSS_PROPERTY_ID,
127125
CSS_VALUE_ID,
128126

0 commit comments

Comments
 (0)
0