Title: [118694] branches/safari-536-branch/Source/WebCore
- Revision
- 118694
- Author
- lforsch...@apple.com
- Date
- 2012-05-28 09:54:29 -0700 (Mon, 28 May 2012)
Log Message
Merged r118399 -> <rdar://problem/11527190>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (118693 => 118694)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-28 16:52:48 UTC (rev 118693)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-28 16:54:29 UTC (rev 118694)
@@ -1,5 +1,21 @@
2012-05-28 Lucas Forschler <lforsch...@apple.com>
+ Merge 118399
+
+ 2012-05-24 Jessie Berlin <jber...@apple.com>
+
+ REGRESSION(r109663) All the the dom/html/level2/html/HTMLFrameElement* tests crash on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=87410
+
+ Reviewed by Anders Carlsson.
+
+ Do not pass a reference type to va_start (see r75435).
+
+ * platform/LocalizedStrings.cpp:
+ (WebCore::formatLocalizedString):
+
+2012-05-28 Lucas Forschler <lforsch...@apple.com>
+
Merge 118397
2012-05-24 Alexey Proskuryakov <a...@apple.com>
Modified: branches/safari-536-branch/Source/WebCore/platform/LocalizedStrings.cpp (118693 => 118694)
--- branches/safari-536-branch/Source/WebCore/platform/LocalizedStrings.cpp 2012-05-28 16:52:48 UTC (rev 118693)
+++ branches/safari-536-branch/Source/WebCore/platform/LocalizedStrings.cpp 2012-05-28 16:54:29 UTC (rev 118694)
@@ -48,7 +48,7 @@
// 2) It doesn't handle the %2$d syntax.
// Note that because |format| is used as the second parameter to va_start, it cannot be a reference
// type according to section 18.7/3 of the C++ N1905 standard.
-static String formatLocalizedString(const String& format, ...)
+static String formatLocalizedString(String format, ...)
{
#if USE(CF)
va_list arguments;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
