[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
beidson at apple.com
beidson at apple.com
Mon Feb 21 00:28:18 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 043ceedc0e99f9c7bb7604143e3ca04dcf7d2808
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 31 22:59:13 2011 +0000
Fix the clean Windows build.
Reviewed by Adam Roben.
* WebKitGraphics.cpp:
(WebDrawText):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77164 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 1cb37aa..92afffe 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-31 Brady Eidson <beidson at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Fix the clean Windows build.
+
+ * WebKitGraphics.cpp:
+ (WebDrawText):
+
2011-01-28 Jon Honeycutt <jhoneycutt at apple.com>
Downloads in WK2 on Windows should write resume data to bundle
diff --git a/Source/WebKit/win/WebKitGraphics.cpp b/Source/WebKit/win/WebKitGraphics.cpp
index 16a3950..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();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list