Skip to content
Permalink
Browse files
2011-05-24 Nikolas Zimmermann <nzimmermann@rim.com>
        Reviewed by Antti Koivisto.

        Remove platform layering violation: TextRun stores RenderObjects for SVG Fonts support
        https://bugs.webkit.org/show_bug.cgi?id=60254

        First part:
        Remove a long-standing layering violation in TextRun: it stores RenderObject/RenderSVGResource pointers for SVG Fonts support.
        Replace the two Render* pointers with a single RefPtr<AbstractRenderingContext>. AbstractRenderingContext is a helper class,
        that can be derived from in order to associate additional data with a TextRun. This effectively reduces the memory consumption of TextRun.

        Introduce rendering/TextRunRenderingContext.h, which inherits from TextRun::AbstractRenderingContext and holds additional data.
        If the primary font in use is a SVG Font then allocate a TextRunRenderingContext object and store it in the RefPtr<AbstractRenderingContext>
        in TextRun. If the primary font is not a SVG Font, don't even allocate the TextRunRenderingContext structure, as we won't need the context data.
        SVG Fonts glyph matching only works within a context, so we need access to the RenderObject that's drawing the text.

        This is the main preparation patch for the SVG Fonts rewrite, that will allow us to share the simple text code path for SVG Fonts as well,
        making all CSS text properties work for HTML text using SVG Fonts, and allows proper integration within the GlyphPage concept. Soon
        we can intermix WOFF/SVG & native fonts, within segment font declarations.

        Second part:
        Remove a long-standing layering violation in SimpleFontData: it stores SVGFontData objects, that are living in svg/.
        Use the same concept as above, introduce SimpleFontData::AbstractFontData, and let SVGFontData inherit from AbstractFontData and extent it.
        If SVG Fonts are used, CSSFontFaceSource will create a SVGFontData object and pass it as PassOwnPtr<AbstractFontData> to SimpleFontData.

        All layering violations are gone now, SVG Fonts are cleanly integrated now.
        Doesn't affect any tests yet, refactoring only.

        * CMakeLists.txt:
        * GNUmakefile.list.am:
        * WebCore.gypi:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * css/CSSFontFaceSource.cpp:
        (WebCore::CSSFontFaceSource::getFontData):
        * platform/graphics/Font.cpp:
        (WebCore::Font::drawText):
        (WebCore::Font::width):
        (WebCore::Font::selectionRectForText):
        (WebCore::Font::offsetForPosition):
        * platform/graphics/Font.h:
        * platform/graphics/SimpleFontData.cpp:
        (WebCore::SimpleFontData::SimpleFontData):
        (WebCore::SimpleFontData::~SimpleFontData):
        * platform/graphics/SimpleFontData.h:
        (WebCore::SimpleFontData::FontData::~FontData):
        (WebCore::SimpleFontData::fontMetrics):
        (WebCore::SimpleFontData::setMaxCharWidth):
        (WebCore::SimpleFontData::setAvgCharWidth):
        (WebCore::SimpleFontData::setSpaceWidth):
        (WebCore::SimpleFontData::setSpaceGlyph):
        (WebCore::SimpleFontData::setZeroWidthSpaceGlyph):
        (WebCore::SimpleFontData::fontData):
        (WebCore::SimpleFontData::isSVGFont):
        (WebCore::SimpleFontData::setMissingGlyphData):
        * platform/graphics/TextRun.h:
        (WebCore::TextRun::TextRun):
        (WebCore::TextRun::setAllowTabs):
        (WebCore::TextRun::setXPos):
        (WebCore::TextRun::RenderingContext::~RenderingContext):
        (WebCore::TextRun::renderingContext):
        (WebCore::TextRun::setRenderingContext):
        * rendering/EllipsisBox.cpp:
        (WebCore::EllipsisBox::paint):
        (WebCore::EllipsisBox::selectionRect):
        (WebCore::EllipsisBox::paintSelection):
        * rendering/InlineTextBox.cpp:
        (WebCore::InlineTextBox::selectionRect):
        (WebCore::InlineTextBox::paint):
        (WebCore::InlineTextBox::paintSelection):
        (WebCore::InlineTextBox::paintCompositionBackground):
        (WebCore::InlineTextBox::paintSpellingOrGrammarMarker):
        (WebCore::InlineTextBox::paintTextMatchMarker):
        (WebCore::InlineTextBox::computeRectForReplacementMarker):
        (WebCore::InlineTextBox::offsetForPosition):
        (WebCore::InlineTextBox::positionForOffset):
        (WebCore::InlineTextBox::constructTextRun):
        * rendering/InlineTextBox.h:
        * rendering/RenderBlock.cpp:
        (WebCore::stripTrailingSpace):
        (WebCore::RenderBlock::constructTextRun):
        * rendering/RenderBlock.h:
        * rendering/RenderBlockLineLayout.cpp:
        (WebCore::setLogicalWidthForTextRun):
        (WebCore::textWidth):
        (WebCore::tryHyphenating):
        (WebCore::RenderBlock::LineBreaker::nextLineBreak):
        (WebCore::RenderBlock::checkLinesForTextOverflow):
        * rendering/RenderCombineText.cpp:
        (WebCore::RenderCombineText::combineText):
        * rendering/RenderFileUploadControl.cpp:
        (WebCore::RenderFileUploadControl::paintObject):
        (WebCore::RenderFileUploadControl::computePreferredLogicalWidths):
        * rendering/RenderFlexibleBox.cpp:
        (WebCore::RenderFlexibleBox::applyLineClamp):
        * rendering/RenderImage.cpp:
        (WebCore::RenderImage::setImageSizeForAltText):
        (WebCore::RenderImage::paintReplaced):
        * rendering/RenderListBox.cpp:
        (WebCore::RenderListBox::updateFromElement):
        * rendering/RenderListMarker.cpp:
        (WebCore::RenderListMarker::paint):
        (WebCore::RenderListMarker::computePreferredLogicalWidths):
        (WebCore::RenderListMarker::getRelativeMarkerRect):
        * rendering/RenderText.cpp:
        (WebCore::RenderText::widthFromCache):
        (WebCore::RenderText::trimmedPrefWidths):
        (WebCore::RenderText::computePreferredLogicalWidths):
        (WebCore::RenderText::width):
        * rendering/RenderTextControl.cpp:
        (WebCore::RenderTextControl::getAvgCharWidth):
        * rendering/svg/RenderSVGAllInOne.cpp:
        * rendering/svg/SVGInlineTextBox.cpp:
        (WebCore::SVGInlineTextBox::offsetForPositionInFragment):
        (WebCore::SVGInlineTextBox::prepareGraphicsContextForTextPainting):
        (WebCore::SVGInlineTextBox::restoreGraphicsContextAfterTextPainting):
        (WebCore::SVGInlineTextBox::constructTextRun):
        (WebCore::SVGInlineTextBox::paintText):
        * rendering/svg/SVGTextLayoutEngineSpacing.cpp:
        (WebCore::SVGTextLayoutEngineSpacing::calculateSVGKerning):
        * rendering/svg/SVGTextMetrics.cpp:
        (WebCore::constructTextRun):
        (WebCore::SVGTextMetrics::measureCharacterRange):
        * rendering/svg/SVGTextRunRenderingContext.cpp: Copied from svg/SVGFont.cpp.
        (WebCore::svgFontAndFontFaceElementForFontData):
        (WebCore::firstParentRendererForNonTextNode):
        (WebCore::referencingRenderObjectFromRun):
        (WebCore::activePaintingResourceFromRun):
        (WebCore::SVGTextRunWalker::walk):
        (WebCore::floatWidthMissingGlyphCallback):
        (WebCore::floatWidthOfSubStringUsingSVGFont):
        (WebCore::SVGTextRunRenderingContext::floatWidthUsingSVGFont):
        (WebCore::SVGTextRunRenderingContext::drawTextUsingSVGFont):
        (WebCore::SVGTextRunRenderingContext::selectionRectForTextUsingSVGFont):
        (WebCore::SVGTextRunRenderingContext::offsetForPositionForTextUsingSVGFont):
        * rendering/svg/SVGTextRunRenderingContext.h: Added.
        (WebCore::SVGTextRunRenderingContext::create):
        (WebCore::SVGTextRunRenderingContext::context):
        (WebCore::SVGTextRunRenderingContext::activePaintingResource):
        (WebCore::SVGTextRunRenderingContext::setActivePaintingResource):
        (WebCore::SVGTextRunRenderingContext::SVGTextRunRenderingContext):
        (WebCore::textRunNeedsRenderingContext):
        * svg/SVGAllInOne.cpp:
        * svg/SVGFont.cpp: Removed.
        * svg/SVGFontData.cpp:
        (WebCore::SVGFontData::initializeFontData):
        * svg/SVGFontData.h:
        (WebCore::SVGFontData::create):
        (WebCore::SVGFontData::isSVGFontData):
        * svg/SVGGlyphElement.cpp:
        (WebCore::SVGGlyphElement::SVGGlyphElement):
        (WebCore::SVGGlyphElement::buildGenericGlyphIdentifier):
        (WebCore::SVGGlyphElement::buildGlyphIdentifier):
        * svg/SVGHKernElement.cpp:
        (WebCore::SVGHKernElement::SVGHKernElement):
        (WebCore::SVGHKernElement::buildHorizontalKerningPair):
        * svg/SVGVKernElement.cpp:
        (WebCore::SVGVKernElement::SVGVKernElement):
        (WebCore::SVGVKernElement::buildVerticalKerningPair):
        * svg/SVGVKernElement.h:


