Title: [167236] releases/WebKitGTK/webkit-2.4/Source/_javascript_Core
- Revision
- 167236
- Author
- [email protected]
- Date
- 2014-04-14 03:53:12 -0700 (Mon, 14 Apr 2014)
Log Message
Merge r165902 - Update type of local vars to match the type of String length.
<https://webkit.org/b/130077>
Reviewed by Geoffrey Garen.
* runtime/JSStringJoiner.cpp:
(JSC::JSStringJoiner::join):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/ChangeLog (167235 => 167236)
--- releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/ChangeLog 2014-04-14 10:47:30 UTC (rev 167235)
+++ releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/ChangeLog 2014-04-14 10:53:12 UTC (rev 167236)
@@ -1,3 +1,13 @@
+2014-03-12 Mark Lam <[email protected]>
+
+ Update type of local vars to match the type of String length.
+ <https://webkit.org/b/130077>
+
+ Reviewed by Geoffrey Garen.
+
+ * runtime/JSStringJoiner.cpp:
+ (JSC::JSStringJoiner::join):
+
2014-02-01 Michael Saboff <[email protected]>
REGRESSION (r163027?): CrashTracer: [USER] com.apple.WebKit.WebContent.Development at com.apple._javascript_Core: JSC::ArrayProfile::computeUpdatedPrediction + 4
Modified: releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/runtime/JSStringJoiner.cpp (167235 => 167236)
--- releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/runtime/JSStringJoiner.cpp 2014-04-14 10:47:30 UTC (rev 167235)
+++ releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/runtime/JSStringJoiner.cpp 2014-04-14 10:53:12 UTC (rev 167236)
@@ -102,13 +102,13 @@
if (!m_strings.size())
return jsEmptyString(exec);
- Checked<size_t, RecordOverflow> separatorLength = m_separator.length();
+ Checked<unsigned, RecordOverflow> separatorLength = m_separator.length();
// FIXME: add special cases of joinStrings() for (separatorLength == 0) and (separatorLength == 1).
ASSERT(m_strings.size() > 0);
- Checked<size_t, RecordOverflow> totalSeparactorsLength = separatorLength * (m_strings.size() - 1);
- Checked<size_t, RecordOverflow> outputStringSize = totalSeparactorsLength + m_accumulatedStringsLength;
+ Checked<unsigned, RecordOverflow> totalSeparactorsLength = separatorLength * (m_strings.size() - 1);
+ Checked<unsigned, RecordOverflow> outputStringSize = totalSeparactorsLength + m_accumulatedStringsLength;
- size_t finalSize;
+ unsigned finalSize;
if (outputStringSize.safeGet(finalSize) == CheckedState::DidOverflow)
return throwOutOfMemoryError(exec);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
