Fix compilation against Qt 4.4 and one missing SVG_FONTS #ifdef.
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Mar 2008 22:14:08 +0000 (22:14 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Mar 2008 22:14:08 +0000 (22:14 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@31376 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/bindings/js/JSSVGElementWrapperFactory.cpp
WebCore/platform/graphics/qt/FontQt.cpp

index 8813ca7..10f536b 100644 (file)
@@ -1,5 +1,14 @@
 2008-03-27  Simon Hausmann  <hausmann@webkit.org>
 
+        Fix compilation against Qt 4.4 and one missing SVG_FONTS #ifdef.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::floatWidth): Forgot to adjust this signture for Qt 4.4.
+        * bindings/js/JSSVGElementWrapperFactory.cpp: Added a missing #ifdef
+        for SVG_FONTS
+
+2008-03-27  Simon Hausmann  <hausmann@webkit.org>
+
         Reviewed by Eric Seidel.
 
         Fix the Qt build and the build without ENABLE(SVG_FONTS)
index 511b8e2..ff583cf 100644 (file)
@@ -23,7 +23,9 @@
 #include "JSSVGElementWrapperFactory.h"
 
 #include "JSSVGAElement.h"
+#if ENABLE(SVG_FONTS)
 #include "JSSVGAltGlyphElement.h"
+#endif
 #include "JSSVGAnimateColorElement.h"
 #include "JSSVGAnimateElement.h"
 #include "JSSVGAnimateTransformElement.h"
index 56ac8c7..51a2b09 100644 (file)
@@ -178,9 +178,10 @@ float Font::floatWidth(const TextRun& run) const
     return width(run);
 }
 
-float Font::floatWidth(const TextRun& run, int /*extraCharsAvailable*/, int& charsConsumed) const
+float Font::floatWidth(const TextRun& run, int /*extraCharsAvailable*/, int& charsConsumed, String& glyphName) const
 {
     charsConsumed = run.length();
+    glyphName = "";
     return width(run);
 }