diff options
Diffstat (limited to 'Source/WebKit/win/WebKitGraphics.cpp')
| -rw-r--r-- | Source/WebKit/win/WebKitGraphics.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebKit/win/WebKitGraphics.cpp b/Source/WebKit/win/WebKitGraphics.cpp index 5343608..1907050 100644 --- a/Source/WebKit/win/WebKitGraphics.cpp +++ b/Source/WebKit/win/WebKitGraphics.cpp @@ -32,7 +32,6 @@ #include "WebPreferences.h" #pragma warning(push, 0) -#include <WebCore/CharacterNames.h> #include <WebCore/Font.h> #include <WebCore/FontDescription.h> #include <WebCore/FontSelector.h> @@ -40,6 +39,7 @@ #include <WebCore/PlatformString.h> #include <WebCore/StringTruncator.h> #include <WebCore/WebCoreTextRenderer.h> +#include <wtf/unicode/CharacterNames.h> #include <CoreGraphics/CoreGraphics.h> #pragma warning(pop) @@ -105,7 +105,7 @@ void WebDrawText(WebTextRenderInfo* info) GraphicsContext context(info->cgContext); String drawString(info->text, info->length); if (info->drawAsPassword) - drawString = drawString.impl()->secure(WebCore::bullet); + drawString = drawString.impl()->secure(WTF::Unicode::bullet); context.save(); @@ -133,15 +133,16 @@ void FontMetrics(const WebFontDescription& description, int* ascent, int* descen return; Font font(makeFont(description)); + const WebCore::FontMetrics& fontMetrics(font.fontMetrics()); if (ascent) - *ascent = font.ascent(); + *ascent = fontMetrics.ascent(); if (descent) - *descent = font.descent(); + *descent = fontMetrics.descent(); if (lineSpacing) - *lineSpacing = font.lineSpacing(); + *lineSpacing = fontMetrics.lineSpacing(); } unsigned CenterTruncateStringToWidth(LPCTSTR text, int length, const WebFontDescription& description, float width, WCHAR* buffer) |