Title: [210335] branches/safari-603-branch/Source/_javascript_Core
- Revision
- 210335
- Author
- matthew_han...@apple.com
- Date
- 2017-01-05 09:08:32 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r209998. rdar://problem/29554366
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (210334 => 210335)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-05 17:08:30 UTC (rev 210334)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-05 17:08:32 UTC (rev 210335)
@@ -1,3 +1,21 @@
+2017-01-05 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r209998. rdar://problem/29554366
+
+ 2016-12-19 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Assertion seen in InspectorDebuggerAgent::refAsyncCallData with Inspector open
+ https://bugs.webkit.org/show_bug.cgi?id=166034
+ <rdar://problem/29554366>
+
+ Reviewed by Brian Burg.
+
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::refAsyncCallData):
+ Remove assertion. This assert can happen if the currently executing callback
+ was just explicitly cancelled by script. Existing code already handles if
+ no async data was found for the given identifier.
+
2016-12-19 Babak Shafiei <bshaf...@apple.com>
Merge r210010.
Modified: branches/safari-603-branch/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp (210334 => 210335)
--- branches/safari-603-branch/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2017-01-05 17:08:30 UTC (rev 210334)
+++ branches/safari-603-branch/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2017-01-05 17:08:32 UTC (rev 210335)
@@ -1142,7 +1142,6 @@
void InspectorDebuggerAgent::refAsyncCallData(const AsyncCallIdentifier& identifier)
{
auto iterator = m_asyncCallIdentifierToData.find(identifier);
- ASSERT(iterator != m_asyncCallIdentifierToData.end());
if (iterator == m_asyncCallIdentifierToData.end())
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
