Title: [223544] releases/WebKitGTK/webkit-2.18/Source/WebKit
- Revision
- 223544
- Author
- [email protected]
- Date
- 2017-10-17 07:29:45 -0700 (Tue, 17 Oct 2017)
Log Message
Merge r220585 - [WPE] Build failure with Clang 4.0.1: no matching conversion for functional-style cast from 'pointer' (aka 'unsigned short *') to 'WTF::String'
https://bugs.webkit.org/show_bug.cgi?id=175477
Reviewed by Žan Doberšek.
* Shared/wpe/WebEventFactory.cpp:
(WebKit::singleCharacterStringForKeyEvent): Cast to UChar* to make
compiler choose the correct WTF::String constructor.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (223543 => 223544)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-10-17 14:27:39 UTC (rev 223543)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-10-17 14:29:45 UTC (rev 223544)
@@ -1,3 +1,14 @@
+2017-08-11 Adrian Perez de Castro <[email protected]>
+
+ [WPE] Build failure with Clang 4.0.1: no matching conversion for functional-style cast from 'pointer' (aka 'unsigned short *') to 'WTF::String'
+ https://bugs.webkit.org/show_bug.cgi?id=175477
+
+ Reviewed by Žan Doberšek.
+
+ * Shared/wpe/WebEventFactory.cpp:
+ (WebKit::singleCharacterStringForKeyEvent): Cast to UChar* to make
+ compiler choose the correct WTF::String constructor.
+
2017-10-10 Michael Catanzaro <[email protected]>
CSS constant properties should not be enabled by default
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/wpe/WebEventFactory.cpp (223543 => 223544)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/wpe/WebEventFactory.cpp 2017-10-17 14:27:39 UTC (rev 223543)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/wpe/WebEventFactory.cpp 2017-10-17 14:29:45 UTC (rev 223544)
@@ -59,7 +59,7 @@
glong length;
GUniquePtr<gunichar2> uchar16(g_ucs4_to_utf16(&event->unicode, 1, 0, &length, nullptr));
if (uchar16)
- return String(uchar16.get());
+ return String(reinterpret_cast<UChar*>(uchar16.get()), length);
return String();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
