[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zimmermann at webkit.org
zimmermann at webkit.org
Wed Dec 22 14:00:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 29a27f68144b9608a04e6e7c1518604c622d56c5
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 1 10:19:45 2010 +0000
2010-10-01 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Andreas Kling.
Move SVG text related renderers into rendering/svg/
https://bugs.webkit.org/show_bug.cgi?id=46969
Doesn't affect any functionality, just moves files around.
* Android.mk:
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderSVGAllInOne.cpp:
* rendering/RenderSVGInline.cpp: Removed.
* rendering/RenderSVGInline.h: Removed.
* rendering/RenderSVGInlineText.cpp: Removed.
* rendering/RenderSVGInlineText.h: Removed.
* rendering/RenderSVGTSpan.cpp: Removed.
* rendering/RenderSVGTSpan.h: Removed.
* rendering/RenderSVGText.cpp: Removed.
* rendering/RenderSVGText.h: Removed.
* rendering/RenderSVGTextPath.cpp: Removed.
* rendering/RenderSVGTextPath.h: Removed.
* rendering/SVGInlineFlowBox.cpp: Removed.
* rendering/SVGInlineFlowBox.h: Removed.
* rendering/SVGInlineTextBox.cpp: Removed.
* rendering/SVGInlineTextBox.h: Removed.
* rendering/SVGRootInlineBox.cpp: Removed.
* rendering/SVGRootInlineBox.h: Removed.
* rendering/SVGTextQuery.cpp: Removed.
* rendering/SVGTextQuery.h: Removed.
* rendering/svg/RenderSVGInline.cpp: Copied from rendering/RenderSVGInline.cpp.
* rendering/svg/RenderSVGInline.h: Copied from rendering/RenderSVGInline.h.
* rendering/svg/RenderSVGInlineText.cpp: Copied from rendering/RenderSVGInlineText.cpp.
* rendering/svg/RenderSVGInlineText.h: Copied from rendering/RenderSVGInlineText.h.
* rendering/svg/RenderSVGTSpan.cpp: Copied from rendering/RenderSVGTSpan.cpp.
* rendering/svg/RenderSVGTSpan.h: Copied from rendering/RenderSVGTSpan.h.
* rendering/svg/RenderSVGText.cpp: Copied from rendering/RenderSVGText.cpp.
* rendering/svg/RenderSVGText.h: Copied from rendering/RenderSVGText.h.
* rendering/svg/RenderSVGTextPath.cpp: Copied from rendering/RenderSVGTextPath.cpp.
* rendering/svg/RenderSVGTextPath.h: Copied from rendering/RenderSVGTextPath.h.
* rendering/svg/SVGInlineFlowBox.cpp: Copied from rendering/SVGInlineFlowBox.cpp.
* rendering/svg/SVGInlineFlowBox.h: Copied from rendering/SVGInlineFlowBox.h.
* rendering/svg/SVGInlineTextBox.cpp: Copied from rendering/SVGInlineTextBox.cpp.
* rendering/svg/SVGInlineTextBox.h: Copied from rendering/SVGInlineTextBox.h.
* rendering/svg/SVGRootInlineBox.cpp: Copied from rendering/SVGRootInlineBox.cpp.
* rendering/svg/SVGRootInlineBox.h: Copied from rendering/SVGRootInlineBox.h.
* rendering/svg/SVGTextQuery.cpp: Copied from rendering/SVGTextQuery.cpp.
* rendering/svg/SVGTextQuery.h: Copied from rendering/SVGTextQuery.h.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68874 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 1653a57..d8c72a1 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -690,8 +690,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
rendering/RenderSVGGradientStop.cpp \
rendering/RenderSVGHiddenContainer.cpp \
rendering/RenderSVGImage.cpp \
- rendering/RenderSVGInline.cpp \
- rendering/RenderSVGInlineText.cpp \
rendering/RenderSVGModelObject.cpp \
rendering/RenderSVGResource.cpp \
rendering/RenderSVGResourceClipper.cpp \
@@ -707,15 +705,21 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
rendering/RenderSVGResourceSolidColor.cpp \
rendering/RenderSVGRoot.cpp \
rendering/RenderSVGShadowTreeRootContainer.cpp \
- rendering/RenderSVGTSpan.cpp \
- rendering/RenderSVGText.cpp \
- rendering/RenderSVGTextPath.cpp \
rendering/RenderSVGTransformableContainer.cpp \
rendering/RenderSVGViewportContainer.cpp \
+ rendering/svg/RenderSVGInline.cpp \
+ rendering/svg/RenderSVGInlineText.cpp \
+ rendering/svg/RenderSVGTSpan.cpp \
+ rendering/svg/RenderSVGText.cpp \
+ rendering/svg/RenderSVGTextPath.cpp \
+ rendering/svg/SVGInlineFlowBox.cpp \
+ rendering/svg/SVGInlineTextBox.cpp \
+ rendering/svg/SVGRootInlineBox.cpp \
rendering/svg/SVGTextChunk.cpp \
rendering/svg/SVGTextLayoutAttributes.cpp \
rendering/svg/SVGTextLayoutBuilder.cpp \
- rendering/svg/SVGTextMetrics.cpp
+ rendering/svg/SVGTextMetrics.cpp \
+ rendering/svg/SVGTextQuery.cpp
endif
LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
@@ -746,19 +750,15 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
rendering/SVGCharacterData.cpp \
rendering/SVGCharacterLayoutInfo.cpp \
rendering/SVGImageBufferTools.cpp \
- rendering/SVGInlineFlowBox.cpp \
- rendering/SVGInlineTextBox.cpp \
rendering/SVGMarkerLayoutInfo.cpp \
rendering/SVGRenderSupport.cpp \
rendering/SVGRenderTreeAsText.cpp \
rendering/SVGResources.cpp \
rendering/SVGResourcesCache.cpp \
rendering/SVGResourcesCycleSolver.cpp \
- rendering/SVGRootInlineBox.cpp \
rendering/SVGShadowTreeElements.cpp \
rendering/SVGTextChunkLayoutInfo.cpp \
- rendering/SVGTextLayoutUtilities.cpp \
- rendering/SVGTextQuery.cpp
+ rendering/SVGTextLayoutUtilities.cpp
endif
LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 33e82a5..e8048bb 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1666,8 +1666,6 @@ IF (ENABLE_SVG)
rendering/RenderSVGGradientStop.cpp
rendering/RenderSVGHiddenContainer.cpp
rendering/RenderSVGImage.cpp
- rendering/RenderSVGInline.cpp
- rendering/RenderSVGInlineText.cpp
rendering/RenderSVGModelObject.cpp
rendering/RenderSVGResource.cpp
rendering/RenderSVGResourceClipper.cpp
@@ -1683,33 +1681,35 @@ IF (ENABLE_SVG)
rendering/RenderSVGResourceSolidColor.cpp
rendering/RenderSVGRoot.cpp
rendering/RenderSVGShadowTreeRootContainer.cpp
- rendering/RenderSVGTSpan.cpp
- rendering/RenderSVGText.cpp
- rendering/RenderSVGTextPath.cpp
rendering/RenderSVGTransformableContainer.cpp
rendering/RenderSVGViewportContainer.cpp
rendering/SVGCharacterData.cpp
rendering/SVGCharacterLayoutInfo.cpp
rendering/SVGImageBufferTools.cpp
- rendering/SVGInlineFlowBox.cpp
- rendering/SVGInlineTextBox.cpp
rendering/SVGMarkerLayoutInfo.cpp
rendering/SVGRenderSupport.cpp
rendering/SVGRenderTreeAsText.cpp
rendering/SVGResources.cpp
rendering/SVGResourcesCache.cpp
rendering/SVGResourcesCycleSolver.cpp
- rendering/SVGRootInlineBox.cpp
rendering/SVGShadowTreeElements.cpp
rendering/SVGTextChunkLayoutInfo.cpp
rendering/SVGTextLayoutUtilities.cpp
- rendering/SVGTextQuery.cpp
rendering/style/SVGRenderStyle.cpp
rendering/style/SVGRenderStyleDefs.cpp
+ rendering/svg/RenderSVGInline.cpp
+ rendering/svg/RenderSVGInlineText.cpp
+ rendering/svg/RenderSVGTSpan.cpp
+ rendering/svg/RenderSVGText.cpp
+ rendering/svg/RenderSVGTextPath.cpp
+ rendering/svg/SVGInlineFlowBox.cpp
+ rendering/svg/SVGInlineTextBox.cpp
+ rendering/svg/SVGRootInlineBox.cpp
rendering/svg/SVGTextChunk.cpp
rendering/svg/SVGTextLayoutAttributes.cpp
rendering/svg/SVGTextLayoutBuilder.cpp
rendering/svg/SVGTextMetrics.cpp
+ rendering/svg/SVGTextQuery.cpp
svg/ColorDistance.cpp
svg/SVGAElement.cpp
svg/SVGAltGlyphElement.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 91f50a9..2d4040b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,59 @@
2010-10-01 Nikolas Zimmermann <nzimmermann at rim.com>
+ Reviewed by Andreas Kling.
+
+ Move SVG text related renderers into rendering/svg/
+ https://bugs.webkit.org/show_bug.cgi?id=46969
+
+ Doesn't affect any functionality, just moves files around.
+
+ * Android.mk:
+ * CMakeLists.txt:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * rendering/RenderSVGAllInOne.cpp:
+ * rendering/RenderSVGInline.cpp: Removed.
+ * rendering/RenderSVGInline.h: Removed.
+ * rendering/RenderSVGInlineText.cpp: Removed.
+ * rendering/RenderSVGInlineText.h: Removed.
+ * rendering/RenderSVGTSpan.cpp: Removed.
+ * rendering/RenderSVGTSpan.h: Removed.
+ * rendering/RenderSVGText.cpp: Removed.
+ * rendering/RenderSVGText.h: Removed.
+ * rendering/RenderSVGTextPath.cpp: Removed.
+ * rendering/RenderSVGTextPath.h: Removed.
+ * rendering/SVGInlineFlowBox.cpp: Removed.
+ * rendering/SVGInlineFlowBox.h: Removed.
+ * rendering/SVGInlineTextBox.cpp: Removed.
+ * rendering/SVGInlineTextBox.h: Removed.
+ * rendering/SVGRootInlineBox.cpp: Removed.
+ * rendering/SVGRootInlineBox.h: Removed.
+ * rendering/SVGTextQuery.cpp: Removed.
+ * rendering/SVGTextQuery.h: Removed.
+ * rendering/svg/RenderSVGInline.cpp: Copied from rendering/RenderSVGInline.cpp.
+ * rendering/svg/RenderSVGInline.h: Copied from rendering/RenderSVGInline.h.
+ * rendering/svg/RenderSVGInlineText.cpp: Copied from rendering/RenderSVGInlineText.cpp.
+ * rendering/svg/RenderSVGInlineText.h: Copied from rendering/RenderSVGInlineText.h.
+ * rendering/svg/RenderSVGTSpan.cpp: Copied from rendering/RenderSVGTSpan.cpp.
+ * rendering/svg/RenderSVGTSpan.h: Copied from rendering/RenderSVGTSpan.h.
+ * rendering/svg/RenderSVGText.cpp: Copied from rendering/RenderSVGText.cpp.
+ * rendering/svg/RenderSVGText.h: Copied from rendering/RenderSVGText.h.
+ * rendering/svg/RenderSVGTextPath.cpp: Copied from rendering/RenderSVGTextPath.cpp.
+ * rendering/svg/RenderSVGTextPath.h: Copied from rendering/RenderSVGTextPath.h.
+ * rendering/svg/SVGInlineFlowBox.cpp: Copied from rendering/SVGInlineFlowBox.cpp.
+ * rendering/svg/SVGInlineFlowBox.h: Copied from rendering/SVGInlineFlowBox.h.
+ * rendering/svg/SVGInlineTextBox.cpp: Copied from rendering/SVGInlineTextBox.cpp.
+ * rendering/svg/SVGInlineTextBox.h: Copied from rendering/SVGInlineTextBox.h.
+ * rendering/svg/SVGRootInlineBox.cpp: Copied from rendering/SVGRootInlineBox.cpp.
+ * rendering/svg/SVGRootInlineBox.h: Copied from rendering/SVGRootInlineBox.h.
+ * rendering/svg/SVGTextQuery.cpp: Copied from rendering/SVGTextQuery.cpp.
+ * rendering/svg/SVGTextQuery.h: Copied from rendering/SVGTextQuery.h.
+
+2010-10-01 Nikolas Zimmermann <nzimmermann at rim.com>
+
Reviewed by Dirk Schulze.
Add SVGTextMetrics/SVGTextFragment/SVGTextChunk primitives used by the new layout engine
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 11f338b..96eea26 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2641,10 +2641,6 @@ webcore_sources += \
WebCore/rendering/RenderSVGHiddenContainer.h \
WebCore/rendering/RenderSVGImage.cpp \
WebCore/rendering/RenderSVGImage.h \
- WebCore/rendering/RenderSVGInline.cpp \
- WebCore/rendering/RenderSVGInline.h \
- WebCore/rendering/RenderSVGInlineText.cpp \
- WebCore/rendering/RenderSVGInlineText.h \
WebCore/rendering/RenderSVGModelObject.cpp \
WebCore/rendering/RenderSVGModelObject.h \
WebCore/rendering/RenderSVGResourceClipper.cpp \
@@ -2675,14 +2671,8 @@ webcore_sources += \
WebCore/rendering/RenderSVGRoot.h \
WebCore/rendering/RenderSVGShadowTreeRootContainer.cpp \
WebCore/rendering/RenderSVGShadowTreeRootContainer.h \
- WebCore/rendering/RenderSVGText.cpp \
- WebCore/rendering/RenderSVGText.h \
- WebCore/rendering/RenderSVGTextPath.cpp \
- WebCore/rendering/RenderSVGTextPath.h \
WebCore/rendering/RenderSVGTransformableContainer.cpp \
WebCore/rendering/RenderSVGTransformableContainer.h \
- WebCore/rendering/RenderSVGTSpan.cpp \
- WebCore/rendering/RenderSVGTSpan.h \
WebCore/rendering/RenderSVGViewportContainer.cpp \
WebCore/rendering/RenderSVGViewportContainer.h \
WebCore/rendering/RenderTableCell.cpp \
@@ -2788,10 +2778,6 @@ webcore_sources += \
WebCore/rendering/SVGCharacterLayoutInfo.h \
WebCore/rendering/SVGImageBufferTools.cpp \
WebCore/rendering/SVGImageBufferTools.h \
- WebCore/rendering/SVGInlineFlowBox.cpp \
- WebCore/rendering/SVGInlineFlowBox.h \
- WebCore/rendering/SVGInlineTextBox.cpp \
- WebCore/rendering/SVGInlineTextBox.h \
WebCore/rendering/SVGMarkerData.h \
WebCore/rendering/SVGMarkerLayoutInfo.cpp \
WebCore/rendering/SVGMarkerLayoutInfo.h \
@@ -2805,10 +2791,24 @@ webcore_sources += \
WebCore/rendering/SVGResourcesCycleSolver.cpp \
WebCore/rendering/SVGResourcesCycleSolver.h \
WebCore/rendering/SVGResources.h \
- WebCore/rendering/SVGRootInlineBox.cpp \
- WebCore/rendering/SVGRootInlineBox.h \
WebCore/rendering/SVGShadowTreeElements.cpp \
WebCore/rendering/SVGShadowTreeElements.h \
+ WebCore/rendering/svg/RenderSVGInline.cpp \
+ WebCore/rendering/svg/RenderSVGInline.h \
+ WebCore/rendering/svg/RenderSVGInlineText.cpp \
+ WebCore/rendering/svg/RenderSVGInlineText.h \
+ WebCore/rendering/svg/RenderSVGTSpan.cpp \
+ WebCore/rendering/svg/RenderSVGTSpan.h \
+ WebCore/rendering/svg/RenderSVGText.cpp \
+ WebCore/rendering/svg/RenderSVGText.h \
+ WebCore/rendering/svg/RenderSVGTextPath.cpp \
+ WebCore/rendering/svg/RenderSVGTextPath.h \
+ WebCore/rendering/svg/SVGInlineFlowBox.cpp \
+ WebCore/rendering/svg/SVGInlineFlowBox.h \
+ WebCore/rendering/svg/SVGInlineTextBox.cpp \
+ WebCore/rendering/svg/SVGInlineTextBox.h \
+ WebCore/rendering/svg/SVGRootInlineBox.cpp \
+ WebCore/rendering/svg/SVGRootInlineBox.h \
WebCore/rendering/svg/SVGTextChunk.cpp \
WebCore/rendering/svg/SVGTextChunk.h \
WebCore/rendering/svg/SVGTextFragment.h \
@@ -2818,12 +2818,12 @@ webcore_sources += \
WebCore/rendering/svg/SVGTextLayoutBuilder.h \
WebCore/rendering/svg/SVGTextMetrics.cpp \
WebCore/rendering/svg/SVGTextMetrics.h \
+ WebCore/rendering/svg/SVGTextQuery.cpp \
+ WebCore/rendering/svg/SVGTextQuery.h \
WebCore/rendering/SVGTextChunkLayoutInfo.cpp \
WebCore/rendering/SVGTextChunkLayoutInfo.h \
WebCore/rendering/SVGTextLayoutUtilities.cpp \
WebCore/rendering/SVGTextLayoutUtilities.h \
- WebCore/rendering/SVGTextQuery.cpp \
- WebCore/rendering/SVGTextQuery.h \
WebCore/rendering/TableLayout.h \
WebCore/rendering/TextControlInnerElements.cpp \
WebCore/rendering/TextControlInnerElements.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 35c9a17..7b52557 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -3435,6 +3435,22 @@
'rendering/style/StyleTransformData.h',
'rendering/style/StyleVisualData.cpp',
'rendering/style/StyleVisualData.h',
+ 'rendering/svg/RenderSVGInline.cpp',
+ 'rendering/svg/RenderSVGInline.h',
+ 'rendering/svg/RenderSVGInlineText.cpp',
+ 'rendering/svg/RenderSVGInlineText.h',
+ 'rendering/svg/RenderSVGTSpan.cpp',
+ 'rendering/svg/RenderSVGTSpan.h',
+ 'rendering/svg/RenderSVGText.cpp',
+ 'rendering/svg/RenderSVGText.h',
+ 'rendering/svg/RenderSVGTextPath.cpp',
+ 'rendering/svg/RenderSVGTextPath.h',
+ 'rendering/svg/SVGInlineFlowBox.cpp',
+ 'rendering/svg/SVGInlineFlowBox.h',
+ 'rendering/svg/SVGInlineTextBox.cpp',
+ 'rendering/svg/SVGInlineTextBox.h',
+ 'rendering/svg/SVGRootInlineBox.cpp',
+ 'rendering/svg/SVGRootInlineBox.h',
'rendering/svg/SVGTextChunk.cpp',
'rendering/svg/SVGTextChunk.h',
'rendering/svg/SVGTextFragment.h',
@@ -3444,6 +3460,8 @@
'rendering/svg/SVGTextLayoutBuilder.h',
'rendering/svg/SVGTextMetrics.cpp',
'rendering/svg/SVGTextMetrics.h',
+ 'rendering/svg/SVGTextQuery.cpp',
+ 'rendering/svg/SVGTextQuery.h',
'rendering/AutoTableLayout.cpp',
'rendering/AutoTableLayout.h',
'rendering/BidiRun.cpp',
@@ -3580,10 +3598,6 @@
'rendering/RenderSVGHiddenContainer.h',
'rendering/RenderSVGImage.cpp',
'rendering/RenderSVGImage.h',
- 'rendering/RenderSVGInline.cpp',
- 'rendering/RenderSVGInline.h',
- 'rendering/RenderSVGInlineText.cpp',
- 'rendering/RenderSVGInlineText.h',
'rendering/RenderSVGModelObject.cpp',
'rendering/RenderSVGModelObject.h',
'rendering/RenderSVGResource.cpp',
@@ -3614,12 +3628,6 @@
'rendering/RenderSVGRoot.h',
'rendering/RenderSVGShadowTreeRootContainer.cpp',
'rendering/RenderSVGShadowTreeRootContainer.h',
- 'rendering/RenderSVGTSpan.cpp',
- 'rendering/RenderSVGTSpan.h',
- 'rendering/RenderSVGText.cpp',
- 'rendering/RenderSVGText.h',
- 'rendering/RenderSVGTextPath.cpp',
- 'rendering/RenderSVGTextPath.h',
'rendering/RenderSVGTransformableContainer.cpp',
'rendering/RenderSVGTransformableContainer.h',
'rendering/RenderSVGViewportContainer.cpp',
@@ -3689,12 +3697,8 @@
'rendering/SVGCharacterData.h',
'rendering/SVGCharacterLayoutInfo.cpp',
'rendering/SVGCharacterLayoutInfo.h',
- 'rendering/SVGInlineFlowBox.cpp',
- 'rendering/SVGInlineFlowBox.h',
'rendering/SVGImageBufferTools.cpp',
'rendering/SVGImageBufferTools.h',
- 'rendering/SVGInlineTextBox.cpp',
- 'rendering/SVGInlineTextBox.h',
'rendering/SVGMarkerData.h',
'rendering/SVGMarkerLayoutInfo.cpp',
'rendering/SVGMarkerLayoutInfo.h',
@@ -3708,16 +3712,12 @@
'rendering/SVGResourcesCache.h',
'rendering/SVGResourcesCycleSolver.cpp',
'rendering/SVGResourcesCycleSolver.h',
- 'rendering/SVGRootInlineBox.cpp',
- 'rendering/SVGRootInlineBox.h',
'rendering/SVGShadowTreeElements.cpp',
'rendering/SVGShadowTreeElements.h',
'rendering/SVGTextChunkLayoutInfo.cpp',
'rendering/SVGTextChunkLayoutInfo.h',
'rendering/SVGTextLayoutUtilities.cpp',
'rendering/SVGTextLayoutUtilities.h',
- 'rendering/SVGTextQuery.cpp',
- 'rendering/SVGTextQuery.h',
'rendering/TableLayout.h',
'rendering/TextControlInnerElements.cpp',
'rendering/TextControlInnerElements.h',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index d0ff087..3aea684 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2228,8 +2228,6 @@ HEADERS += \
rendering/RenderSVGGradientStop.h \
rendering/RenderSVGHiddenContainer.h \
rendering/RenderSVGImage.h \
- rendering/RenderSVGInline.h \
- rendering/RenderSVGInlineText.h \
rendering/RenderSVGModelObject.h \
rendering/RenderSVGResource.h \
rendering/RenderSVGResourceClipper.h \
@@ -2245,10 +2243,7 @@ HEADERS += \
rendering/RenderSVGResourceSolidColor.h \
rendering/RenderSVGRoot.h \
rendering/RenderSVGShadowTreeRootContainer.h \
- rendering/RenderSVGText.h \
- rendering/RenderSVGTextPath.h \
rendering/RenderSVGTransformableContainer.h \
- rendering/RenderSVGTSpan.h \
rendering/RenderSVGViewportContainer.h \
rendering/RenderTableCell.h \
rendering/RenderTableCol.h \
@@ -2294,16 +2289,23 @@ HEADERS += \
rendering/style/StyleVisualData.h \
rendering/style/SVGRenderStyleDefs.h \
rendering/style/SVGRenderStyle.h \
+ rendering/svg/RenderSVGInline.h \
+ rendering/svg/RenderSVGInlineText.h \
+ rendering/svg/RenderSVGTSpan.h \
+ rendering/svg/RenderSVGText.h \
+ rendering/svg/RenderSVGTextPath.h \
+ rendering/svg/SVGInlineFlowBox.h \
+ rendering/svg/SVGInlineTextBox.h \
+ rendering/svg/SVGRootInlineBox.h \
rendering/svg/SVGTextChunk.h \
rendering/svg/SVGTextFragment.h \
rendering/svg/SVGTextLayoutAttributes.h \
rendering/svg/SVGTextLayoutBuilder.h \
rendering/svg/SVGTextMetrics.h \
+ rendering/svg/SVGTextQuery.h \
rendering/SVGCharacterData.h \
rendering/SVGCharacterLayoutInfo.h \
rendering/SVGImageBufferTools.h \
- rendering/SVGInlineFlowBox.h \
- rendering/SVGInlineTextBox.h \
rendering/SVGMarkerData.h \
rendering/SVGMarkerLayoutInfo.h \
rendering/SVGRenderSupport.h \
@@ -2311,11 +2313,9 @@ HEADERS += \
rendering/SVGResources.h \
rendering/SVGResourcesCache.h \
rendering/SVGResourcesCycleSolver.h \
- rendering/SVGRootInlineBox.h \
rendering/SVGShadowTreeElements.h \
rendering/SVGTextChunkLayoutInfo.h \
rendering/SVGTextLayoutUtilities.h \
- rendering/SVGTextQuery.h \
rendering/TextControlInnerElements.h \
rendering/TransformState.h \
svg/animation/SMILTimeContainer.h \
@@ -3278,10 +3278,19 @@ contains(DEFINES, ENABLE_SVG=1) {
css/SVGCSSStyleSelector.cpp \
rendering/style/SVGRenderStyle.cpp \
rendering/style/SVGRenderStyleDefs.cpp \
+ rendering/svg/RenderSVGInline.cpp \
+ rendering/svg/RenderSVGInlineText.cpp \
+ rendering/svg/RenderSVGTSpan.cpp \
+ rendering/svg/RenderSVGText.cpp \
+ rendering/svg/RenderSVGTextPath.cpp \
+ rendering/svg/SVGInlineFlowBox.cpp \
+ rendering/svg/SVGInlineTextBox.cpp \
+ rendering/svg/SVGRootInlineBox.cpp \
rendering/svg/SVGTextChunk.cpp \
rendering/svg/SVGTextLayoutAttributes.cpp \
rendering/svg/SVGTextLayoutBuilder.cpp \
rendering/svg/SVGTextMetrics.cpp \
+ rendering/svg/SVGTextQuery.cpp \
rendering/PointerEventsHitRules.cpp \
svg/SVGDocumentExtensions.cpp \
svg/SVGImageLoader.cpp \
@@ -3442,8 +3451,6 @@ contains(DEFINES, ENABLE_SVG=1) {
rendering/RenderSVGGradientStop.cpp \
rendering/RenderSVGHiddenContainer.cpp \
rendering/RenderSVGImage.cpp \
- rendering/RenderSVGInline.cpp \
- rendering/RenderSVGInlineText.cpp \
rendering/RenderSVGModelObject.cpp \
rendering/RenderSVGResource.cpp \
rendering/RenderSVGResourceClipper.cpp \
@@ -3459,26 +3466,19 @@ contains(DEFINES, ENABLE_SVG=1) {
rendering/RenderSVGResourceSolidColor.cpp \
rendering/RenderSVGRoot.cpp \
rendering/RenderSVGShadowTreeRootContainer.cpp \
- rendering/RenderSVGText.cpp \
- rendering/RenderSVGTextPath.cpp \
rendering/RenderSVGTransformableContainer.cpp \
- rendering/RenderSVGTSpan.cpp \
rendering/RenderSVGViewportContainer.cpp \
rendering/SVGCharacterData.cpp \
rendering/SVGCharacterLayoutInfo.cpp \
rendering/SVGImageBufferTools.cpp \
- rendering/SVGInlineFlowBox.cpp \
- rendering/SVGInlineTextBox.cpp \
rendering/SVGMarkerLayoutInfo.cpp \
rendering/SVGRenderSupport.cpp \
rendering/SVGResources.cpp \
rendering/SVGResourcesCache.cpp \
rendering/SVGResourcesCycleSolver.cpp \
- rendering/SVGRootInlineBox.cpp \
rendering/SVGShadowTreeElements.cpp \
rendering/SVGTextChunkLayoutInfo.cpp \
- rendering/SVGTextLayoutUtilities.cpp \
- rendering/SVGTextQuery.cpp
+ rendering/SVGTextLayoutUtilities.cpp
}
contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1) {
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 2bd928f..35f5e6c 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -30945,118 +30945,6 @@
>
</File>
<File
- RelativePath="..\rendering\RenderSVGInline.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\RenderSVGInline.h"
- >
- </File>
- <File
- RelativePath="..\rendering\RenderSVGInlineText.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\RenderSVGInlineText.h"
- >
- </File>
- <File
RelativePath="..\rendering\RenderSVGModelObject.cpp"
>
<FileConfiguration
@@ -31897,118 +31785,6 @@
>
</File>
<File
- RelativePath="..\rendering\RenderSVGText.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\RenderSVGText.h"
- >
- </File>
- <File
- RelativePath="..\rendering\RenderSVGTextPath.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\RenderSVGTextPath.h"
- >
- </File>
- <File
RelativePath="..\rendering\RenderSVGTransformableContainer.cpp"
>
<FileConfiguration
@@ -32065,62 +31841,6 @@
>
</File>
<File
- RelativePath="..\rendering\RenderSVGTSpan.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\RenderSVGTSpan.h"
- >
- </File>
- <File
RelativePath="..\rendering\RenderSVGViewportContainer.cpp"
>
<FileConfiguration
@@ -32527,118 +32247,6 @@
>
</File>
<File
- RelativePath="..\rendering\SVGInlineFlowBox.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\SVGInlineFlowBox.h"
- >
- </File>
- <File
- RelativePath="..\rendering\SVGInlineTextBox.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\SVGInlineTextBox.h"
- >
- </File>
- <File
RelativePath="..\rendering\SVGMarkerData.h"
>
</File>
@@ -32979,62 +32587,6 @@
>
</File>
<File
- RelativePath="..\rendering\SVGRootInlineBox.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\SVGRootInlineBox.h"
- >
- </File>
- <File
RelativePath="..\rendering\SVGShadowTreeElements.cpp"
>
<FileConfiguration
@@ -33203,62 +32755,6 @@
>
</File>
<File
- RelativePath="..\rendering\SVGTextQuery.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\rendering\SVGTextQuery.h"
- >
- </File>
- <File
RelativePath="..\rendering\TableLayout.h"
>
</File>
@@ -33514,6 +33010,454 @@
Name="svg"
>
<File
+ RelativePath="..\rendering\svg\RenderSVGInline.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\rendering\svg\RenderSVGInline.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\svg\RenderSVGInlineText.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\rendering\svg\RenderSVGInlineText.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\svg\RenderSVGTSpan.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\rendering\svg\RenderSVGTSpan.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\svg\RenderSVGText.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\rendering\svg\RenderSVGText.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\svg\RenderSVGTextPath.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\rendering\svg\RenderSVGTextPath.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\svg\SVGInlineFlowBox.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\rendering\svg\SVGInlineFlowBox.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\svg\SVGInlineTextBox.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\rendering\svg\SVGInlineTextBox.h"
+ >
+ </File>
+ <File
+ RelativePath="..\rendering\svg\SVGRootInlineBox.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\rendering\svg\SVGRootInlineBox.h"
+ >
+ </File>
+ <File
RelativePath="..\rendering\svg\SVGTextChunk.cpp"
>
</File>
@@ -33549,6 +33493,62 @@
RelativePath="..\rendering\svg\SVGTextMetrics.h"
>
</File>
+ <File
+ RelativePath="..\rendering\svg\SVGTextQuery.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\rendering\svg\SVGTextQuery.h"
+ >
+ </File>
</Filter>
</Filter>
<Filter
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 407638b..145dff9 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -108,8 +108,24 @@
084DBAA10ED39D360038C226 /* WMLVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 084DBA9D0ED39D350038C226 /* WMLVariables.cpp */; };
084DBAA20ED39D360038C226 /* WMLVariables.h in Headers */ = {isa = PBXBuildFile; fileRef = 084DBA9E0ED39D360038C226 /* WMLVariables.h */; };
0853D73211C9109000B2FD42 /* SVGTextChunkLayoutInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0853D72F11C9108F00B2FD42 /* SVGTextChunkLayoutInfo.cpp */; };
- 0853D73311C9109000B2FD42 /* SVGTextQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0853D73011C9109000B2FD42 /* SVGTextQuery.cpp */; };
- 0853D73411C9109000B2FD42 /* SVGTextQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 0853D73111C9109000B2FD42 /* SVGTextQuery.h */; };
+ 0854B0141255E4E600B9CDD0 /* RenderSVGInline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0854B0021255E4E600B9CDD0 /* RenderSVGInline.cpp */; };
+ 0854B0151255E4E600B9CDD0 /* RenderSVGInline.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0031255E4E600B9CDD0 /* RenderSVGInline.h */; };
+ 0854B0161255E4E600B9CDD0 /* RenderSVGInlineText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0854B0041255E4E600B9CDD0 /* RenderSVGInlineText.cpp */; };
+ 0854B0171255E4E600B9CDD0 /* RenderSVGInlineText.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0051255E4E600B9CDD0 /* RenderSVGInlineText.h */; };
+ 0854B0181255E4E600B9CDD0 /* RenderSVGText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0854B0061255E4E600B9CDD0 /* RenderSVGText.cpp */; };
+ 0854B0191255E4E600B9CDD0 /* RenderSVGText.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0071255E4E600B9CDD0 /* RenderSVGText.h */; };
+ 0854B01A1255E4E600B9CDD0 /* RenderSVGTextPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0854B0081255E4E600B9CDD0 /* RenderSVGTextPath.cpp */; };
+ 0854B01B1255E4E600B9CDD0 /* RenderSVGTextPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0091255E4E600B9CDD0 /* RenderSVGTextPath.h */; };
+ 0854B01C1255E4E600B9CDD0 /* RenderSVGTSpan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0854B00A1255E4E600B9CDD0 /* RenderSVGTSpan.cpp */; };
+ 0854B01D1255E4E600B9CDD0 /* RenderSVGTSpan.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B00B1255E4E600B9CDD0 /* RenderSVGTSpan.h */; };
+ 0854B01E1255E4E600B9CDD0 /* SVGInlineFlowBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0854B00C1255E4E600B9CDD0 /* SVGInlineFlowBox.cpp */; };
+ 0854B01F1255E4E600B9CDD0 /* SVGInlineFlowBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B00D1255E4E600B9CDD0 /* SVGInlineFlowBox.h */; };
+ 0854B0201255E4E600B9CDD0 /* SVGInlineTextBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0854B00E1255E4E600B9CDD0 /* SVGInlineTextBox.cpp */; };
+ 0854B0211255E4E600B9CDD0 /* SVGInlineTextBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B00F1255E4E600B9CDD0 /* SVGInlineTextBox.h */; };
+ 0854B0221255E4E600B9CDD0 /* SVGRootInlineBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0854B0101255E4E600B9CDD0 /* SVGRootInlineBox.cpp */; };
+ 0854B0231255E4E600B9CDD0 /* SVGRootInlineBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0111255E4E600B9CDD0 /* SVGRootInlineBox.h */; };
+ 0854B0241255E4E600B9CDD0 /* SVGTextQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0854B0121255E4E600B9CDD0 /* SVGTextQuery.cpp */; };
+ 0854B0251255E4E600B9CDD0 /* SVGTextQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 0854B0131255E4E600B9CDD0 /* SVGTextQuery.h */; };
08563BB4117861780012B578 /* RenderSVGResourcePattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08563BB2117861770012B578 /* RenderSVGResourcePattern.cpp */; };
08563BB5117861780012B578 /* RenderSVGResourcePattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 08563BB3117861770012B578 /* RenderSVGResourcePattern.h */; };
08563BD0117865F50012B578 /* RenderSVGResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08563BCF117865F50012B578 /* RenderSVGResource.cpp */; };
@@ -1843,18 +1859,6 @@
853CA9D70AEEC5E9002372DC /* RenderSVGContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 853CA9CB0AEEC5E9002372DC /* RenderSVGContainer.h */; };
853CA9D80AEEC5E9002372DC /* RenderSVGImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 853CA9CC0AEEC5E9002372DC /* RenderSVGImage.cpp */; };
853CA9D90AEEC5E9002372DC /* RenderSVGImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 853CA9CD0AEEC5E9002372DC /* RenderSVGImage.h */; };
- 853CA9DA0AEEC5E9002372DC /* RenderSVGInline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 853CA9CE0AEEC5E9002372DC /* RenderSVGInline.cpp */; };
- 853CA9DB0AEEC5E9002372DC /* RenderSVGInline.h in Headers */ = {isa = PBXBuildFile; fileRef = 853CA9CF0AEEC5E9002372DC /* RenderSVGInline.h */; };
- 853CA9DC0AEEC5E9002372DC /* RenderSVGInlineText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 853CA9D00AEEC5E9002372DC /* RenderSVGInlineText.cpp */; };
- 853CA9DD0AEEC5E9002372DC /* RenderSVGInlineText.h in Headers */ = {isa = PBXBuildFile; fileRef = 853CA9D10AEEC5E9002372DC /* RenderSVGInlineText.h */; };
- 853CA9DE0AEEC5E9002372DC /* RenderSVGText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 853CA9D20AEEC5E9002372DC /* RenderSVGText.cpp */; };
- 853CA9DF0AEEC5E9002372DC /* RenderSVGText.h in Headers */ = {isa = PBXBuildFile; fileRef = 853CA9D30AEEC5E9002372DC /* RenderSVGText.h */; };
- 853CA9E00AEEC5E9002372DC /* RenderSVGTSpan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 853CA9D40AEEC5E9002372DC /* RenderSVGTSpan.cpp */; };
- 853CA9E10AEEC5E9002372DC /* RenderSVGTSpan.h in Headers */ = {isa = PBXBuildFile; fileRef = 853CA9D50AEEC5E9002372DC /* RenderSVGTSpan.h */; };
- 853CA9E60AEEC608002372DC /* SVGInlineFlowBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 853CA9E20AEEC608002372DC /* SVGInlineFlowBox.cpp */; };
- 853CA9E70AEEC608002372DC /* SVGInlineFlowBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 853CA9E30AEEC608002372DC /* SVGInlineFlowBox.h */; };
- 853CA9E80AEEC608002372DC /* SVGRootInlineBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 853CA9E40AEEC608002372DC /* SVGRootInlineBox.cpp */; };
- 853CA9E90AEEC608002372DC /* SVGRootInlineBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 853CA9E50AEEC608002372DC /* SVGRootInlineBox.h */; };
853CA9EC0AEEC63C002372DC /* RenderForeignObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 853CA9EA0AEEC63C002372DC /* RenderForeignObject.cpp */; };
853CA9ED0AEEC63C002372DC /* RenderForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 853CA9EB0AEEC63C002372DC /* RenderForeignObject.h */; };
853CA9F00AEEC657002372DC /* RenderPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 853CA9EE0AEEC657002372DC /* RenderPath.cpp */; };
@@ -3818,8 +3822,6 @@
A9D248070D757E7D00FDF959 /* JSDOMMimeType.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D248030D757E7D00FDF959 /* JSDOMMimeType.h */; };
A9D248080D757E7D00FDF959 /* JSDOMMimeTypeArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D248040D757E7D00FDF959 /* JSDOMMimeTypeArray.cpp */; };
A9D248090D757E7D00FDF959 /* JSDOMMimeTypeArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D248050D757E7D00FDF959 /* JSDOMMimeTypeArray.h */; };
- AA0972CC0B6947A800A705E9 /* SVGInlineTextBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0972CA0B6947A800A705E9 /* SVGInlineTextBox.cpp */; };
- AA0972CD0B6947A800A705E9 /* SVGInlineTextBox.h in Headers */ = {isa = PBXBuildFile; fileRef = AA0972CB0B6947A800A705E9 /* SVGInlineTextBox.h */; };
AA21ECCA0ABF0FBA002B834C /* CSSCursorImageValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0978ED0ABAA6E100874480 /* CSSCursorImageValue.cpp */; };
AA21ECCD0ABF0FC6002B834C /* CSSCursorImageValue.h in Headers */ = {isa = PBXBuildFile; fileRef = AA0978EE0ABAA6E100874480 /* CSSCursorImageValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
AA31B5B40C1DFD1000AE7083 /* RenderSVGRoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA31B5B20C1DFD1000AE7083 /* RenderSVGRoot.cpp */; };
@@ -4128,8 +4130,6 @@
B25599A50D00D8BA00BB825C /* EmptyClients.h in Headers */ = {isa = PBXBuildFile; fileRef = B255990D0D00D8B900BB825C /* EmptyClients.h */; };
B25DFAAF0B2E2929000E6510 /* JSSVGMatrixCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25DFAAE0B2E2929000E6510 /* JSSVGMatrixCustom.cpp */; };
B262B8040D1F32D000158F09 /* SVGFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B262B8030D1F32D000158F09 /* SVGFont.cpp */; };
- B26554EA0B80D74900A50EC3 /* RenderSVGTextPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B26554E80B80D74900A50EC3 /* RenderSVGTextPath.cpp */; };
- B26554EB0B80D74900A50EC3 /* RenderSVGTextPath.h in Headers */ = {isa = PBXBuildFile; fileRef = B26554E90B80D74900A50EC3 /* RenderSVGTextPath.h */; };
B266CD4D0C3AEC6500EB08D2 /* JSSVGException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B266CD4B0C3AEC6500EB08D2 /* JSSVGException.cpp */; };
B266CD4E0C3AEC6500EB08D2 /* JSSVGException.h in Headers */ = {isa = PBXBuildFile; fileRef = B266CD4C0C3AEC6500EB08D2 /* JSSVGException.h */; };
B27535580B053814002CE64F /* TransformationMatrixCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B275352A0B053814002CE64F /* TransformationMatrixCG.cpp */; };
@@ -6049,8 +6049,24 @@
084DBA9D0ED39D350038C226 /* WMLVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLVariables.cpp; sourceTree = "<group>"; };
084DBA9E0ED39D360038C226 /* WMLVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLVariables.h; sourceTree = "<group>"; };
0853D72F11C9108F00B2FD42 /* SVGTextChunkLayoutInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTextChunkLayoutInfo.cpp; sourceTree = "<group>"; };
- 0853D73011C9109000B2FD42 /* SVGTextQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTextQuery.cpp; sourceTree = "<group>"; };
- 0853D73111C9109000B2FD42 /* SVGTextQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextQuery.h; sourceTree = "<group>"; };
+ 0854B0021255E4E600B9CDD0 /* RenderSVGInline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGInline.cpp; sourceTree = "<group>"; };
+ 0854B0031255E4E600B9CDD0 /* RenderSVGInline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGInline.h; sourceTree = "<group>"; };
+ 0854B0041255E4E600B9CDD0 /* RenderSVGInlineText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGInlineText.cpp; sourceTree = "<group>"; };
+ 0854B0051255E4E600B9CDD0 /* RenderSVGInlineText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGInlineText.h; sourceTree = "<group>"; };
+ 0854B0061255E4E600B9CDD0 /* RenderSVGText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGText.cpp; sourceTree = "<group>"; };
+ 0854B0071255E4E600B9CDD0 /* RenderSVGText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGText.h; sourceTree = "<group>"; };
+ 0854B0081255E4E600B9CDD0 /* RenderSVGTextPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGTextPath.cpp; sourceTree = "<group>"; };
+ 0854B0091255E4E600B9CDD0 /* RenderSVGTextPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGTextPath.h; sourceTree = "<group>"; };
+ 0854B00A1255E4E600B9CDD0 /* RenderSVGTSpan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGTSpan.cpp; sourceTree = "<group>"; };
+ 0854B00B1255E4E600B9CDD0 /* RenderSVGTSpan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGTSpan.h; sourceTree = "<group>"; };
+ 0854B00C1255E4E600B9CDD0 /* SVGInlineFlowBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGInlineFlowBox.cpp; sourceTree = "<group>"; };
+ 0854B00D1255E4E600B9CDD0 /* SVGInlineFlowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGInlineFlowBox.h; sourceTree = "<group>"; };
+ 0854B00E1255E4E600B9CDD0 /* SVGInlineTextBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGInlineTextBox.cpp; sourceTree = "<group>"; };
+ 0854B00F1255E4E600B9CDD0 /* SVGInlineTextBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGInlineTextBox.h; sourceTree = "<group>"; };
+ 0854B0101255E4E600B9CDD0 /* SVGRootInlineBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGRootInlineBox.cpp; sourceTree = "<group>"; };
+ 0854B0111255E4E600B9CDD0 /* SVGRootInlineBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGRootInlineBox.h; sourceTree = "<group>"; };
+ 0854B0121255E4E600B9CDD0 /* SVGTextQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGTextQuery.cpp; sourceTree = "<group>"; };
+ 0854B0131255E4E600B9CDD0 /* SVGTextQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGTextQuery.h; sourceTree = "<group>"; };
08563BB2117861770012B578 /* RenderSVGResourcePattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResourcePattern.cpp; sourceTree = "<group>"; };
08563BB3117861770012B578 /* RenderSVGResourcePattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResourcePattern.h; sourceTree = "<group>"; };
08563BCF117865F50012B578 /* RenderSVGResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResource.cpp; sourceTree = "<group>"; };
@@ -7900,18 +7916,6 @@
853CA9CB0AEEC5E9002372DC /* RenderSVGContainer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGContainer.h; sourceTree = "<group>"; };
853CA9CC0AEEC5E9002372DC /* RenderSVGImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGImage.cpp; sourceTree = "<group>"; };
853CA9CD0AEEC5E9002372DC /* RenderSVGImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGImage.h; sourceTree = "<group>"; };
- 853CA9CE0AEEC5E9002372DC /* RenderSVGInline.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGInline.cpp; sourceTree = "<group>"; };
- 853CA9CF0AEEC5E9002372DC /* RenderSVGInline.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGInline.h; sourceTree = "<group>"; };
- 853CA9D00AEEC5E9002372DC /* RenderSVGInlineText.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGInlineText.cpp; sourceTree = "<group>"; };
- 853CA9D10AEEC5E9002372DC /* RenderSVGInlineText.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGInlineText.h; sourceTree = "<group>"; };
- 853CA9D20AEEC5E9002372DC /* RenderSVGText.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGText.cpp; sourceTree = "<group>"; };
- 853CA9D30AEEC5E9002372DC /* RenderSVGText.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGText.h; sourceTree = "<group>"; };
- 853CA9D40AEEC5E9002372DC /* RenderSVGTSpan.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGTSpan.cpp; sourceTree = "<group>"; };
- 853CA9D50AEEC5E9002372DC /* RenderSVGTSpan.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGTSpan.h; sourceTree = "<group>"; };
- 853CA9E20AEEC608002372DC /* SVGInlineFlowBox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGInlineFlowBox.cpp; sourceTree = "<group>"; };
- 853CA9E30AEEC608002372DC /* SVGInlineFlowBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGInlineFlowBox.h; sourceTree = "<group>"; };
- 853CA9E40AEEC608002372DC /* SVGRootInlineBox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGRootInlineBox.cpp; sourceTree = "<group>"; };
- 853CA9E50AEEC608002372DC /* SVGRootInlineBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGRootInlineBox.h; sourceTree = "<group>"; };
853CA9EA0AEEC63C002372DC /* RenderForeignObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderForeignObject.cpp; sourceTree = "<group>"; };
853CA9EB0AEEC63C002372DC /* RenderForeignObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderForeignObject.h; sourceTree = "<group>"; };
853CA9EE0AEEC657002372DC /* RenderPath.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderPath.cpp; sourceTree = "<group>"; };
@@ -9566,8 +9570,6 @@
A9D248030D757E7D00FDF959 /* JSDOMMimeType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMMimeType.h; sourceTree = "<group>"; };
A9D248040D757E7D00FDF959 /* JSDOMMimeTypeArray.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMMimeTypeArray.cpp; sourceTree = "<group>"; };
A9D248050D757E7D00FDF959 /* JSDOMMimeTypeArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMMimeTypeArray.h; sourceTree = "<group>"; };
- AA0972CA0B6947A800A705E9 /* SVGInlineTextBox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGInlineTextBox.cpp; sourceTree = "<group>"; };
- AA0972CB0B6947A800A705E9 /* SVGInlineTextBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGInlineTextBox.h; sourceTree = "<group>"; };
AA0978ED0ABAA6E100874480 /* CSSCursorImageValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSCursorImageValue.cpp; sourceTree = "<group>"; };
AA0978EE0ABAA6E100874480 /* CSSCursorImageValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSCursorImageValue.h; sourceTree = "<group>"; };
AA31B5B20C1DFD1000AE7083 /* RenderSVGRoot.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGRoot.cpp; sourceTree = "<group>"; };
@@ -10019,8 +10021,6 @@
B255990D0D00D8B900BB825C /* EmptyClients.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EmptyClients.h; sourceTree = "<group>"; };
B25DFAAE0B2E2929000E6510 /* JSSVGMatrixCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGMatrixCustom.cpp; sourceTree = "<group>"; };
B262B8030D1F32D000158F09 /* SVGFont.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFont.cpp; sourceTree = "<group>"; };
- B26554E80B80D74900A50EC3 /* RenderSVGTextPath.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGTextPath.cpp; sourceTree = "<group>"; };
- B26554E90B80D74900A50EC3 /* RenderSVGTextPath.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSVGTextPath.h; sourceTree = "<group>"; };
B266CD4B0C3AEC6500EB08D2 /* JSSVGException.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGException.cpp; sourceTree = "<group>"; };
B266CD4C0C3AEC6500EB08D2 /* JSSVGException.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGException.h; sourceTree = "<group>"; };
B275352A0B053814002CE64F /* TransformationMatrixCG.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TransformationMatrixCG.cpp; sourceTree = "<group>"; };
@@ -11638,6 +11638,22 @@
088C2F7412390080003D65CE /* svg */ = {
isa = PBXGroup;
children = (
+ 0854B0021255E4E600B9CDD0 /* RenderSVGInline.cpp */,
+ 0854B0031255E4E600B9CDD0 /* RenderSVGInline.h */,
+ 0854B0041255E4E600B9CDD0 /* RenderSVGInlineText.cpp */,
+ 0854B0051255E4E600B9CDD0 /* RenderSVGInlineText.h */,
+ 0854B0061255E4E600B9CDD0 /* RenderSVGText.cpp */,
+ 0854B0071255E4E600B9CDD0 /* RenderSVGText.h */,
+ 0854B0081255E4E600B9CDD0 /* RenderSVGTextPath.cpp */,
+ 0854B0091255E4E600B9CDD0 /* RenderSVGTextPath.h */,
+ 0854B00A1255E4E600B9CDD0 /* RenderSVGTSpan.cpp */,
+ 0854B00B1255E4E600B9CDD0 /* RenderSVGTSpan.h */,
+ 0854B00C1255E4E600B9CDD0 /* SVGInlineFlowBox.cpp */,
+ 0854B00D1255E4E600B9CDD0 /* SVGInlineFlowBox.h */,
+ 0854B00E1255E4E600B9CDD0 /* SVGInlineTextBox.cpp */,
+ 0854B00F1255E4E600B9CDD0 /* SVGInlineTextBox.h */,
+ 0854B0101255E4E600B9CDD0 /* SVGRootInlineBox.cpp */,
+ 0854B0111255E4E600B9CDD0 /* SVGRootInlineBox.h */,
08F0BFBD1255C53C00075185 /* SVGTextChunk.cpp */,
08F0BFBE1255C53C00075185 /* SVGTextChunk.h */,
08F0BFBF1255C53C00075185 /* SVGTextFragment.h */,
@@ -11647,6 +11663,8 @@
088C2F7812390081003D65CE /* SVGTextLayoutBuilder.h */,
08F0BFC01255C53C00075185 /* SVGTextMetrics.cpp */,
08F0BFC11255C53C00075185 /* SVGTextMetrics.h */,
+ 0854B0121255E4E600B9CDD0 /* SVGTextQuery.cpp */,
+ 0854B0131255E4E600B9CDD0 /* SVGTextQuery.h */,
);
path = svg;
sourceTree = "<group>";
@@ -17655,10 +17673,6 @@
A809F1A80B737FB6002E4D7F /* RenderSVGHiddenContainer.h */,
853CA9CC0AEEC5E9002372DC /* RenderSVGImage.cpp */,
853CA9CD0AEEC5E9002372DC /* RenderSVGImage.h */,
- 853CA9CE0AEEC5E9002372DC /* RenderSVGInline.cpp */,
- 853CA9CF0AEEC5E9002372DC /* RenderSVGInline.h */,
- 853CA9D00AEEC5E9002372DC /* RenderSVGInlineText.cpp */,
- 853CA9D10AEEC5E9002372DC /* RenderSVGInlineText.h */,
A8F5C0B70F9285AC0098E06B /* RenderSVGModelObject.cpp */,
A8F5C0B60F9285AC0098E06B /* RenderSVGModelObject.h */,
08563BCF117865F50012B578 /* RenderSVGResource.cpp */,
@@ -17689,14 +17703,8 @@
AA31B5B30C1DFD1000AE7083 /* RenderSVGRoot.h */,
08DAB9B81103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.cpp */,
08DAB9B91103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.h */,
- 853CA9D20AEEC5E9002372DC /* RenderSVGText.cpp */,
- 853CA9D30AEEC5E9002372DC /* RenderSVGText.h */,
- B26554E80B80D74900A50EC3 /* RenderSVGTextPath.cpp */,
- B26554E90B80D74900A50EC3 /* RenderSVGTextPath.h */,
A8A909AB0CBCD6B50029B807 /* RenderSVGTransformableContainer.cpp */,
A8A909AA0CBCD6B50029B807 /* RenderSVGTransformableContainer.h */,
- 853CA9D40AEEC5E9002372DC /* RenderSVGTSpan.cpp */,
- 853CA9D50AEEC5E9002372DC /* RenderSVGTSpan.h */,
B2CCEC450C6CA9F1006A5424 /* RenderSVGViewportContainer.cpp */,
B2CCEC460C6CA9F1006A5424 /* RenderSVGViewportContainer.h */,
A8DF4AE20980C42C0052981B /* RenderTable.cpp */,
@@ -17745,10 +17753,6 @@
B2B33A5E0B887CEF00C15984 /* SVGCharacterLayoutInfo.h */,
08C46B671212F15D0011AF40 /* SVGImageBufferTools.cpp */,
08C46B681212F15D0011AF40 /* SVGImageBufferTools.h */,
- 853CA9E20AEEC608002372DC /* SVGInlineFlowBox.cpp */,
- 853CA9E30AEEC608002372DC /* SVGInlineFlowBox.h */,
- AA0972CA0B6947A800A705E9 /* SVGInlineTextBox.cpp */,
- AA0972CB0B6947A800A705E9 /* SVGInlineTextBox.h */,
08385FF510F0186000BFE07B /* SVGMarkerData.h */,
08735FB610E91232006D6FAD /* SVGMarkerLayoutInfo.cpp */,
08735FB710E91232006D6FAD /* SVGMarkerLayoutInfo.h */,
@@ -17762,16 +17766,12 @@
084D0E3B11F5816100081E1A /* SVGResourcesCache.h */,
085B05C011FAE16C004D65F6 /* SVGResourcesCycleSolver.cpp */,
085B05C111FAE16C004D65F6 /* SVGResourcesCycleSolver.h */,
- 853CA9E40AEEC608002372DC /* SVGRootInlineBox.cpp */,
- 853CA9E50AEEC608002372DC /* SVGRootInlineBox.h */,
08DAB9C01103D9C1003E7ABA /* SVGShadowTreeElements.cpp */,
08DAB9C11103D9C1003E7ABA /* SVGShadowTreeElements.h */,
0853D72F11C9108F00B2FD42 /* SVGTextChunkLayoutInfo.cpp */,
0842BC801190147200C7D08F /* SVGTextChunkLayoutInfo.h */,
083F529711957FBE00653EBE /* SVGTextLayoutUtilities.cpp */,
083F529811957FBE00653EBE /* SVGTextLayoutUtilities.h */,
- 0853D73011C9109000B2FD42 /* SVGTextQuery.cpp */,
- 0853D73111C9109000B2FD42 /* SVGTextQuery.h */,
A8CFF04C0A154F09000A4234 /* TableLayout.h */,
AB014DE10E689A4300E10445 /* TextControlInnerElements.cpp */,
AB014DE20E689A4300E10445 /* TextControlInnerElements.h */,
@@ -20281,8 +20281,6 @@
A809F1470B73793A002E4D7F /* RenderSVGGradientStop.h in Headers */,
A809F1AA0B737FB6002E4D7F /* RenderSVGHiddenContainer.h in Headers */,
853CA9D90AEEC5E9002372DC /* RenderSVGImage.h in Headers */,
- 853CA9DB0AEEC5E9002372DC /* RenderSVGInline.h in Headers */,
- 853CA9DD0AEEC5E9002372DC /* RenderSVGInlineText.h in Headers */,
A8F5C0B80F9285AC0098E06B /* RenderSVGModelObject.h in Headers */,
083192AA112B43050083C3B9 /* RenderSVGResource.h in Headers */,
84BDA16C11358D2A00DBF64C /* RenderSVGResourceClipper.h in Headers */,
@@ -20298,10 +20296,7 @@
08C6A7AC117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.h in Headers */,
AA31B5B50C1DFD1000AE7083 /* RenderSVGRoot.h in Headers */,
08DAB9BB1103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.h in Headers */,
- 853CA9DF0AEEC5E9002372DC /* RenderSVGText.h in Headers */,
- B26554EB0B80D74900A50EC3 /* RenderSVGTextPath.h in Headers */,
A8A909AC0CBCD6B50029B807 /* RenderSVGTransformableContainer.h in Headers */,
- 853CA9E10AEEC5E9002372DC /* RenderSVGTSpan.h in Headers */,
B2CCEC480C6CA9F1006A5424 /* RenderSVGViewportContainer.h in Headers */,
A8DF4AEB0980C42C0052981B /* RenderTable.h in Headers */,
A8DF4AE90980C42C0052981B /* RenderTableCell.h in Headers */,
@@ -20586,8 +20581,6 @@
08C46B6A1212F15E0011AF40 /* SVGImageBufferTools.h in Headers */,
B2227A2D0D00BF220071B782 /* SVGImageElement.h in Headers */,
B28C6A2A0D00C44800334AA4 /* SVGImageLoader.h in Headers */,
- 853CA9E70AEEC608002372DC /* SVGInlineFlowBox.h in Headers */,
- AA0972CD0B6947A800A705E9 /* SVGInlineTextBox.h in Headers */,
B2227A300D00BF220071B782 /* SVGLangSpace.h in Headers */,
B2227A330D00BF220071B782 /* SVGLength.h in Headers */,
B2227A360D00BF220071B782 /* SVGLengthList.h in Headers */,
@@ -20649,7 +20642,6 @@
084D0E3D11F5816100081E1A /* SVGResources.h in Headers */,
084D0E3F11F5816100081E1A /* SVGResourcesCache.h in Headers */,
085B05C311FAE16C004D65F6 /* SVGResourcesCycleSolver.h in Headers */,
- 853CA9E90AEEC608002372DC /* SVGRootInlineBox.h in Headers */,
B2227AA30D00BF220071B782 /* SVGScriptElement.h in Headers */,
B2227AA60D00BF220071B782 /* SVGSetElement.h in Headers */,
08DAB9C31103D9C1003E7ABA /* SVGShadowTreeElements.h in Headers */,
@@ -20673,7 +20665,6 @@
083F529A11957FBE00653EBE /* SVGTextLayoutUtilities.h in Headers */,
B2227ACE0D00BF220071B782 /* SVGTextPathElement.h in Headers */,
B2227AD10D00BF220071B782 /* SVGTextPositioningElement.h in Headers */,
- 0853D73411C9109000B2FD42 /* SVGTextQuery.h in Headers */,
B2227AD40D00BF220071B782 /* SVGTitleElement.h in Headers */,
B2227AD70D00BF220071B782 /* SVGTransform.h in Headers */,
B2227ADA0D00BF220071B782 /* SVGTransformable.h in Headers */,
@@ -20937,6 +20928,15 @@
08F0BFC31255C53C00075185 /* SVGTextChunk.h in Headers */,
08F0BFC41255C53C00075185 /* SVGTextFragment.h in Headers */,
08F0BFC61255C53C00075185 /* SVGTextMetrics.h in Headers */,
+ 0854B0151255E4E600B9CDD0 /* RenderSVGInline.h in Headers */,
+ 0854B0171255E4E600B9CDD0 /* RenderSVGInlineText.h in Headers */,
+ 0854B0191255E4E600B9CDD0 /* RenderSVGText.h in Headers */,
+ 0854B01B1255E4E600B9CDD0 /* RenderSVGTextPath.h in Headers */,
+ 0854B01D1255E4E600B9CDD0 /* RenderSVGTSpan.h in Headers */,
+ 0854B01F1255E4E600B9CDD0 /* SVGInlineFlowBox.h in Headers */,
+ 0854B0211255E4E600B9CDD0 /* SVGInlineTextBox.h in Headers */,
+ 0854B0231255E4E600B9CDD0 /* SVGRootInlineBox.h in Headers */,
+ 0854B0251255E4E600B9CDD0 /* SVGTextQuery.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -22881,8 +22881,6 @@
A809F1480B73793B002E4D7F /* RenderSVGGradientStop.cpp in Sources */,
A809F1AB0B737FB6002E4D7F /* RenderSVGHiddenContainer.cpp in Sources */,
853CA9D80AEEC5E9002372DC /* RenderSVGImage.cpp in Sources */,
- 853CA9DA0AEEC5E9002372DC /* RenderSVGInline.cpp in Sources */,
- 853CA9DC0AEEC5E9002372DC /* RenderSVGInlineText.cpp in Sources */,
A8F5C0B90F9285AC0098E06B /* RenderSVGModelObject.cpp in Sources */,
08563BD0117865F50012B578 /* RenderSVGResource.cpp in Sources */,
84BDA16B11358D2A00DBF64C /* RenderSVGResourceClipper.cpp in Sources */,
@@ -22898,10 +22896,7 @@
08C6A7AB117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.cpp in Sources */,
AA31B5B40C1DFD1000AE7083 /* RenderSVGRoot.cpp in Sources */,
08DAB9BA1103D9A5003E7ABA /* RenderSVGShadowTreeRootContainer.cpp in Sources */,
- 853CA9DE0AEEC5E9002372DC /* RenderSVGText.cpp in Sources */,
- B26554EA0B80D74900A50EC3 /* RenderSVGTextPath.cpp in Sources */,
A8A909AD0CBCD6B50029B807 /* RenderSVGTransformableContainer.cpp in Sources */,
- 853CA9E00AEEC5E9002372DC /* RenderSVGTSpan.cpp in Sources */,
B2CCEC470C6CA9F1006A5424 /* RenderSVGViewportContainer.cpp in Sources */,
A8DF4AEC0980C42C0052981B /* RenderTable.cpp in Sources */,
A8DF4AEA0980C42C0052981B /* RenderTableCell.cpp in Sources */,
@@ -23162,8 +23157,6 @@
08C46B691212F15E0011AF40 /* SVGImageBufferTools.cpp in Sources */,
B2227A2C0D00BF220071B782 /* SVGImageElement.cpp in Sources */,
B28C6A290D00C44800334AA4 /* SVGImageLoader.cpp in Sources */,
- 853CA9E60AEEC608002372DC /* SVGInlineFlowBox.cpp in Sources */,
- AA0972CC0B6947A800A705E9 /* SVGInlineTextBox.cpp in Sources */,
B2227A2F0D00BF220071B782 /* SVGLangSpace.cpp in Sources */,
B2227A320D00BF220071B782 /* SVGLength.cpp in Sources */,
B2227A350D00BF220071B782 /* SVGLengthList.cpp in Sources */,
@@ -23219,7 +23212,6 @@
084D0E3C11F5816100081E1A /* SVGResources.cpp in Sources */,
084D0E3E11F5816100081E1A /* SVGResourcesCache.cpp in Sources */,
085B05C211FAE16C004D65F6 /* SVGResourcesCycleSolver.cpp in Sources */,
- 853CA9E80AEEC608002372DC /* SVGRootInlineBox.cpp in Sources */,
B2227AA20D00BF220071B782 /* SVGScriptElement.cpp in Sources */,
B2227AA50D00BF220071B782 /* SVGSetElement.cpp in Sources */,
08DAB9C21103D9C1003E7ABA /* SVGShadowTreeElements.cpp in Sources */,
@@ -23243,7 +23235,6 @@
083F529911957FBE00653EBE /* SVGTextLayoutUtilities.cpp in Sources */,
B2227ACD0D00BF220071B782 /* SVGTextPathElement.cpp in Sources */,
B2227AD00D00BF220071B782 /* SVGTextPositioningElement.cpp in Sources */,
- 0853D73311C9109000B2FD42 /* SVGTextQuery.cpp in Sources */,
B2227AD30D00BF220071B782 /* SVGTitleElement.cpp in Sources */,
B2227AD60D00BF220071B782 /* SVGTransform.cpp in Sources */,
B2227AD90D00BF220071B782 /* SVGTransformable.cpp in Sources */,
@@ -23463,6 +23454,15 @@
49B69E651254FEED007D57EB /* LoopBlinnTextureCoords.cpp in Sources */,
08F0BFC21255C53C00075185 /* SVGTextChunk.cpp in Sources */,
08F0BFC51255C53C00075185 /* SVGTextMetrics.cpp in Sources */,
+ 0854B0141255E4E600B9CDD0 /* RenderSVGInline.cpp in Sources */,
+ 0854B0161255E4E600B9CDD0 /* RenderSVGInlineText.cpp in Sources */,
+ 0854B0181255E4E600B9CDD0 /* RenderSVGText.cpp in Sources */,
+ 0854B01A1255E4E600B9CDD0 /* RenderSVGTextPath.cpp in Sources */,
+ 0854B01C1255E4E600B9CDD0 /* RenderSVGTSpan.cpp in Sources */,
+ 0854B01E1255E4E600B9CDD0 /* SVGInlineFlowBox.cpp in Sources */,
+ 0854B0201255E4E600B9CDD0 /* SVGInlineTextBox.cpp in Sources */,
+ 0854B0221255E4E600B9CDD0 /* SVGRootInlineBox.cpp in Sources */,
+ 0854B0241255E4E600B9CDD0 /* SVGTextQuery.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebCore/rendering/RenderSVGAllInOne.cpp b/WebCore/rendering/RenderSVGAllInOne.cpp
index 9c30d88..810ccce 100644
--- a/WebCore/rendering/RenderSVGAllInOne.cpp
+++ b/WebCore/rendering/RenderSVGAllInOne.cpp
@@ -30,8 +30,6 @@
#include "RenderSVGGradientStop.cpp"
#include "RenderSVGHiddenContainer.cpp"
#include "RenderSVGImage.cpp"
-#include "RenderSVGInline.cpp"
-#include "RenderSVGInlineText.cpp"
#include "RenderSVGModelObject.cpp"
#include "RenderSVGResource.cpp"
#include "RenderSVGResourceClipper.cpp"
@@ -47,24 +45,28 @@
#include "RenderSVGResourceSolidColor.cpp"
#include "RenderSVGRoot.cpp"
#include "RenderSVGShadowTreeRootContainer.cpp"
-#include "RenderSVGTSpan.cpp"
-#include "RenderSVGText.cpp"
-#include "RenderSVGTextPath.cpp"
#include "RenderSVGTransformableContainer.cpp"
#include "RenderSVGViewportContainer.cpp"
#include "SVGCharacterData.cpp"
#include "SVGCharacterLayoutInfo.cpp"
#include "SVGImageBufferTools.cpp"
-#include "SVGInlineFlowBox.cpp"
-#include "SVGInlineTextBox.cpp"
#include "SVGMarkerLayoutInfo.cpp"
#include "SVGRenderSupport.cpp"
#include "SVGRenderTreeAsText.cpp"
#include "SVGResources.cpp"
#include "SVGResourcesCache.cpp"
#include "SVGResourcesCycleSolver.cpp"
-#include "SVGRootInlineBox.cpp"
#include "SVGShadowTreeElements.cpp"
#include "SVGTextChunkLayoutInfo.cpp"
#include "SVGTextLayoutUtilities.cpp"
-#include "SVGTextQuery.cpp"
+
+// FIXME: As soon as all SVG renderers live in rendering/svg, this file should be moved there as well, removing the need for the svg/ includes below.
+#include "svg/RenderSVGInline.cpp"
+#include "svg/RenderSVGInlineText.cpp"
+#include "svg/RenderSVGTSpan.cpp"
+#include "svg/RenderSVGText.cpp"
+#include "svg/RenderSVGTextPath.cpp"
+#include "svg/SVGInlineFlowBox.cpp"
+#include "svg/SVGInlineTextBox.cpp"
+#include "svg/SVGRootInlineBox.cpp"
+#include "svg/SVGTextQuery.cpp"
diff --git a/WebCore/rendering/RenderSVGInline.cpp b/WebCore/rendering/svg/RenderSVGInline.cpp
similarity index 100%
rename from WebCore/rendering/RenderSVGInline.cpp
rename to WebCore/rendering/svg/RenderSVGInline.cpp
diff --git a/WebCore/rendering/RenderSVGInline.h b/WebCore/rendering/svg/RenderSVGInline.h
similarity index 100%
rename from WebCore/rendering/RenderSVGInline.h
rename to WebCore/rendering/svg/RenderSVGInline.h
diff --git a/WebCore/rendering/RenderSVGInlineText.cpp b/WebCore/rendering/svg/RenderSVGInlineText.cpp
similarity index 100%
rename from WebCore/rendering/RenderSVGInlineText.cpp
rename to WebCore/rendering/svg/RenderSVGInlineText.cpp
diff --git a/WebCore/rendering/RenderSVGInlineText.h b/WebCore/rendering/svg/RenderSVGInlineText.h
similarity index 100%
rename from WebCore/rendering/RenderSVGInlineText.h
rename to WebCore/rendering/svg/RenderSVGInlineText.h
diff --git a/WebCore/rendering/RenderSVGTSpan.cpp b/WebCore/rendering/svg/RenderSVGTSpan.cpp
similarity index 100%
rename from WebCore/rendering/RenderSVGTSpan.cpp
rename to WebCore/rendering/svg/RenderSVGTSpan.cpp
diff --git a/WebCore/rendering/RenderSVGTSpan.h b/WebCore/rendering/svg/RenderSVGTSpan.h
similarity index 100%
rename from WebCore/rendering/RenderSVGTSpan.h
rename to WebCore/rendering/svg/RenderSVGTSpan.h
diff --git a/WebCore/rendering/RenderSVGText.cpp b/WebCore/rendering/svg/RenderSVGText.cpp
similarity index 100%
rename from WebCore/rendering/RenderSVGText.cpp
rename to WebCore/rendering/svg/RenderSVGText.cpp
diff --git a/WebCore/rendering/RenderSVGText.h b/WebCore/rendering/svg/RenderSVGText.h
similarity index 100%
rename from WebCore/rendering/RenderSVGText.h
rename to WebCore/rendering/svg/RenderSVGText.h
diff --git a/WebCore/rendering/RenderSVGTextPath.cpp b/WebCore/rendering/svg/RenderSVGTextPath.cpp
similarity index 100%
rename from WebCore/rendering/RenderSVGTextPath.cpp
rename to WebCore/rendering/svg/RenderSVGTextPath.cpp
diff --git a/WebCore/rendering/RenderSVGTextPath.h b/WebCore/rendering/svg/RenderSVGTextPath.h
similarity index 100%
rename from WebCore/rendering/RenderSVGTextPath.h
rename to WebCore/rendering/svg/RenderSVGTextPath.h
diff --git a/WebCore/rendering/SVGInlineFlowBox.cpp b/WebCore/rendering/svg/SVGInlineFlowBox.cpp
similarity index 100%
rename from WebCore/rendering/SVGInlineFlowBox.cpp
rename to WebCore/rendering/svg/SVGInlineFlowBox.cpp
diff --git a/WebCore/rendering/SVGInlineFlowBox.h b/WebCore/rendering/svg/SVGInlineFlowBox.h
similarity index 100%
rename from WebCore/rendering/SVGInlineFlowBox.h
rename to WebCore/rendering/svg/SVGInlineFlowBox.h
diff --git a/WebCore/rendering/SVGInlineTextBox.cpp b/WebCore/rendering/svg/SVGInlineTextBox.cpp
similarity index 100%
rename from WebCore/rendering/SVGInlineTextBox.cpp
rename to WebCore/rendering/svg/SVGInlineTextBox.cpp
diff --git a/WebCore/rendering/SVGInlineTextBox.h b/WebCore/rendering/svg/SVGInlineTextBox.h
similarity index 100%
rename from WebCore/rendering/SVGInlineTextBox.h
rename to WebCore/rendering/svg/SVGInlineTextBox.h
diff --git a/WebCore/rendering/SVGRootInlineBox.cpp b/WebCore/rendering/svg/SVGRootInlineBox.cpp
similarity index 100%
rename from WebCore/rendering/SVGRootInlineBox.cpp
rename to WebCore/rendering/svg/SVGRootInlineBox.cpp
diff --git a/WebCore/rendering/SVGRootInlineBox.h b/WebCore/rendering/svg/SVGRootInlineBox.h
similarity index 100%
rename from WebCore/rendering/SVGRootInlineBox.h
rename to WebCore/rendering/svg/SVGRootInlineBox.h
diff --git a/WebCore/rendering/SVGTextQuery.cpp b/WebCore/rendering/svg/SVGTextQuery.cpp
similarity index 100%
rename from WebCore/rendering/SVGTextQuery.cpp
rename to WebCore/rendering/svg/SVGTextQuery.cpp
diff --git a/WebCore/rendering/SVGTextQuery.h b/WebCore/rendering/svg/SVGTextQuery.h
similarity index 100%
rename from WebCore/rendering/SVGTextQuery.h
rename to WebCore/rendering/svg/SVGTextQuery.h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list