Title: [182834] trunk/Source/WebInspectorUI
- Revision
- 182834
- Author
- commit-qu...@webkit.org
- Date
- 2015-04-14 20:57:19 -0700 (Tue, 14 Apr 2015)
Log Message
Web Inspector: Uncaught exception in JSContext inspector when opening
https://bugs.webkit.org/show_bug.cgi?id=143741
Patch by Joseph Pecoraro <pecor...@apple.com> on 2015-04-14
Reviewed by Timothy Hatcher.
* UserInterface/Controllers/TimelineManager.js:
(WebInspector.TimelineManager.shouldShowViewForTimeline):
(WebInspector.TimelineManager.prototype._loadNewRecording):
Before using TimelineAgent, check for its existence first. It may
not exist in JSContext inspection.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (182833 => 182834)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-15 02:29:21 UTC (rev 182833)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-15 03:57:19 UTC (rev 182834)
@@ -1,3 +1,16 @@
+2015-04-14 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Uncaught exception in JSContext inspector when opening
+ https://bugs.webkit.org/show_bug.cgi?id=143741
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.shouldShowViewForTimeline):
+ (WebInspector.TimelineManager.prototype._loadNewRecording):
+ Before using TimelineAgent, check for its existence first. It may
+ not exist in JSContext inspection.
+
2015-04-14 Nikita Vasilyev <nvasil...@apple.com>
Web Inspector: Align array's indices and set's bullet points under the property icon
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (182833 => 182834)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-04-15 02:29:21 UTC (rev 182833)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-04-15 03:57:19 UTC (rev 182834)
@@ -56,7 +56,7 @@
{
// COMPATIBILITY (iOS 8): TimelineAgent.EventType.RenderingFrame did not exist,
// fallback to displaying all other timelines.
- if (!TimelineAgent.EventType.RenderingFrame)
+ if (window.TimelineAgent && !TimelineAgent.EventType.RenderingFrame)
return timeline.type !== WebInspector.TimelineRecord.Type.RenderingFrame;
// Don't show the Layout timeline view when the RenderingFrame timeline exists.
@@ -437,7 +437,7 @@
newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Network, newRecording));
// COMPATIBILITY (iOS 8): TimelineAgent.EventType.RenderingFrame did not exist.
- if (TimelineAgent.EventType.RenderingFrame)
+ if (window.TimelineAgent && TimelineAgent.EventType.RenderingFrame)
newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.RenderingFrame, newRecording));
newRecording.addTimeline(WebInspector.Timeline.create(WebInspector.TimelineRecord.Type.Layout, newRecording));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
