[Cherry-pick] Refactor WrapShape to Shape/BasicShape
authorkrit@webkit.org <krit@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Aug 2012 13:44:36 +0000 (13:44 +0000)
committerSanghyup Lee <sh53.lee@samsung.com>
Tue, 26 Mar 2013 06:35:15 +0000 (15:35 +0900)
commitb6dc6ba74c4118b537a5da0e2a85467c89ce670c
tree84ca277c63d10e6bcc949da84113cacfd2569efd
parent1f389f51b7a5f774fd438effb24fb03b8c9ea936
[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
19 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/css/BasicShapeFunctions.cpp [moved from Source/WebCore/css/WrapShapeFunctions.cpp with 98% similarity]
Source/WebCore/css/BasicShapeFunctions.h [moved from Source/WebCore/css/WrapShapeFunctions.h with 96% similarity]
Source/WebCore/css/CSSAllInOne.cpp
Source/WebCore/css/CSSBasicShapes.cpp [moved from Source/WebCore/css/CSSWrapShapes.cpp with 99% similarity]
Source/WebCore/css/CSSBasicShapes.h [moved from Source/WebCore/css/CSSWrapShapes.h with 98% similarity]
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSPrimitiveValue.cpp
Source/WebCore/css/StyleBuilder.cpp
Source/WebCore/rendering/style/BasicShapes.cpp [moved from Source/WebCore/rendering/style/WrapShapes.cpp with 98% similarity]
Source/WebCore/rendering/style/BasicShapes.h [moved from Source/WebCore/rendering/style/WrapShapes.h with 99% similarity]
Source/WebCore/rendering/style/RenderStyle.cpp
Source/WebCore/rendering/style/StyleRareNonInheritedData.h