[Cherry-pick] Refactor WrapShape to Shape/BasicShape

[Title] Refactor WrapShape to Shape/BasicShape
[Issues] N/A
[Problem] N/A
[Solution] Cherry picked.
[Cherry-Picker] Sanghyup Lee <sh53.lee@samsung.com>

Refactor WrapShape to Shape/BasicShape
https://bugs.webkit.org/show_bug.cgi?id=95411

Reviewed by Andreas Kling.

The wrap shapes are currently specified by CSS3 Exclusions but are useful for other
CSS related proposals like CSS Masking as well. This is the first patch on a chain
of patches to refactor WrapShape to BasicShape. With this patch all relevant files
get renamend and the build systems updated. The classes will be renamend in a second
step.

Just renaming of files. No new tests.

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* css/BasicShapeFunctions.cpp: Renamed from Source/WebCore/css/WrapShapeFunctions.cpp.
(WebCore):
(WebCore::valueForWrapShape):
(WebCore::convertToLength):
(WebCore::wrapShapeForValue):
* css/BasicShapeFunctions.h: Renamed from Source/WebCore/css/WrapShapeFunctions.h.
(WebCore):
* css/CSSAllInOne.cpp:
* css/CSSBasicShapes.cpp: Renamed from Source/WebCore/css/CSSWrapShapes.cpp.
(WebCore):
(WebCore::CSSWrapShapeRectangle::cssText):
(WebCore::CSSWrapShapeCircle::cssText):
(WebCore::CSSWrapShapeEllipse::cssText):
(WebCore::CSSWrapShapePolygon::cssText):
* css/CSSBasicShapes.h: Renamed from Source/WebCore/css/CSSWrapShapes.h.
(WebCore):
(CSSWrapShape):
(WebCore::CSSWrapShape::~CSSWrapShape):
(WebCore::CSSWrapShape::CSSWrapShape):
(CSSWrapShapeRectangle):
(WebCore::CSSWrapShapeRectangle::create):
(WebCore::CSSWrapShapeRectangle::x):
(WebCore::CSSWrapShapeRectangle::y):
(WebCore::CSSWrapShapeRectangle::width):
(WebCore::CSSWrapShapeRectangle::height):
(WebCore::CSSWrapShapeRectangle::radiusX):
(WebCore::CSSWrapShapeRectangle::radiusY):
(WebCore::CSSWrapShapeRectangle::setX):
(WebCore::CSSWrapShapeRectangle::setY):
(WebCore::CSSWrapShapeRectangle::setWidth):
(WebCore::CSSWrapShapeRectangle::setHeight):
(WebCore::CSSWrapShapeRectangle::setRadiusX):
(WebCore::CSSWrapShapeRectangle::setRadiusY):
(WebCore::CSSWrapShapeRectangle::type):
(WebCore::CSSWrapShapeRectangle::CSSWrapShapeRectangle):
(CSSWrapShapeCircle):
(WebCore::CSSWrapShapeCircle::create):
(WebCore::CSSWrapShapeCircle::centerX):
(WebCore::CSSWrapShapeCircle::centerY):
(WebCore::CSSWrapShapeCircle::radius):
(WebCore::CSSWrapShapeCircle::setCenterX):
(WebCore::CSSWrapShapeCircle::setCenterY):
(WebCore::CSSWrapShapeCircle::setRadius):
(WebCore::CSSWrapShapeCircle::type):
(WebCore::CSSWrapShapeCircle::CSSWrapShapeCircle):
(CSSWrapShapeEllipse):
(WebCore::CSSWrapShapeEllipse::create):
(WebCore::CSSWrapShapeEllipse::centerX):
(WebCore::CSSWrapShapeEllipse::centerY):
(WebCore::CSSWrapShapeEllipse::radiusX):
(WebCore::CSSWrapShapeEllipse::radiusY):
(WebCore::CSSWrapShapeEllipse::setCenterX):
(WebCore::CSSWrapShapeEllipse::setCenterY):
(WebCore::CSSWrapShapeEllipse::setRadiusX):
(WebCore::CSSWrapShapeEllipse::setRadiusY):
(WebCore::CSSWrapShapeEllipse::type):
(WebCore::CSSWrapShapeEllipse::CSSWrapShapeEllipse):
(CSSWrapShapePolygon):
(WebCore::CSSWrapShapePolygon::create):
(WebCore::CSSWrapShapePolygon::appendPoint):
(WebCore::CSSWrapShapePolygon::getXAt):
(WebCore::CSSWrapShapePolygon::getYAt):
(WebCore::CSSWrapShapePolygon::values):
(WebCore::CSSWrapShapePolygon::setWindRule):
(WebCore::CSSWrapShapePolygon::windRule):
(WebCore::CSSWrapShapePolygon::type):
(WebCore::CSSWrapShapePolygon::CSSWrapShapePolygon):
* css/CSSComputedStyleDeclaration.cpp:
* css/CSSParser.cpp:
* css/CSSPrimitiveValue.cpp:
* css/StyleBuilder.cpp:
* rendering/style/BasicShapes.cpp: Renamed from Source/WebCore/rendering/style/WrapShapes.cpp.
(WebCore):
(WebCore::WrapShape::destroy):
* rendering/style/BasicShapes.h: Renamed from Source/WebCore/rendering/style/WrapShapes.h.
(WebCore):
(WrapShape):
(WebCore::WrapShape::deref):
(WebCore::WrapShape::type):
(WebCore::WrapShape::WrapShape):
(WrapShapeRectangle):
(WebCore::WrapShapeRectangle::create):
(WebCore::WrapShapeRectangle::x):
(WebCore::WrapShapeRectangle::y):
(WebCore::WrapShapeRectangle::width):
(WebCore::WrapShapeRectangle::height):
(WebCore::WrapShapeRectangle::cornerRadiusX):
(WebCore::WrapShapeRectangle::cornerRadiusY):
(WebCore::WrapShapeRectangle::setX):
(WebCore::WrapShapeRectangle::setY):
(WebCore::WrapShapeRectangle::setWidth):
(WebCore::WrapShapeRectangle::setHeight):
(WebCore::WrapShapeRectangle::setCornerRadiusX):
(WebCore::WrapShapeRectangle::setCornerRadiusY):
(WebCore::WrapShapeRectangle::WrapShapeRectangle):
(WrapShapeCircle):
(WebCore::WrapShapeCircle::create):
(WebCore::WrapShapeCircle::centerX):
(WebCore::WrapShapeCircle::centerY):
(WebCore::WrapShapeCircle::radius):
(WebCore::WrapShapeCircle::setCenterX):
(WebCore::WrapShapeCircle::setCenterY):
(WebCore::WrapShapeCircle::setRadius):
(WebCore::WrapShapeCircle::WrapShapeCircle):
(WrapShapeEllipse):
(WebCore::WrapShapeEllipse::create):
(WebCore::WrapShapeEllipse::centerX):
(WebCore::WrapShapeEllipse::centerY):
(WebCore::WrapShapeEllipse::radiusX):
(WebCore::WrapShapeEllipse::radiusY):
(WebCore::WrapShapeEllipse::setCenterX):
(WebCore::WrapShapeEllipse::setCenterY):
(WebCore::WrapShapeEllipse::setRadiusX):
(WebCore::WrapShapeEllipse::setRadiusY):
(WebCore::WrapShapeEllipse::WrapShapeEllipse):
(WrapShapePolygon):
(WebCore::WrapShapePolygon::create):
(WebCore::WrapShapePolygon::windRule):
(WebCore::WrapShapePolygon::values):
(WebCore::WrapShapePolygon::getXAt):
(WebCore::WrapShapePolygon::getYAt):
(WebCore::WrapShapePolygon::setWindRule):
(WebCore::WrapShapePolygon::appendPoint):
(WebCore::WrapShapePolygon::WrapShapePolygon):
* rendering/style/StyleRareNonInheritedData.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127132 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Conflicts:

	Source/WebCore/ChangeLog
	Source/WebCore/Target.pri
	Source/WebCore/WebCore.gypi
	Source/WebCore/WebCore.xcodeproj/project.pbxproj
	Source/WebCore/css/StyleBuilder.cpp

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 45d6729..cb8d2f6 100755 (executable)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -976,7 +976,9 @@ SET(WebCore_SOURCES
     bindings/generic/ActiveDOMCallback.cpp
     bindings/generic/RuntimeEnabledFeatures.cpp
 
+    css/BasicShapeFunctions.cpp
     css/CSSAspectRatioValue.cpp
+    css/CSSBasicShapes.cpp
     css/CSSBorderImage.cpp
     css/CSSBorderImageSliceValue.cpp
     css/CSSCalculationValue.cpp
@@ -1021,7 +1023,6 @@ SET(WebCore_SOURCES
     css/CSSValue.cpp
     css/CSSValueList.cpp
     css/CSSValuePool.cpp
-    css/CSSWrapShapes.cpp
     css/FontFeatureValue.cpp
     css/FontValue.cpp
     css/LengthFunctions.cpp
@@ -1057,7 +1058,6 @@ SET(WebCore_SOURCES
     css/WebKitCSSRegionRule.cpp
     css/WebKitCSSSVGDocumentValue.cpp
     css/WebKitCSSTransformValue.cpp
-    css/WrapShapeFunctions.cpp
 
     dom/ActiveDOMObject.cpp
     dom/Attr.cpp
@@ -2099,6 +2099,7 @@ LIST(APPEND WebCore_SOURCES
     rendering/mathml/RenderMathMLSubSup.cpp
     rendering/mathml/RenderMathMLUnderOver.cpp
 
+    rendering/style/BasicShapes.cpp
     rendering/style/ContentData.cpp
     rendering/style/CounterDirectives.cpp
     rendering/style/FillLayer.cpp
@@ -2127,7 +2128,6 @@ LIST(APPEND WebCore_SOURCES
     rendering/style/StyleVisualData.cpp
     rendering/style/SVGRenderStyle.cpp
     rendering/style/SVGRenderStyleDefs.cpp
-    rendering/style/WrapShapes.cpp
 
 )
 IF (NOT ENABLE_ALLINONE)

diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
index 5cf3d06..510a222 100644 (file)
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -1795,9 +1795,13 @@ webcore_sources += \
        Source/WebCore/bridge/runtime_root.cpp \
        Source/WebCore/bridge/runtime_root.h \
        Source/WebCore/config.h \
+       Source/WebCore/css/BasicShapeFunctions.cpp \
+       Source/WebCore/css/BasicShapeFunctions.h \
        Source/WebCore/css/Counter.h \
        Source/WebCore/css/CSSAspectRatioValue.cpp \
        Source/WebCore/css/CSSAspectRatioValue.h \
+       Source/WebCore/css/CSSBasicShapes.cpp \
+       Source/WebCore/css/CSSBasicShapes.h \
        Source/WebCore/css/CSSBorderImageSliceValue.cpp \
        Source/WebCore/css/CSSBorderImageSliceValue.h \
        Source/WebCore/css/CSSBorderImage.cpp \
@@ -1884,8 +1888,6 @@ webcore_sources += \
        Source/WebCore/css/CSSTimingFunctionValue.h \
        Source/WebCore/css/CSSToStyleMap.cpp \
        Source/WebCore/css/CSSToStyleMap.h \
-       Source/WebCore/css/CSSWrapShapes.cpp \
-       Source/WebCore/css/CSSWrapShapes.h \
        Source/WebCore/css/CSSUnicodeRangeValue.cpp \
        Source/WebCore/css/CSSUnicodeRangeValue.h \
        Source/WebCore/css/CSSUnknownRule.h \
@@ -1968,8 +1970,6 @@ webcore_sources += \
        Source/WebCore/css/WebKitCSSShaderValue.h \
        Source/WebCore/css/WebKitCSSTransformValue.cpp \
        Source/WebCore/css/WebKitCSSTransformValue.h \
-       Source/WebCore/css/WrapShapeFunctions.cpp \
-       Source/WebCore/css/WrapShapeFunctions.h \
        Source/WebCore/dom/ActiveDOMObject.cpp \
        Source/WebCore/dom/ActiveDOMObject.h \
        Source/WebCore/dom/Attr.cpp \
@@ -4217,6 +4217,8 @@ webcore_sources += \
        Source/WebCore/rendering/mathml/RenderMathMLSubSup.h \
        Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp \
        Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h \
+       Source/WebCore/rendering/style/BasicShapes.cpp \
+       Source/WebCore/rendering/style/BasicShapes.h \
        Source/WebCore/rendering/style/BorderData.h \
        Source/WebCore/rendering/style/BorderValue.h \
        Source/WebCore/rendering/style/CollapsedBorderValue.h \
@@ -4293,8 +4295,6 @@ webcore_sources += \
        Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp \
        Source/WebCore/rendering/style/SVGRenderStyleDefs.h \
        Source/WebCore/rendering/style/SVGRenderStyle.h \
-       Source/WebCore/rendering/style/WrapShapes.cpp \
-       Source/WebCore/rendering/style/WrapShapes.h \
        Source/WebCore/rendering/svg/RenderSVGBlock.cpp \
        Source/WebCore/rendering/svg/RenderSVGBlock.h \
        Source/WebCore/rendering/svg/RenderSVGContainer.cpp \

diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
index d4644cf..bcf1278 100644 (file)
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -268,7 +268,9 @@ SOURCES += \
     Modules/notifications/NotificationController.cpp \
     Modules/notifications/WorkerContextNotifications.cpp \
     Modules/protocolhandler/NavigatorRegisterProtocolHandler.cpp \
+    css/BasicShapeFunctions.cpp \
     css/CSSAspectRatioValue.cpp \
+    css/CSSBasicShapes.cpp \
     css/CSSBorderImageSliceValue.cpp \
     css/CSSBorderImage.cpp \
     css/CSSCalculationValue.cpp \
@@ -312,7 +314,6 @@ SOURCES += \
     css/CSSValue.cpp \
     css/CSSValueList.cpp \
     css/CSSValuePool.cpp \
-    css/CSSWrapShapes.cpp \
     css/FontFeatureValue.cpp \
     css/FontValue.cpp \
     css/LengthFunctions.cpp \
@@ -346,7 +347,6 @@ SOURCES += \
     css/WebKitCSSSVGDocumentValue.cpp \
     css/WebKitCSSShaderValue.cpp \
     css/WebKitCSSTransformValue.cpp \
-    css/WrapShapeFunctions.cpp \
     dom/ActiveDOMObject.cpp \
     dom/Attr.cpp \
     dom/BeforeTextInsertedEvent.cpp \
@@ -1183,6 +1183,7 @@ SOURCES += \
     rendering/RenderWordBreak.cpp \
     rendering/RootInlineBox.cpp \
     rendering/ScrollBehavior.cpp \
+    rendering/style/BasicShapes.cpp \
     rendering/style/ContentData.cpp \
     rendering/style/CounterDirectives.cpp \
     rendering/style/FillLayer.cpp \
@@ -1209,7 +1210,6 @@ SOURCES += \
     rendering/style/StyleSurroundData.cpp \
     rendering/style/StyleTransformData.cpp \
     rendering/style/StyleVisualData.cpp \
-    rendering/style/WrapShapes.cpp \
     storage/StorageTask.cpp \
     storage/StorageThread.cpp \
     storage/Storage.cpp \
@@ -1399,7 +1399,9 @@ HEADERS += \
     Modules/webdatabase/SQLTransactionSyncCallback.h \
     Modules/webdatabase/WorkerContextWebDatabase.h \
     \
+    css/BasicShapeFunctions.h \
     css/CSSAspectRatioValue.h \
+    css/CSSBasicShapes.h \
     css/CSSBorderImageSliceValue.h \
     css/CSSBorderImage.h \
     css/CSSCalculationValue.h \
@@ -1446,7 +1448,6 @@ HEADERS += \
     css/CSSValueList.h \
     css/CSSValuePool.h \
     css/CSSVariableValue.h \
-    css/CSSWrapShapes.h \
     css/FontFeatureValue.h \
     css/FontValue.h \
     css/LengthFunctions.h \
@@ -1479,7 +1480,6 @@ HEADERS += \
     css/WebKitCSSSVGDocumentValue.h \
     css/WebKitCSSShaderValue.h \
     css/WebKitCSSTransformValue.h \
-    css/WrapShapeFunctions.h \
     dom/ActiveDOMObject.h \
     dom/Attr.h \
     dom/Attribute.h \
@@ -2354,6 +2354,7 @@ HEADERS += \
     rendering/RenderWordBreak.h \
     rendering/RootInlineBox.h \
     rendering/ScrollBehavior.h \
+    rendering/style/BasicShapes.h \
     rendering/style/ContentData.h \
     rendering/style/CounterDirectives.h \
     rendering/style/CursorData.h \
@@ -2387,7 +2388,6 @@ HEADERS += \
     rendering/style/StyleVisualData.h \
     rendering/style/SVGRenderStyleDefs.h \
     rendering/style/SVGRenderStyle.h \
-    rendering/style/WrapShapes.h \
     rendering/svg/RenderSVGBlock.h \
     rendering/svg/RenderSVGContainer.h \
     rendering/svg/RenderSVGEllipse.h \

diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index 079ce5a..3ff862b 100644 (file)
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -87,6 +87,8 @@
             'bridge/runtime_method.h',
             'bridge/runtime_object.h',
             'bridge/runtime_root.h',
+            'css/BasicShapeFunctions.h',
+            'css/CSSBasicShapes.h',
             'css/CSSComputedStyleDeclaration.h',
             'css/CSSCursorImageValue.h',
             'css/CSSHelper.h',
@@ -104,13 +106,11 @@
             'css/CSSStyleDeclaration.h',
             'css/CSSValue.h',
             'css/CSSValueList.h',
-            'css/CSSWrapShapes.h',
             'css/LengthFunctions.h',
             'css/Pair.h',
             'css/WebKitCSSFilterValue.h',
             'css/WebKitCSSShaderValue.h',
             'css/WebKitCSSTransformValue.h',
-            'css/WrapShapeFunctions.h',
             'editing/ApplyBlockElementCommand.h',
             'editing/CompositeEditCommand.h',
             'editing/DeleteSelectionCommand.h',
@@ -568,6 +568,7 @@
             'rendering/RenderWidget.h',
             'rendering/RootInlineBox.h',
             'rendering/ScrollBehavior.h',
+            'rendering/style/BasicShapes.h',
             'rendering/style/BorderData.h',
             'rendering/style/BorderValue.h',
             'rendering/style/CollapsedBorderValue.h',
@@ -606,7 +607,6 @@
             'rendering/style/StyleTransformData.h',
             'rendering/style/StyleVariableData.h',
             'rendering/style/StyleVisualData.h',
-            'rendering/style/WrapShapes.h',
             'rendering/svg/SVGResourcesCache.h',
             'workers/WorkerRunLoop.h',
             'workers/WorkerThread.h',
@@ -2475,8 +2475,10 @@
             'bridge/testbindings.mm',
             'bridge/testqtbindings.cpp',
             'config.h',
+            'css/BasicShapeFunctions.cpp',
             'css/CSSAspectRatioValue.cpp',
             'css/CSSAspectRatioValue.h',
+            'css/CSSBasicShapes.cpp',
             'css/CSSBorderImage.cpp',
             'css/CSSBorderImage.h',
             'css/CSSBorderImageSliceValue.cpp',
@@ -2556,7 +2558,6 @@
             'css/CSSValuePool.cpp',
             'css/CSSValuePool.h',
             'css/CSSVariableValue.h',
-            'css/CSSWrapShapes.cpp',
             'css/Counter.h',
             'css/DashboardRegion.h',
             'css/FontFeatureValue.cpp',
@@ -2626,7 +2627,6 @@
             'css/WebKitCSSSVGDocumentValue.cpp',
             'css/WebKitCSSSVGDocumentValue.h',
             'css/WebKitCSSTransformValue.cpp',
-            'css/WrapShapeFunctions.cpp',
             'editing/AlternativeTextController.cpp',
             'editing/AlternativeTextController.h',
             'editing/AppendNodeCommand.cpp',
@@ -4872,6 +4872,7 @@
             'rendering/mathml/RenderMathMLSubSup.h',
             'rendering/mathml/RenderMathMLUnderOver.cpp',
             'rendering/mathml/RenderMathMLUnderOver.h',
+            'rendering/style/BasicShapes.cpp',
             'rendering/style/ContentData.cpp',
             'rendering/style/CounterDirectives.cpp',
             'rendering/style/FillLayer.cpp',
@@ -4907,7 +4908,6 @@
             'rendering/style/StyleSurroundData.cpp',
             'rendering/style/StyleTransformData.cpp',
             'rendering/style/StyleVisualData.cpp',
-            'rendering/style/WrapShapes.cpp',
             'rendering/svg/SVGInlineFlowBox.cpp',
             'rendering/svg/SVGInlineFlowBox.h',
             'rendering/svg/SVGInlineTextBox.cpp',

diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
index 085b432..03bce57 100755 (executable)
--- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -37103,7 +37103,7 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\css\CSSWrapShapes.cpp"
+                               RelativePath="..\css\CSSBasicShapes.cpp"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
@@ -37155,7 +37155,7 @@
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\css\CSSWrapShapes.h"
+                               RelativePath="..\css\CSSBasicShapes.h"
                                >
                        </File>
                        <File
@@ -37823,11 +37823,11 @@
                                >
                        </File>
                        <File
-                           RelativePath="..\css\WrapShapeFunctions.cpp"
+                           RelativePath="..\css\BasicShapeFunctions.cpp"
                            >
                        </File>
                        <File
-                           RelativePath="..\css\WrapShapeFunctions.h"
+                           RelativePath="..\css\BasicShapeFunctions.h"
                            >
                        </File>
                </Filter>
@@ -46292,11 +46292,11 @@
                                        >
                                </File>
                                <File
-                                       RelativePath="..\rendering\style\WrapShapes.cpp"
+                                       RelativePath="..\rendering\style\BasicShapes.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\rendering\style\WrapShapes.h"
+                                       RelativePath="..\rendering\style\BasicShapes.h"
                                        >
                                </File>
                        </Filter>

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index bbc0069..badd0ea 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1462,7 +1462,6 @@
                4FA3B90B125CD12200300BAD /* InspectorState.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FA3B909125CD12200300BAD /* InspectorState.h */; };
                4FD8D0F2119C718B002FA825 /* ScriptGCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FD8D0F0119C718B002FA825 /* ScriptGCEvent.cpp */; };
                4FD8D0F3119C718B002FA825 /* ScriptGCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FD8D0F1119C718B002FA825 /* ScriptGCEvent.h */; };
-               501BA9E21393CEA000F7ACEB /* CSSWrapShapes.h in Headers */ = {isa = PBXBuildFile; fileRef = 501BA9E11393CEA000F7ACEB /* CSSWrapShapes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                501BAAA913950E2C00F7ACEB /* WindRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 501BAAA813950E2C00F7ACEB /* WindRule.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5038BC0714711CDB0095E0D1 /* WebKitCSSShaderValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5038BC0614711CDB0095E0D1 /* WebKitCSSShaderValue.cpp */; };
                5038BE2F1472AD230095E0D1 /* StyleCachedShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5038BE2D1472AD230095E0D1 /* StyleCachedShader.cpp */; };
@@ -1489,7 +1488,6 @@
                50D405FA147D31F300D30BB5 /* CustomFilterMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 50D405F8147D31F300D30BB5 /* CustomFilterMesh.h */; };
                50D40611147D49DE00D30BB5 /* CustomFilterCompiledProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50D4060F147D49DE00D30BB5 /* CustomFilterCompiledProgram.cpp */; };
                50D40612147D49DE00D30BB5 /* CustomFilterCompiledProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 50D40610147D49DE00D30BB5 /* CustomFilterCompiledProgram.h */; };
-               50E566D6139E38C500214433 /* CSSWrapShapes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 501BAAB11395114B00F7ACEB /* CSSWrapShapes.cpp */; };
                510184690B08602A004A825F /* CachedPage.h in Headers */ = {isa = PBXBuildFile; fileRef = 510184670B08602A004A825F /* CachedPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5101846A0B08602A004A825F /* CachedPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510184680B08602A004A825F /* CachedPage.cpp */; };
                510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */; };
@@ -6197,7 +6195,6 @@
                F5122C901547FA1B0028A93B /* PagePopupDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = F5122C8F1547FA1B0028A93B /* PagePopupDriver.h */; };
                F5142C69123F12B000F5BD4C /* LocalizedNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = F5142C68123F12B000F5BD4C /* LocalizedNumber.h */; };
                F52AD5E41534245F0059FBE6 /* EmptyClients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F52AD5E31534245F0059FBE6 /* EmptyClients.cpp */; };
-               F553B89315BE26C000B134C9 /* WrapShapes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F553B89215BE26C000B134C9 /* WrapShapes.cpp */; };
                F55B3DAD1251F12D003EF269 /* BaseTextInputType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F55B3D791251F12D003EF269 /* BaseTextInputType.cpp */; };
                F55B3DAE1251F12D003EF269 /* BaseTextInputType.h in Headers */ = {isa = PBXBuildFile; fileRef = F55B3D7A1251F12D003EF269 /* BaseTextInputType.h */; };
                F55B3DAF1251F12D003EF269 /* ButtonInputType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F55B3D7B1251F12D003EF269 /* ButtonInputType.cpp */; };
@@ -6278,6 +6275,12 @@
                FABE72FE1059C21100D999DD /* MathMLNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72FC1059C21100D999DD /* MathMLNames.cpp */; };
                FB78AD2E151BF5E600FE54D3 /* CSSParserMode.h in Headers */ = {isa = PBXBuildFile; fileRef = FB78AD2C151BF5D200FE54D3 /* CSSParserMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                FBC220DF1237FBEB00BCF788 /* GraphicsContext3DOpenGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBC220DE1237FBEB00BCF788 /* GraphicsContext3DOpenGL.cpp */; };
+               FBD6AF8815EF25C9008B7110 /* CSSBasicShapes.h in Headers */ = {isa = PBXBuildFile; fileRef = FBD6AF8715EF21D4008B7110 /* CSSBasicShapes.h */; };
+               FBD6AF8915EF25DB008B7110 /* BasicShapeFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBD6AF8415EF21D4008B7110 /* BasicShapeFunctions.cpp */; };
+               FBD6AF8A15EF25DF008B7110 /* BasicShapeFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = FBD6AF8515EF21D4008B7110 /* BasicShapeFunctions.h */; };
+               FBD6AF8B15EF25E5008B7110 /* CSSBasicShapes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBD6AF8615EF21D4008B7110 /* CSSBasicShapes.cpp */; };
+               FBD6AF8C15EF2604008B7110 /* BasicShapes.h in Headers */ = {isa = PBXBuildFile; fileRef = FBD6AF8315EF21A3008B7110 /* BasicShapes.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               FBD6AF8D15EF260A008B7110 /* BasicShapes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FBD6AF8215EF21A3008B7110 /* BasicShapes.cpp */; };
                FD00D7A414A3F61900734011 /* SincResampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD00D7A214A3F61900734011 /* SincResampler.cpp */; };
                FD00D7A514A3F61900734011 /* SincResampler.h in Headers */ = {isa = PBXBuildFile; fileRef = FD00D7A314A3F61900734011 /* SincResampler.h */; };
                FD06DFA5134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD06DFA3134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp */; };