Canonical link: https://commits.webkit.org/76732@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@87152 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Nikolas Zimmermann committed May 24, 2011
1 parent acf4f3a commit 5202168cdc9c74259f4ef8d592653b911c4ef1ed
Showing with 693 additions and 368 deletions.
  1. +1 −1 Source/WebCore/CMakeLists.txt
  2. +163 −0 Source/WebCore/ChangeLog
  3. +2 −1 Source/WebCore/GNUmakefile.list.am
  4. +2 −1 Source/WebCore/WebCore.gypi
  5. +2 −1 Source/WebCore/WebCore.pro
  6. +56 −0 Source/WebCore/WebCore.vcproj/WebCore.vcproj
  7. +7 −5 Source/WebCore/WebCore.xcodeproj/project.pbxproj
  8. +2 −2 Source/WebCore/css/CSSFontFaceSource.cpp
  9. +13 −20 Source/WebCore/platform/graphics/Font.cpp
  10. +0 −14 Source/WebCore/platform/graphics/Font.h
  11. +4 −57 Source/WebCore/platform/graphics/SimpleFontData.cpp
  12. +25 −15 Source/WebCore/platform/graphics/SimpleFontData.h
  13. +23 −21 Source/WebCore/platform/graphics/TextRun.h
  14. +6 −5 Source/WebCore/rendering/EllipsisBox.cpp
  15. +24 −21 Source/WebCore/rendering/InlineTextBox.cpp
  16. +2 −2 Source/WebCore/rendering/InlineTextBox.h
  17. +10 −7 Source/WebCore/rendering/RenderBlock.cpp
  18. +6 −2 Source/WebCore/rendering/RenderBlock.h
  19. +17 −11 Source/WebCore/rendering/RenderBlockLineLayout.cpp
  20. +2 −2 Source/WebCore/rendering/RenderCombineText.cpp
  21. +6 −4 Source/WebCore/rendering/RenderFileUploadControl.cpp
  22. +2 −3 Source/WebCore/rendering/RenderFlexibleBox.cpp
  23. +2 −3 Source/WebCore/rendering/RenderImage.cpp
  24. +1 −2 Source/WebCore/rendering/RenderListBox.cpp
  25. +11 −12 Source/WebCore/rendering/RenderListMarker.cpp
  26. +18 −8 Source/WebCore/rendering/RenderText.cpp
  27. +2 −2 Source/WebCore/rendering/RenderTextControl.cpp
  28. +1 −0 Source/WebCore/rendering/svg/RenderSVGAllInOne.cpp
  29. +17 −11 Source/WebCore/rendering/svg/SVGInlineTextBox.cpp
  30. +16 −3 Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp
  31. +4 −6 Source/WebCore/rendering/svg/SVGTextMetrics.cpp
  32. +78 −85 Source/WebCore/{svg/SVGFont.cpp → rendering/svg/SVGTextRunRenderingContext.cpp}
  33. +77 −0 Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h
  34. +0 −1 Source/WebCore/svg/SVGAllInOne.cpp
  35. +58 −0 Source/WebCore/svg/SVGFontData.cpp
  36. +12 −3 Source/WebCore/svg/SVGFontData.h
  37. +9 −13 Source/WebCore/svg/SVGGlyphElement.cpp
  38. +6 −11 Source/WebCore/svg/SVGHKernElement.cpp
  39. +6 −11 Source/WebCore/svg/SVGVKernElement.cpp
  40. +0 −2 Source/WebCore/svg/SVGVKernElement.h
