Changeset 31376 in webkit

Timestamp:

Mar 27, 2008 3:14:08 PM (16 years ago)

Author:

Simon Hausmann

Message:

Fix compilation against Qt 4.4 and one missing SVG_FONTS #ifdef.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSSVGElementWrapperFactory.cpp (modified) (1 diff)
• platform/graphics/qt/FontQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/bindings/js/JSSVGElementWrapperFactory.cpp

@@ -24 +24 @@
 
 #include "JSSVGAElement.h"
+#if ENABLE(SVG_FONTS)
 #include "JSSVGAltGlyphElement.h"
+#endif
 #include "JSSVGAnimateColorElement.h"
 #include "JSSVGAnimateElement.h"

trunk/WebCore/platform/graphics/qt/FontQt.cpp

@@ -179 +179 @@
 }
 
-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);
 }