2008-03-27 Maciej Stachowiak <mjs@apple.com>

        Rubber stamped by Oliver.

        - re-fix Acid3, some code was incorrectly moved when fixing the Qt build

        * rendering/SVGRootInlineBox.cpp:
        (WebCore::SVGRootInlineBox::buildLayoutInformationForTextBox):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 10f536b49e523d3d87025744a672190c492e768e..1aa7e29de6941aea4a5b2b600055e9b943152420 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-27  Maciej Stachowiak  <mjs@apple.com>
+
+        Rubber stamped by Oliver.
+
+        - re-fix Acid3, some code was incorrectly moved when fixing the Qt build
+
+        * rendering/SVGRootInlineBox.cpp:
+        (WebCore::SVGRootInlineBox::buildLayoutInformationForTextBox):
+
 2008-03-27  Simon Hausmann  <hausmann@webkit.org>
 
         Fix compilation against Qt 4.4 and one missing SVG_FONTS #ifdef.

diff --git a/WebCore/rendering/SVGRootInlineBox.cpp b/WebCore/rendering/SVGRootInlineBox.cpp
index 2b6ce8561aec0a53897d7a866931d27b14b65b90..ca60ba7803001c4800346db04239b590295acc22 100644 (file)
--- a/WebCore/rendering/SVGRootInlineBox.cpp
+++ b/WebCore/rendering/SVGRootInlineBox.cpp
@@ -1306,7 +1306,6 @@ void SVGRootInlineBox::buildLayoutInformationForTextBox(SVGCharacterLayoutInfo&
         }
 
         double kerning = 0.0;
-        lastGlyph.isValid = false;
 #if ENABLE(SVG_FONTS)
         SVGFontElement* svgFont = 0;
         if (style->font().isSVGFont())
@@ -1322,7 +1321,8 @@ void SVGRootInlineBox::buildLayoutInformationForTextBox(SVGCharacterLayoutInfo&
             lastGlyph.unicode = unicodeStr;
             lastGlyph.glyphName = glyphName;
             lastGlyph.isValid = true;
-        }
+        } else
+            lastGlyph.isValid = false;
 #endif
 
         svgChar.x -= (float)kerning;