@@ -1617,6 +1617,7 @@ IF (ENABLE_SVG)
rendering/svg/SVGTextLayoutEngine.cpp
rendering/svg/SVGTextLayoutEngineBaseline.cpp
rendering/svg/SVGTextLayoutEngineSpacing.cpp
rendering/svg/SVGTextRunRenderingContext.cpp
rendering/svg/SVGTextMetrics.cpp
rendering/svg/SVGTextQuery.cpp
svg/ColorDistance.cpp
@@ -1671,7 +1672,6 @@ IF (ENABLE_SVG)
svg/SVGFilterElement.cpp
svg/SVGFilterPrimitiveStandardAttributes.cpp
svg/SVGFitToViewBox.cpp
svg/SVGFont.cpp
svg/SVGFontData.cpp
svg/SVGFontElement.cpp
svg/SVGFontFaceElement.cpp
@@ -1,3 +1,166 @@
2011-05-24 Nikolas Zimmermann <nzimmermann@rim.com>

Reviewed by Antti Koivisto.

Remove platform layering violation: TextRun stores RenderObjects for SVG Fonts support
https://bugs.webkit.org/show_bug.cgi?id=60254

First part:
Remove a long-standing layering violation in TextRun: it stores RenderObject/RenderSVGResource pointers for SVG Fonts support.
Replace the two Render* pointers with a single RefPtr<AbstractRenderingContext>. AbstractRenderingContext is a helper class,
that can be derived from in order to associate additional data with a TextRun. This effectively reduces the memory consumption of TextRun.

Introduce rendering/TextRunRenderingContext.h, which inherits from TextRun::AbstractRenderingContext and holds additional data.
If the primary font in use is a SVG Font then allocate a TextRunRenderingContext object and store it in the RefPtr<AbstractRenderingContext>
in TextRun. If the primary font is not a SVG Font, don't even allocate the TextRunRenderingContext structure, as we won't need the context data.
SVG Fonts glyph matching only works within a context, so we need access to the RenderObject that's drawing the text.

This is the main preparation patch for the SVG Fonts rewrite, that will allow us to share the simple text code path for SVG Fonts as well,
making all CSS text properties work for HTML text using SVG Fonts, and allows proper integration within the GlyphPage concept. Soon
we can intermix WOFF/SVG & native fonts, within segment font declarations.

Second part:
Remove a long-standing layering violation in SimpleFontData: it stores SVGFontData objects, that are living in svg/.
Use the same concept as above, introduce SimpleFontData::AbstractFontData, and let SVGFontData inherit from AbstractFontData and extent it.
If SVG Fonts are used, CSSFontFaceSource will create a SVGFontData object and pass it as PassOwnPtr<AbstractFontData> to SimpleFontData.

All layering violations are gone now, SVG Fonts are cleanly integrated now.
Doesn't affect any tests yet, refactoring only.

* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::getFontData):
* platform/graphics/Font.cpp:
(WebCore::Font::drawText):
(WebCore::Font::width):
(WebCore::Font::selectionRectForText):
(WebCore::Font::offsetForPosition):
* platform/graphics/Font.h:
* platform/graphics/SimpleFontData.cpp:
(WebCore::SimpleFontData::SimpleFontData):
(WebCore::SimpleFontData::~SimpleFontData):
* platform/graphics/SimpleFontData.h:
(WebCore::SimpleFontData::FontData::~FontData):
(WebCore::SimpleFontData::fontMetrics):
(WebCore::SimpleFontData::setMaxCharWidth):
(WebCore::SimpleFontData::setAvgCharWidth):
(WebCore::SimpleFontData::setSpaceWidth):
(WebCore::SimpleFontData::setSpaceGlyph):
(WebCore::SimpleFontData::setZeroWidthSpaceGlyph):
(WebCore::SimpleFontData::fontData):
(WebCore::SimpleFontData::isSVGFont):
(WebCore::SimpleFontData::setMissingGlyphData):
* platform/graphics/TextRun.h:
(WebCore::TextRun::TextRun):
(WebCore::TextRun::setAllowTabs):
(WebCore::TextRun::setXPos):
(WebCore::TextRun::RenderingContext::~RenderingContext):
(WebCore::TextRun::renderingContext):
(WebCore::TextRun::setRenderingContext):
* rendering/EllipsisBox.cpp:
(WebCore::EllipsisBox::paint):
(WebCore::EllipsisBox::selectionRect):
(WebCore::EllipsisBox::paintSelection):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::selectionRect):
(WebCore::InlineTextBox::paint):
(WebCore::InlineTextBox::paintSelection):
(WebCore::InlineTextBox::paintCompositionBackground):
(WebCore::InlineTextBox::paintSpellingOrGrammarMarker):
(WebCore::InlineTextBox::paintTextMatchMarker):
(WebCore::InlineTextBox::computeRectForReplacementMarker):
(WebCore::InlineTextBox::offsetForPosition):
(WebCore::InlineTextBox::positionForOffset):
(WebCore::InlineTextBox::constructTextRun):
* rendering/InlineTextBox.h:
* rendering/RenderBlock.cpp:
(WebCore::stripTrailingSpace):
(WebCore::RenderBlock::constructTextRun):
* rendering/RenderBlock.h:
* rendering/RenderBlockLineLayout.cpp:
(WebCore::setLogicalWidthForTextRun):
(WebCore::textWidth):
(WebCore::tryHyphenating):
(WebCore::RenderBlock::LineBreaker::nextLineBreak):
(WebCore::RenderBlock::checkLinesForTextOverflow):
* rendering/RenderCombineText.cpp:
(WebCore::RenderCombineText::combineText):
* rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::paintObject):
(WebCore::RenderFileUploadControl::computePreferredLogicalWidths):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::applyLineClamp):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::setImageSizeForAltText):
(WebCore::RenderImage::paintReplaced):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::updateFromElement):
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::paint):
(WebCore::RenderListMarker::computePreferredLogicalWidths):
(WebCore::RenderListMarker::getRelativeMarkerRect):
* rendering/RenderText.cpp:
(WebCore::RenderText::widthFromCache):
(WebCore::RenderText::trimmedPrefWidths):
(WebCore::RenderText::computePreferredLogicalWidths):
(WebCore::RenderText::width):
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::getAvgCharWidth):
* rendering/svg/RenderSVGAllInOne.cpp:
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::offsetForPositionInFragment):
(WebCore::SVGInlineTextBox::prepareGraphicsContextForTextPainting):
(WebCore::SVGInlineTextBox::restoreGraphicsContextAfterTextPainting):
(WebCore::SVGInlineTextBox::constructTextRun):
(WebCore::SVGInlineTextBox::paintText):
* rendering/svg/SVGTextLayoutEngineSpacing.cpp:
(WebCore::SVGTextLayoutEngineSpacing::calculateSVGKerning):
* rendering/svg/SVGTextMetrics.cpp:
(WebCore::constructTextRun):
(WebCore::SVGTextMetrics::measureCharacterRange):
* rendering/svg/SVGTextRunRenderingContext.cpp: Copied from svg/SVGFont.cpp.
(WebCore::svgFontAndFontFaceElementForFontData):
(WebCore::firstParentRendererForNonTextNode):
(WebCore::referencingRenderObjectFromRun):
(WebCore::activePaintingResourceFromRun):
(WebCore::SVGTextRunWalker::walk):
(WebCore::floatWidthMissingGlyphCallback):
(WebCore::floatWidthOfSubStringUsingSVGFont):
(WebCore::SVGTextRunRenderingContext::floatWidthUsingSVGFont):
(WebCore::SVGTextRunRenderingContext::drawTextUsingSVGFont):
(WebCore::SVGTextRunRenderingContext::selectionRectForTextUsingSVGFont):
(WebCore::SVGTextRunRenderingContext::offsetForPositionForTextUsingSVGFont):
* rendering/svg/SVGTextRunRenderingContext.h: Added.
(WebCore::SVGTextRunRenderingContext::create):
(WebCore::SVGTextRunRenderingContext::context):
(WebCore::SVGTextRunRenderingContext::activePaintingResource):
(WebCore::SVGTextRunRenderingContext::setActivePaintingResource):
(WebCore::SVGTextRunRenderingContext::SVGTextRunRenderingContext):
(WebCore::textRunNeedsRenderingContext):
* svg/SVGAllInOne.cpp:
* svg/SVGFont.cpp: Removed.
* svg/SVGFontData.cpp:
(WebCore::SVGFontData::initializeFontData):
* svg/SVGFontData.h:
(WebCore::SVGFontData::create):
(WebCore::SVGFontData::isSVGFontData):
* svg/SVGGlyphElement.cpp:
(WebCore::SVGGlyphElement::SVGGlyphElement):
(WebCore::SVGGlyphElement::buildGenericGlyphIdentifier):
(WebCore::SVGGlyphElement::buildGlyphIdentifier):
* svg/SVGHKernElement.cpp:
(WebCore::SVGHKernElement::SVGHKernElement):
(WebCore::SVGHKernElement::buildHorizontalKerningPair):
* svg/SVGVKernElement.cpp:
(WebCore::SVGVKernElement::SVGVKernElement):
(WebCore::SVGVKernElement::buildVerticalKerningPair):
* svg/SVGVKernElement.h:

