Title: [108220] releases/WebKitGTK/webkit-1.8/Source/WebCore
Diff
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (108219 => 108220)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-02-20 08:40:40 UTC (rev 108219)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-02-20 08:45:21 UTC (rev 108220)
@@ -1,3 +1,18 @@
+2012-02-20 Kalev Lember <[email protected]>
+
+ [GTK] Fix build on platforms where UChar is wchar_t
+ https://bugs.webkit.org/show_bug.cgi?id=78996
+
+ Reviewed by Martin Robinson.
+
+ The ICU backend defines UChar as wchar_t for platforms where wchar_t is
+ 16 bits wide, e.g. win32.
+
+ * platform/graphics/pango/FontPango.cpp:
+ (WebCore::utf16ToUtf8): Use reinterpret_cast instead of static_cast.
+ * platform/gtk/GtkPopupMenu.cpp:
+ (WebCore::GtkPopupMenu::typeAheadFind): Ditto.
+
2012-02-20 Paweł Forysiuk <[email protected]>
[GTK] Can't find webinspector and error page redirection on Windows
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/pango/FontPango.cpp (108219 => 108220)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/pango/FontPango.cpp 2012-02-20 08:40:40 UTC (rev 108219)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/graphics/pango/FontPango.cpp 2012-02-20 08:45:21 UTC (rev 108220)
@@ -136,7 +136,7 @@
gchar* utf8Text;
glong itemsWritten;
- utf8Text = g_utf16_to_utf8(static_cast<const gunichar2*>(aText), aLength, 0, &itemsWritten, 0);
+ utf8Text = g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(aText), aLength, 0, &itemsWritten, 0);
length = itemsWritten;
return utf8Text;
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/gtk/GtkPopupMenu.cpp (108219 => 108220)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/gtk/GtkPopupMenu.cpp 2012-02-20 08:40:40 UTC (rev 108219)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/platform/gtk/GtkPopupMenu.cpp 2012-02-20 08:45:21 UTC (rev 108220)
@@ -178,9 +178,9 @@
// menulists.
bool repeatingCharacter = unicodeCharacter != m_previousKeyEventCharacter;
if (event->time - m_previousKeyEventTimestamp > gSearchTimeoutMs)
- m_currentSearchString = String(static_cast<UChar*>(utf16String.get()), charactersWritten);
+ m_currentSearchString = String(reinterpret_cast<UChar*>(utf16String.get()), charactersWritten);
else if (repeatingCharacter)
- m_currentSearchString.append(String(static_cast<UChar*>(utf16String.get()), charactersWritten));
+ m_currentSearchString.append(String(reinterpret_cast<UChar*>(utf16String.get()), charactersWritten));
m_previousKeyEventTimestamp = event->time;
m_previousKeyEventCharacter = unicodeCharacter;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