@@ -6490,9 +6493,6 @@
                FDBD480D159BC6870093EB4F /* JSMediaStreamAudioSourceNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDBD480B159BC6870093EB4F /* JSMediaStreamAudioSourceNode.h */; };
                FDC54F041399B0DA008D9117 /* BiquadFilterNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDC54F011399B0DA008D9117 /* BiquadFilterNode.cpp */; };
                FDC54F051399B0DA008D9117 /* BiquadFilterNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDC54F021399B0DA008D9117 /* BiquadFilterNode.h */; };
-               FDE6860215B0A93B00BB480C /* WrapShapeFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD7E95A215ACD6090039E3D0 /* WrapShapeFunctions.cpp */; };
-               FDE6860315B0A96100BB480C /* WrapShapeFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = FD7E95A015ACD5620039E3D0 /* WrapShapeFunctions.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               FDE6860415B0A96100BB480C /* WrapShapes.h in Headers */ = {isa = PBXBuildFile; fileRef = FDB51CF4159CD70300E227C5 /* WrapShapes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                FDE2D55B159E66EB00DCCCF8 /* AudioIOCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FDE2D55A159E66EB00DCCCF8 /* AudioIOCallback.h */; };
                FDEA6242152102E200479DF0 /* JSOscillatorNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEA6240152102E200479DF0 /* JSOscillatorNode.cpp */; };
                FDEA6243152102E200479DF0 /* JSOscillatorNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDEA6241152102E200479DF0 /* JSOscillatorNode.h */; };
@@ -8594,9 +8594,7 @@
                4FA3B909125CD12200300BAD /* InspectorState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorState.h; sourceTree = "<group>"; };
                4FD8D0F0119C718B002FA825 /* ScriptGCEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptGCEvent.cpp; sourceTree = "<group>"; };
                4FD8D0F1119C718B002FA825 /* ScriptGCEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptGCEvent.h; sourceTree = "<group>"; };
-               501BA9E11393CEA000F7ACEB /* CSSWrapShapes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSWrapShapes.h; sourceTree = "<group>"; };
                501BAAA813950E2C00F7ACEB /* WindRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindRule.h; sourceTree = "<group>"; };
-               501BAAB11395114B00F7ACEB /* CSSWrapShapes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSWrapShapes.cpp; sourceTree = "<group>"; };
                5038BC0614711CDB0095E0D1 /* WebKitCSSShaderValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSShaderValue.cpp; sourceTree = "<group>"; };
                5038BE2D1472AD230095E0D1 /* StyleCachedShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleCachedShader.cpp; path = style/StyleCachedShader.cpp; sourceTree = "<group>"; };
                5038BE2E1472AD230095E0D1 /* StyleCachedShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleCachedShader.h; path = style/StyleCachedShader.h; sourceTree = "<group>"; };
@@ -13546,7 +13544,6 @@
                F523D30302DE4476018635CA /* Range.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Range.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D30402DE4476018635CA /* Range.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Range.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F52AD5E31534245F0059FBE6 /* EmptyClients.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmptyClients.cpp; sourceTree = "<group>"; };
-               F553B89215BE26C000B134C9 /* WrapShapes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WrapShapes.cpp; path = style/WrapShapes.cpp; sourceTree = "<group>"; };
                F55B3D791251F12D003EF269 /* BaseTextInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseTextInputType.cpp; sourceTree = "<group>"; };
                F55B3D7A1251F12D003EF269 /* BaseTextInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseTextInputType.h; sourceTree = "<group>"; };
                F55B3D7B1251F12D003EF269 /* ButtonInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ButtonInputType.cpp; sourceTree = "<group>"; };
@@ -13643,6 +13640,12 @@
                FABE72FC1059C21100D999DD /* MathMLNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLNames.cpp; sourceTree = "<group>"; };
                FB78AD2C151BF5D200FE54D3 /* CSSParserMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSParserMode.h; sourceTree = "<group>"; };
                FBC220DE1237FBEB00BCF788 /* GraphicsContext3DOpenGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContext3DOpenGL.cpp; sourceTree = "<group>"; };
+               FBD6AF8215EF21A3008B7110 /* BasicShapes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BasicShapes.cpp; path = style/BasicShapes.cpp; sourceTree = "<group>"; };
+               FBD6AF8315EF21A3008B7110 /* BasicShapes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BasicShapes.h; path = style/BasicShapes.h; sourceTree = "<group>"; };
+               FBD6AF8415EF21D4008B7110 /* BasicShapeFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BasicShapeFunctions.cpp; sourceTree = "<group>"; };
+               FBD6AF8515EF21D4008B7110 /* BasicShapeFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BasicShapeFunctions.h; sourceTree = "<group>"; };
+               FBD6AF8615EF21D4008B7110 /* CSSBasicShapes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSBasicShapes.cpp; sourceTree = "<group>"; };
+               FBD6AF8715EF21D4008B7110 /* CSSBasicShapes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSBasicShapes.h; sourceTree = "<group>"; };
                FD00D7A214A3F61900734011 /* SincResampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SincResampler.cpp; sourceTree = "<group>"; };
                FD00D7A314A3F61900734011 /* SincResampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SincResampler.h; sourceTree = "<group>"; };
                FD06DFA3134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DefaultAudioDestinationNode.cpp; sourceTree = "<group>"; };
@@ -13811,8 +13814,6 @@
                FD6F252B13F5EF0E0065165F /* MediaElementAudioSourceNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaElementAudioSourceNode.idl; sourceTree = "<group>"; };
                FD7868B7136B999200D403DF /* JSDynamicsCompressorNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDynamicsCompressorNode.cpp; sourceTree = "<group>"; };
                FD7868B8136B999200D403DF /* JSDynamicsCompressorNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDynamicsCompressorNode.h; sourceTree = "<group>"; };
-               FD7E95A015ACD5620039E3D0 /* WrapShapeFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WrapShapeFunctions.h; sourceTree = "<group>"; };
-               FD7E95A215ACD6090039E3D0 /* WrapShapeFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WrapShapeFunctions.cpp; sourceTree = "<group>"; };
                FD7F298A13D4C0CB00AD9535 /* WaveShaperDSPKernel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WaveShaperDSPKernel.cpp; sourceTree = "<group>"; };
                FD7F298B13D4C0CB00AD9535 /* WaveShaperDSPKernel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaveShaperDSPKernel.h; sourceTree = "<group>"; };
                FD7F298C13D4C0CB00AD9535 /* WaveShaperNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WaveShaperNode.cpp; sourceTree = "<group>"; };
@@ -20354,6 +20355,8 @@
                BC8C8FAA0DDCD2F200B592F4 /* style */ = {
                        isa = PBXGroup;
                        children = (
+                               FBD6AF8215EF21A3008B7110 /* BasicShapes.cpp */,
+                               FBD6AF8315EF21A3008B7110 /* BasicShapes.h */,
                                BC5EB5E00E81BE8700B25965 /* BorderData.h */,
                                BC5EB5DA0E81B7EA00B25965 /* BorderValue.h */,
                                BC5EB5DE0E81B9AB00B25965 /* CollapsedBorderValue.h */,
@@ -20428,8 +20431,6 @@
                                BC2274750E8366E200E7F975 /* SVGRenderStyle.h */,
                                BC2274760E8366E200E7F975 /* SVGRenderStyleDefs.cpp */,
                                BC2274770E8366E200E7F975 /* SVGRenderStyleDefs.h */,
-                               F553B89215BE26C000B134C9 /* WrapShapes.cpp */,
-                               FDB51CF4159CD70300E227C5 /* WrapShapes.h */,
                        );
                        name = style;
                        sourceTree = "<group>";
@@ -20976,11 +20977,15 @@
                F523D18402DE42E8018635CA /* css */ = {
                        isa = PBXGroup;
                        children = (
+                               FBD6AF8415EF21D4008B7110 /* BasicShapeFunctions.cpp */,
+                               FBD6AF8515EF21D4008B7110 /* BasicShapeFunctions.h */,
                                93CA4C9C09DF93FA00DF8677 /* maketokenizer */,
                                A80E6CDA0A1989CA007FB8C5 /* Counter.h */,
                                930705C709E0C95F00B17FE4 /* Counter.idl */,
                                CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */,
                                CAE9F90E146441F000C245B0 /* CSSAspectRatioValue.h */,
+                               FBD6AF8615EF21D4008B7110 /* CSSBasicShapes.cpp */,
+                               FBD6AF8715EF21D4008B7110 /* CSSBasicShapes.h */,
                                E16A84F714C85CCC002977DF /* CSSBorderImage.cpp */,
                                E16A84F814C85CCC002977DF /* CSSBorderImage.h */,
                                BC274B30140EBED800EADFA6 /* CSSBorderImageSliceValue.cpp */,
@@ -21094,8 +21099,6 @@
                                E49BDA0A131FD3E5003C56F0 /* CSSValuePool.cpp */,
                                E49BD9F9131FD2ED003C56F0 /* CSSValuePool.h */,
                                CAE9F90E146441F000C245B1 /* CSSVariableValue.h */,
-                               501BAAB11395114B00F7ACEB /* CSSWrapShapes.cpp */,
-                               501BA9E11393CEA000F7ACEB /* CSSWrapShapes.h */,
                                A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */,
                                4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */,
                                4A6E9FC213C17D1D0046A7F8 /* FontFeatureValue.h */,
@@ -21196,8 +21199,6 @@
                                BC9ADD7F0CC4092200098C4C /* WebKitCSSTransformValue.cpp */,
                                BC9ADD220CC4032600098C4C /* WebKitCSSTransformValue.h */,
                                31611E540E1C4D4A00F6A579 /* WebKitCSSTransformValue.idl */,
-                               FD7E95A215ACD6090039E3D0 /* WrapShapeFunctions.cpp */,
-                               FD7E95A015ACD5620039E3D0 /* WrapShapeFunctions.h */,
                        );
                        path = css;
                        sourceTree = "<group>";
@@ -22459,7 +22460,6 @@
                                A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
                                E49BD9FA131FD2ED003C56F0 /* CSSValuePool.h in Headers */,
                                CAE9F910146441F000C245B1 /* CSSVariableValue.h in Headers */,
-                               501BA9E21393CEA000F7ACEB /* CSSWrapShapes.h in Headers */,
                                93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
                                BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */,
                                BC2272AD0E82E8F300E7F975 /* CursorList.h in Headers */,
@@ -25431,6 +25431,9 @@
                                1059459F15B42B1A004D37FD /* JSPropertyNodeList.h in Headers */,
                                FDA9325E16703B2A008982DC /* OfflineAudioContext.h in Headers */,
                                FDA9326716703BA9008982DC /* JSOfflineAudioContext.h in Headers */,
+                               FBD6AF8815EF25C9008B7110 /* CSSBasicShapes.h in Headers */,
+                               FBD6AF8A15EF25DF008B7110 /* BasicShapeFunctions.h in Headers */,
+                               FBD6AF8C15EF2604008B7110 /* BasicShapes.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -26033,7 +26036,6 @@
                                1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */,
                                A80E6CE40A1989CA007FB8C5 /* CSSValueList.cpp in Sources */,
                                E49BDA0B131FD3E5003C56F0 /* CSSValuePool.cpp in Sources */,
-                               50E566D6139E38C500214433 /* CSSWrapShapes.cpp in Sources */,
                                E11AF15111B9A1A300805103 /* Cursor.cpp in Sources */,
                                265541521489B233000DFC5D /* CursorIOS.cpp in Sources */,
                                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
@@ -28510,7 +28512,6 @@
                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
                                C3CF17A415B0063F00276D39 /* IdTargetObserver.cpp in Sources */,
                                C3CF17A615B0063F00276D39 /* IdTargetObserverRegistry.cpp in Sources */,
-                               F553B89315BE26C000B134C9 /* WrapShapes.cpp in Sources */,
                                1059457315B42953004D37FD /* JSMicroDataItemValueCustom.cpp in Sources */,
                                1059457715B42A0D004D37FD /* JSMicroDataItemValue.cpp in Sources */,
                                1059459715B42A8E004D37FD /* PropertyNodeList.cpp in Sources */,
@@ -28521,6 +28522,9 @@
                                FD8AA63E169514A700D2EA68 /* JSPannerNodeCustom.cpp in Sources */,
                                FDA9325D16703B2A008982DC /* OfflineAudioContext.cpp in Sources */,
                                FDA9326616703BA9008982DC /* JSOfflineAudioContext.cpp in Sources */,
+                               FBD6AF8915EF25DB008B7110 /* BasicShapeFunctions.cpp in Sources */,
+                               FBD6AF8B15EF25E5008B7110 /* CSSBasicShapes.cpp in Sources */,
+                               FBD6AF8D15EF260A008B7110 /* BasicShapes.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/Source/WebCore/css/WrapShapeFunctions.cpp b/Source/WebCore/css/BasicShapeFunctions.cpp
similarity index 98%
rename from Source/WebCore/css/WrapShapeFunctions.cpp
rename to Source/WebCore/css/BasicShapeFunctions.cpp
index 6ca6341..c8d50ec 100644 (file)
--- a/Source/WebCore/css/WrapShapeFunctions.cpp
+++ b/Source/WebCore/css/BasicShapeFunctions.cpp
@@ -28,13 +28,13 @@
  */
 
 #include "config.h"
-#include "WrapShapeFunctions.h"
+#include "BasicShapeFunctions.h"
 
+#include "BasicShapes.h"
+#include "CSSBasicShapes.h"
 #include "CSSPrimitiveValueMappings.h"
 #include "CSSValuePool.h"
-#include "CSSWrapShapes.h"
 #include "StyleResolver.h"
-#include "WrapShapes.h"
 
 namespace WebCore {
 

diff --git a/Source/WebCore/css/WrapShapeFunctions.h b/Source/WebCore/css/BasicShapeFunctions.h
similarity index 96%
rename from Source/WebCore/css/WrapShapeFunctions.h
rename to Source/WebCore/css/BasicShapeFunctions.h
index d3b953c..50c2934 100644 (file)
--- a/Source/WebCore/css/WrapShapeFunctions.h
+++ b/Source/WebCore/css/BasicShapeFunctions.h
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef WrapShapeFunctions_h
-#define WrapShapeFunctions_h
+#ifndef BasicShapeFunctions_h
+#define BasicShapeFunctions_h
 
 #include <wtf/PassRefPtr.h>
 

diff --git a/Source/WebCore/css/CSSAllInOne.cpp b/Source/WebCore/css/CSSAllInOne.cpp
index 2ce1e36..193b7af 100644 (file)
--- a/Source/WebCore/css/CSSAllInOne.cpp
+++ b/Source/WebCore/css/CSSAllInOne.cpp
@@ -26,6 +26,7 @@
 // This all-in-one cpp file cuts down on template bloat to allow us to build our Windows release build.
  
 #include "CSSAspectRatioValue.cpp"
+#include "CSSBasicShapes.cpp"
 #include "CSSBorderImage.cpp"
 #include "CSSBorderImageSliceValue.cpp"
 #include "CSSCanvasValue.cpp"
@@ -65,7 +66,6 @@
 #include "CSSValue.cpp"
 #include "CSSValueList.cpp"
 #include "CSSValuePool.cpp"
-#include "CSSWrapShapes.cpp"
 #include "StyleBuilder.cpp"
 #include "StylePropertySet.cpp"
 #include "StylePropertyShorthand.cpp"

diff --git a/Source/WebCore/css/CSSWrapShapes.cpp b/Source/WebCore/css/CSSBasicShapes.cpp
similarity index 99%
rename from Source/WebCore/css/CSSWrapShapes.cpp
rename to Source/WebCore/css/CSSBasicShapes.cpp
index 16ecc80..488d3f4 100644 (file)
--- a/Source/WebCore/css/CSSWrapShapes.cpp
+++ b/Source/WebCore/css/CSSBasicShapes.cpp
@@ -29,7 +29,7 @@
 
 #include "config.h"
 
-#include "CSSWrapShapes.h"
+#include "CSSBasicShapes.h"
 
 #include <wtf/text/StringBuilder.h>
 

diff --git a/Source/WebCore/css/CSSWrapShapes.h b/Source/WebCore/css/CSSBasicShapes.h
similarity index 98%
rename from Source/WebCore/css/CSSWrapShapes.h
rename to Source/WebCore/css/CSSBasicShapes.h
index 347bb34..865bab5 100644 (file)
--- a/Source/WebCore/css/CSSWrapShapes.h
+++ b/Source/WebCore/css/CSSBasicShapes.h
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef CSSWrapShapes_h
-#define CSSWrapShapes_h
+#ifndef CSSBasicShapes_h
+#define CSSBasicShapes_h
 
 #include "CSSPrimitiveValue.h"
 #include "PlatformString.h"
@@ -170,4 +170,4 @@ private:
 
 } // namespace WebCore
 
-#endif // CSSWrapShapes_h
+#endif // CSSBasicShapes_h

diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
index 984bdf6..3ca7a93 100644 (file)
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -58,9 +58,9 @@
 #include "WebKitFontFamilyNames.h"
 
 #if ENABLE(CSS_EXCLUSIONS)
-#include "CSSWrapShapes.h"
-#include "WrapShapeFunctions.h"
-#include "WrapShapes.h"
+#include "BasicShapeFunctions.h"
+#include "BasicShapes.h"
+#include "CSSBasicShapes.h"
 #endif
 
 #if ENABLE(CSS_SHADERS)

diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index 2e001fb..e1788bf 100644 (file)
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp
@@ -27,6 +27,7 @@
 #include "CSSParser.h"
 
 #include "CSSAspectRatioValue.h"
+#include "CSSBasicShapes.h"
 #include "CSSBorderImage.h"
 #include "CSSCanvasValue.h"
 #include "CSSCrossfadeValue.h"
@@ -54,7 +55,6 @@
 #if ENABLE(CSS_VARIABLES)
 #include "CSSVariableValue.h"
 #endif
-#include "CSSWrapShapes.h"
 #include "Counter.h"
 #include "Document.h"
 #include "FloatConversion.h"

diff --git a/Source/WebCore/css/CSSPrimitiveValue.cpp b/Source/WebCore/css/CSSPrimitiveValue.cpp
index d5e6eb6..f12f7ed 100644 (file)
--- a/Source/WebCore/css/CSSPrimitiveValue.cpp
+++ b/Source/WebCore/css/CSSPrimitiveValue.cpp
@@ -21,12 +21,12 @@
 #include "config.h"
 #include "CSSPrimitiveValue.h"
 
+#include "CSSBasicShapes.h"
 #include "CSSCalculationValue.h"
 #include "CSSHelper.h"
 #include "CSSParser.h"
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
-#include "CSSWrapShapes.h"
 #include "CalculationValue.h"
 #include "Color.h"
 #include "Counter.h"

diff --git a/Source/WebCore/css/StyleBuilder.cpp b/Source/WebCore/css/StyleBuilder.cpp
index a3602ce..18c5707 100644 (file)
--- a/Source/WebCore/css/StyleBuilder.cpp
+++ b/Source/WebCore/css/StyleBuilder.cpp
@@ -45,9 +45,9 @@
 #include <wtf/UnusedParam.h>
 
 #if ENABLE(CSS_EXCLUSIONS)
-#include "CSSWrapShapes.h"
-#include "WrapShapeFunctions.h"
-#include "WrapShapes.h"
+#include "BasicShapeFunctions.h"
+#include "BasicShapes.h"
+#include "CSSBasicShapes.h"
 #endif
 
 using namespace std;

diff --git a/Source/WebCore/rendering/style/WrapShapes.cpp b/Source/WebCore/rendering/style/BasicShapes.cpp
similarity index 98%
rename from Source/WebCore/rendering/style/WrapShapes.cpp
rename to Source/WebCore/rendering/style/BasicShapes.cpp
index 61a2c9f..6dacfd2 100644 (file)
--- a/Source/WebCore/rendering/style/WrapShapes.cpp
+++ b/Source/WebCore/rendering/style/BasicShapes.cpp
@@ -29,7 +29,7 @@
 
 #include "config.h"
 
-#include "WrapShapes.h"
+#include "BasicShapes.h"
 
 namespace WebCore {
 

diff --git a/Source/WebCore/rendering/style/WrapShapes.h b/Source/WebCore/rendering/style/BasicShapes.h
similarity index 99%
rename from Source/WebCore/rendering/style/WrapShapes.h
rename to Source/WebCore/rendering/style/BasicShapes.h
index 86928b6..9a396a0 100644 (file)
--- a/Source/WebCore/rendering/style/WrapShapes.h
+++ b/Source/WebCore/rendering/style/BasicShapes.h
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef WrapShapes_h
-#define WrapShapes_h
+#ifndef BasicShapes_h
+#define BasicShapes_h
 
 #include "Length.h"
 #include "WindRule.h"

diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
index 01d2959..0784339 100644 (file)
--- a/Source/WebCore/rendering/style/RenderStyle.cpp
+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -26,7 +26,7 @@
 #include "ContentData.h"
 #include "CursorList.h"
 #include "CSSPropertyNames.h"
-#include "CSSWrapShapes.h"
+#include "CSSBasicShapes.h"
 #include "FontSelector.h"
 #include "QuotesData.h"
 #include "RenderArena.h"

diff --git a/Source/WebCore/rendering/style/StyleRareNonInheritedData.h b/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
index 5e6fde2..b8d3d80 100644 (file)
--- a/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
+++ b/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
@@ -25,13 +25,13 @@
 #ifndef StyleRareNonInheritedData_h
 #define StyleRareNonInheritedData_h
 
+#include "BasicShapes.h"
 #include "CounterDirectives.h"
 #include "CursorData.h"
 #include "DataRef.h"
 #include "FillLayer.h"
 #include "LineClampValue.h"
 #include "NinePieceImage.h"
-#include "WrapShapes.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>