Skip to content

Commit

Permalink
[Gardening] Unreviewed, reverting 278620@main (d47a77a)
Browse files Browse the repository at this point in the history 
rdar://127896095

Breaks the builds

Reverted change:

    Use a standard interface for all StyleColor kinds, and move them each to their own file
    https://bugs.webkit.org/show_bug.cgi?id=274005
    278620@main (d47a77a)

Canonical link: https://commits.webkit.org/278628@main
  • Loading branch information
@martadarbinyan
martadarbinyan committed May 10, 2024
1 parent df4f811 commit 1487c9a
Show file tree
Hide file tree
Showing 13 changed files with 234 additions and 583 deletions.
5 changes: 1 addition & 4 deletions Source/WebCore/Headers.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,7 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
css/Rect.h
css/RectBase.h
css/ShorthandSerializer.h
css/StyleColor.h
css/StyleProperties.h
css/StylePropertiesInlines.h
css/StyleRule.h
Expand All @@ -879,10 +880,6 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS

css/calc/CSSCalcValue.h

css/color/StyleAbsoluteColor.h
css/color/StyleColor.h
css/color/StyleCurrentColor.h

css/parser/CSSParser.h
css/parser/CSSParserContext.h
css/parser/CSSParserEnum.h
Expand Down
5 changes: 1 addition & 4 deletions Source/WebCore/Sources.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,7 @@ css/SelectorChecker.cpp
css/SelectorFilter.cpp
css/ShorthandSerializer.cpp
css/StyleAttributeMutationScope.cpp
css/StyleColor.cpp
css/StyleMedia.cpp
css/StyleProperties.cpp
css/StylePropertyShorthand.cpp
Expand All @@ -962,10 +963,6 @@ css/color/CSSResolvedColorMix.cpp
css/color/CSSUnresolvedColor.cpp
css/color/CSSUnresolvedColorMix.cpp
css/color/CSSUnresolvedLightDark.cpp
css/color/StyleAbsoluteColor.cpp
css/color/StyleColor.cpp
css/color/StyleColorMix.cpp
css/color/StyleCurrentColor.cpp
css/parser/CSSAtRuleID.cpp
css/parser/CSSCalcParser.cpp
css/parser/CSSCustomPropertySyntax.cpp
Expand Down
28 changes: 6 additions & 22 deletions Source/WebCore/WebCore.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3657,6 +3657,7 @@
93F9B7A10BA6032600854064 /* JSCDATASection.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F9B79F0BA6032600854064 /* JSCDATASection.h */; };
93FDAFCA0B11307400E2746F /* EditorInsertAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FDAFC90B11307400E2746F /* EditorInsertAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
94077C702B92B06C0012E357 /* CryptoClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 94077C6F2B92B0570012E357 /* CryptoClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
9418278B1D8B244000492764 /* StyleColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 941827891D8B242200492764 /* StyleColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
9418278F1D8CAF9200492764 /* CSSPendingSubstitutionValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9418278D1D8CAE9500492764 /* CSSPendingSubstitutionValue.h */; };
9444CBE81D8861C20073A074 /* CSSVariableData.h in Headers */ = {isa = PBXBuildFile; fileRef = 9444CBDD1D8861580073A074 /* CSSVariableData.h */; settings = {ATTRIBUTES = (Private, ); }; };
9444CBEA1D8861CA0073A074 /* CSSVariableReferenceValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9444CBDB1D8861580073A074 /* CSSVariableReferenceValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -4926,9 +4927,6 @@
BCEF45F60E687B5C001C1287 /* JSTextMetrics.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEF45F40E687B5C001C1287 /* JSTextMetrics.h */; };
BCEF869F0E844E9D00A85CD5 /* ScrollbarThemeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCEF869E0E844E9D00A85CD5 /* ScrollbarThemeMac.mm */; };
BCEFE1EB0DCA5F6400739219 /* JSXSLTProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEFE1E90DCA5F6400739219 /* JSXSLTProcessor.h */; };
BCF0BCEB2BEE8EC200F42CCD /* StyleColor.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF0BCE02BEE8A6500F42CCD /* StyleColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCF0BCEC2BEE8ED000F42CCD /* StyleCurrentColor.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF0BCE42BEE8A6500F42CCD /* StyleCurrentColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCF0BCED2BEE8EDA00F42CCD /* StyleAbsoluteColor.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF0BCDE2BEE8A6500F42CCD /* StyleAbsoluteColor.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCF1645126629FC70002F7EF /* CSSCalcExpressionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF1644F26629FC70002F7EF /* CSSCalcExpressionNode.h */; };
BCF164552662A1220002F7EF /* CSSCalcPrimitiveValueNode.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF164532662A1220002F7EF /* CSSCalcPrimitiveValueNode.h */; };
BCF164592662A1E90002F7EF /* CSSCalcNegateNode.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF164572662A1E90002F7EF /* CSSCalcNegateNode.h */; };
Expand Down Expand Up @@ -14983,6 +14981,8 @@
93FCDB4B26470DD10046DD7D /* SVGPropertyTraits.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPropertyTraits.cpp; sourceTree = "<group>"; };
93FDAFC90B11307400E2746F /* EditorInsertAction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EditorInsertAction.h; sourceTree = "<group>"; };
94077C6F2B92B0570012E357 /* CryptoClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoClient.h; sourceTree = "<group>"; };
941827881D8B242200492764 /* StyleColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleColor.cpp; sourceTree = "<group>"; };
941827891D8B242200492764 /* StyleColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleColor.h; sourceTree = "<group>"; };
9418278D1D8CAE9500492764 /* CSSPendingSubstitutionValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSPendingSubstitutionValue.h; sourceTree = "<group>"; };
9444CBDB1D8861580073A074 /* CSSVariableReferenceValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariableReferenceValue.h; sourceTree = "<group>"; };
9444CBDC1D8861580073A074 /* CSSVariableReferenceValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSVariableReferenceValue.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -17884,14 +17884,6 @@
BCEFE1DC0DCA5CFD00739219 /* XSLTProcessor.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = XSLTProcessor.idl; sourceTree = "<group>"; };
BCEFE1E80DCA5F6400739219 /* JSXSLTProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXSLTProcessor.cpp; sourceTree = "<group>"; };
BCEFE1E90DCA5F6400739219 /* JSXSLTProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXSLTProcessor.h; sourceTree = "<group>"; };
BCF0BCDD2BEE8A6500F42CCD /* StyleAbsoluteColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StyleAbsoluteColor.cpp; sourceTree = "<group>"; };
BCF0BCDE2BEE8A6500F42CCD /* StyleAbsoluteColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StyleAbsoluteColor.h; sourceTree = "<group>"; };
BCF0BCDF2BEE8A6500F42CCD /* StyleColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StyleColor.cpp; sourceTree = "<group>"; };
BCF0BCE02BEE8A6500F42CCD /* StyleColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StyleColor.h; sourceTree = "<group>"; };
BCF0BCE12BEE8A6500F42CCD /* StyleColorMix.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StyleColorMix.cpp; sourceTree = "<group>"; };
BCF0BCE22BEE8A6500F42CCD /* StyleColorMix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StyleColorMix.h; sourceTree = "<group>"; };
BCF0BCE32BEE8A6500F42CCD /* StyleCurrentColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StyleCurrentColor.cpp; sourceTree = "<group>"; };
BCF0BCE42BEE8A6500F42CCD /* StyleCurrentColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StyleCurrentColor.h; sourceTree = "<group>"; };
BCF1644F26629FC70002F7EF /* CSSCalcExpressionNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSCalcExpressionNode.h; sourceTree = "<group>"; };
BCF1645026629FC70002F7EF /* CSSCalcExpressionNode.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CSSCalcExpressionNode.cpp; sourceTree = "<group>"; };
BCF164532662A1220002F7EF /* CSSCalcPrimitiveValueNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSSCalcPrimitiveValueNode.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -33389,14 +33381,6 @@
BC04A7C9296E57810003F9DB /* CSSUnresolvedColorMix.h */,
E521F82B2B39F192004BD905 /* CSSUnresolvedLightDark.cpp */,
E521F8292B39F09C004BD905 /* CSSUnresolvedLightDark.h */,
BCF0BCDD2BEE8A6500F42CCD /* StyleAbsoluteColor.cpp */,
BCF0BCDE2BEE8A6500F42CCD /* StyleAbsoluteColor.h */,
BCF0BCDF2BEE8A6500F42CCD /* StyleColor.cpp */,
BCF0BCE02BEE8A6500F42CCD /* StyleColor.h */,
BCF0BCE12BEE8A6500F42CCD /* StyleColorMix.cpp */,
BCF0BCE22BEE8A6500F42CCD /* StyleColorMix.h */,
BCF0BCE32BEE8A6500F42CCD /* StyleCurrentColor.cpp */,
BCF0BCE42BEE8A6500F42CCD /* StyleCurrentColor.h */,
);
path = color;
sourceTree = "<group>";
Expand Down Expand Up @@ -36255,6 +36239,8 @@
930A76C2297FA04A0055B743 /* ShorthandSerializer.h */,
9B9DA70A2BB53D6600B8D6DB /* StyleAttributeMutationScope.cpp */,
9B9DA7092BB5393000B8D6DB /* StyleAttributeMutationScope.h */,
941827881D8B242200492764 /* StyleColor.cpp */,
941827891D8B242200492764 /* StyleColor.h */,
0FF5026E102BA9660066F39A /* StyleMedia.cpp */,
0FF5026F102BA96A0066F39A /* StyleMedia.h */,
0FF50270102BA96A0066F39A /* StyleMedia.idl */,
Expand Down Expand Up @@ -42379,7 +42365,6 @@
46FEFBC826DD67A200B0C488 /* StructuredSerializeOptions.h in Headers */,
41E67A8325D16847007B0A4C /* STUNMessageParsing.h in Headers */,
713922BE2518AB77005DB3C2 /* Styleable.h in Headers */,
BCF0BCED2BEE8EDA00F42CCD /* StyleAbsoluteColor.h in Headers */,
E45BA6B6237622A3004DFC07 /* StyleAdjuster.h in Headers */,
494E0BBD296CB7CC005F9FDC /* StyleAppearance.h in Headers */,
BC5EB6A30E81DC4F00B25965 /* StyleBackgroundData.h in Headers */,
Expand All @@ -42392,10 +42377,9 @@
9331BAD129EDA36600137ED2 /* StyleBuilderStateInlines.h in Headers */,
BCEF444D0E674628001C1287 /* StyleCachedImage.h in Headers */,
E401E0A41C3C0B8300F34D10 /* StyleChange.h in Headers */,
BCF0BCEB2BEE8EC200F42CCD /* StyleColor.h in Headers */,
9418278B1D8B244000492764 /* StyleColor.h in Headers */,
1C0AA16D21940DC800896829 /* StyleColorScheme.h in Headers */,
9DAC7C571AF2CB6400437C44 /* StyleContentAlignmentData.h in Headers */,
BCF0BCEC2BEE8ED000F42CCD /* StyleCurrentColor.h in Headers */,
BC779E171BB227CA00CAA8BF /* StyleCustomPropertyData.h in Headers */,
A8C4A7FD09D563270003AC8D /* StyledElement.h in Headers */,
BC5EB8B90E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h in Headers */,
Expand Down
Loading

0 comments on commit 1487c9a

Please sign in to comment.