Commit 613193b7 authored by hausmann@webkit.org's avatar hausmann@webkit.org

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


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@31376 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent af1cc00a
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.
......@@ -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"
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment