Title: [163209] tags/Safari-538.15/Source/WebCore
- Revision
- 163209
- Author
- [email protected]
- Date
- 2014-01-31 15:12:05 -0800 (Fri, 31 Jan 2014)
Log Message
Merged r163191. <rdar://problem/15957993>
Modified Paths
Diff
Modified: tags/Safari-538.15/Source/WebCore/ChangeLog (163208 => 163209)
--- tags/Safari-538.15/Source/WebCore/ChangeLog 2014-01-31 23:06:25 UTC (rev 163208)
+++ tags/Safari-538.15/Source/WebCore/ChangeLog 2014-01-31 23:12:05 UTC (rev 163209)
@@ -1,3 +1,19 @@
+2014-01-31 Lucas Forschler <[email protected]>
+
+ Merge r163191
+
+ 2014-01-31 Timothy Hatcher <[email protected]>
+
+ Properly handle cases where a profile couldn't be recorded and null is returned.
+
+ <rdar://problem/15957993> Crash with Inspector open at WebCore::ScriptProfile::buildInspectorObject
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCallFunction): Null check profile.
+ (WebCore::InspectorTimelineAgent::didEvaluateScript): Ditto.
+
2014-01-30 Jessie Berlin <[email protected]>
Speculative build fix.
Modified: tags/Safari-538.15/Source/WebCore/inspector/InspectorTimelineAgent.cpp (163208 => 163209)
--- tags/Safari-538.15/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-01-31 23:06:25 UTC (rev 163208)
+++ tags/Safari-538.15/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-01-31 23:12:05 UTC (rev 163209)
@@ -155,7 +155,8 @@
ASSERT(entry.type == TimelineRecordType::FunctionCall);
RefPtr<ScriptProfile> profile = "" debuggerWorld())->globalExec(), ASCIILiteral("Timeline FunctionCall"));
- TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
+ if (profile)
+ TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
m_recordingProfile = false;
}
@@ -335,7 +336,8 @@
ASSERT(entry.type == TimelineRecordType::EvaluateScript);
RefPtr<ScriptProfile> profile = "" debuggerWorld())->globalExec(), ASCIILiteral("Timeline EvaluateScript"));
- TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
+ if (profile)
+ TimelineRecordFactory::appendProfile(entry.data.get(), profile.release());
m_recordingProfile = false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
