Title: [221471] trunk/Source/WebCore
- Revision
- 221471
- Author
- achristen...@apple.com
- Date
- 2017-08-31 21:10:20 -0700 (Thu, 31 Aug 2017)
Log Message
Fix Windows build after r221422
https://bugs.webkit.org/show_bug.cgi?id=174924
* platform/text/win/LocaleWin.cpp:
(WebCore::LocaleWin::getLocaleInfoString):
StringVector is now the type that can be adopted by String::adopt.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (221470 => 221471)
--- trunk/Source/WebCore/ChangeLog 2017-09-01 03:05:39 UTC (rev 221470)
+++ trunk/Source/WebCore/ChangeLog 2017-09-01 04:10:20 UTC (rev 221471)
@@ -1,3 +1,12 @@
+2017-08-31 Alex Christensen <achristen...@webkit.org>
+
+ Fix Windows build after r221422
+ https://bugs.webkit.org/show_bug.cgi?id=174924
+
+ * platform/text/win/LocaleWin.cpp:
+ (WebCore::LocaleWin::getLocaleInfoString):
+ StringVector is now the type that can be adopted by String::adopt.
+
2017-08-31 Daniel Bates <daba...@apple.com>
Another attempt to fix the Apple Windows build following <https://trac.webkit.org/changeset/221459>
Modified: trunk/Source/WebCore/platform/text/win/LocaleWin.cpp (221470 => 221471)
--- trunk/Source/WebCore/platform/text/win/LocaleWin.cpp 2017-09-01 03:05:39 UTC (rev 221470)
+++ trunk/Source/WebCore/platform/text/win/LocaleWin.cpp 2017-09-01 04:10:20 UTC (rev 221471)
@@ -98,7 +98,7 @@
int bufferSizeWithNUL = ::GetLocaleInfo(m_lcid, type, 0, 0);
if (bufferSizeWithNUL <= 0)
return String();
- Vector<UChar> buffer(bufferSizeWithNUL);
+ StringVector<UChar> buffer(bufferSizeWithNUL);
::GetLocaleInfo(m_lcid, type, buffer.data(), bufferSizeWithNUL);
buffer.shrink(bufferSizeWithNUL - 1);
return String::adopt(WTFMove(buffer));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
