Title: [171406] branches/safari-600.1-branch/Source/_javascript_Core
- Revision
- 171406
- Author
- dburk...@apple.com
- Date
- 2014-07-22 22:28:55 -0700 (Tue, 22 Jul 2014)
Log Message
Merge r171204
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog (171405 => 171406)
--- branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-23 05:27:26 UTC (rev 171405)
+++ branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-07-23 05:28:55 UTC (rev 171406)
@@ -1,5 +1,22 @@
2014-07-22 Dana Burkart <dburk...@apple.com>
+ Merge r171204.
+
+ 2014-07-17 Joseph Pecoraro <pecor...@apple.com>
+
+ Follow-up fix to r171195 to prevent ASSERT in fast/profiler/profile-with-no-title.html
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ Null / empty titles should be fine. Tests pass in release builds
+ which allowed empty titles, and it looks like the LegacyProfiler
+ stopProfiling handles empty titles as expected already.
+
+ * profiler/LegacyProfiler.cpp:
+ (JSC::LegacyProfiler::startProfiling):
+
+2014-07-22 Dana Burkart <dburk...@apple.com>
+
Merge r171190.
2014-07-16 Filip Pizlo <fpi...@apple.com>
Modified: branches/safari-600.1-branch/Source/_javascript_Core/profiler/LegacyProfiler.cpp (171405 => 171406)
--- branches/safari-600.1-branch/Source/_javascript_Core/profiler/LegacyProfiler.cpp 2014-07-23 05:27:26 UTC (rev 171405)
+++ branches/safari-600.1-branch/Source/_javascript_Core/profiler/LegacyProfiler.cpp 2014-07-23 05:28:55 UTC (rev 171406)
@@ -60,8 +60,6 @@
void LegacyProfiler::startProfiling(ExecState* exec, const String& title)
{
- ASSERT_ARG(title, !title.isNull());
-
if (!exec)
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