2011-05-24 Ryuan Choi <ryuan.choi@samsung.com>

Reviewed by Andreas Kling.
@@ -3091,6 +3091,8 @@ webcore_sources += \
Source/WebCore/rendering/svg/SVGTextMetrics.h \
Source/WebCore/rendering/svg/SVGTextQuery.cpp \
Source/WebCore/rendering/svg/SVGTextQuery.h \
Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp \
Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h \
Source/WebCore/rendering/TableLayout.h \
Source/WebCore/rendering/TrailingFloatsRootInlineBox.h \
Source/WebCore/rendering/TransformState.cpp \
@@ -3388,7 +3390,6 @@ webcore_sources += \
Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h \
Source/WebCore/svg/SVGFitToViewBox.cpp \
Source/WebCore/svg/SVGFitToViewBox.h \
Source/WebCore/svg/SVGFont.cpp \
Source/WebCore/svg/SVGFontData.cpp \
Source/WebCore/svg/SVGFontData.h \
Source/WebCore/svg/SVGFontElement.cpp \
@@ -5482,6 +5482,8 @@
'rendering/svg/SVGTextMetrics.h',
'rendering/svg/SVGTextQuery.cpp',
'rendering/svg/SVGTextQuery.h',
'rendering/svg/SVGTextRunRenderingContext.cpp',
'rendering/svg/SVGTextRunRenderingContext.h',
'storage/AbstractDatabase.cpp',
'storage/ChangeVersionWrapper.cpp',
'storage/ChangeVersionWrapper.h',
@@ -5733,7 +5735,6 @@
'svg/SVGFilterPrimitiveStandardAttributes.h',
'svg/SVGFitToViewBox.cpp',
'svg/SVGFitToViewBox.h',
'svg/SVGFont.cpp',
'svg/SVGFontData.cpp',
'svg/SVGFontData.h',
'svg/SVGFontElement.cpp',
@@ -2252,6 +2252,7 @@ HEADERS += \
rendering/svg/SVGTextLayoutEngineSpacing.h \
rendering/svg/SVGTextMetrics.h \
rendering/svg/SVGTextQuery.h \
rendering/svg/SVGTextRunRenderingContext.h \
rendering/TransformState.h \
svg/animation/SMILTimeContainer.h \
svg/animation/SMILTime.h \
@@ -3208,6 +3209,7 @@ contains(DEFINES, ENABLE_SVG=1) {
rendering/svg/SVGTextLayoutEngineSpacing.cpp \
rendering/svg/SVGTextMetrics.cpp \
rendering/svg/SVGTextQuery.cpp \
rendering/svg/SVGTextRunRenderingContext.cpp \
svg/SVGDocumentExtensions.cpp \
svg/SVGImageLoader.cpp \
svg/ColorDistance.cpp \
@@ -3261,7 +3263,6 @@ contains(DEFINES, ENABLE_SVG=1) {
svg/SVGFilterElement.cpp \
svg/SVGFilterPrimitiveStandardAttributes.cpp \
svg/SVGFitToViewBox.cpp \
svg/SVGFont.cpp \
svg/SVGFontData.cpp \
svg/SVGFontElement.cpp \
svg/SVGFontFaceElement.cpp \
@@ -41526,6 +41526,62 @@
RelativePath="..\rendering\svg\SVGTextQuery.h"
>
</File>
<File
RelativePath="..\rendering\svg\SVGTextRunRenderingContext.cpp"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_Cairo_CFLite|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_Cairo_CFLite|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_All|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Production|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\rendering\svg\SVGTextRunRenderingContext.h"
>
</File>
</Filter>
</Filter>
<Filter

0 comments on commit 5202168

Please sign in to comment.