Title: [193040] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193040
- Author
- [email protected]
- Date
- 2015-12-03 10:34:20 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r187619. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193039 => 193040)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:34:16 UTC (rev 193039)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:34:20 UTC (rev 193040)
@@ -1,5 +1,19 @@
2015-12-01 Timothy Hatcher <[email protected]>
+ Merge r187619. rdar://problem/23221163
+
+ 2015-07-30 Matt Baker <[email protected]>
+
+ Web Inspector: Fix typo in frame duration filtering console.assert message
+ https://bugs.webkit.org/show_bug.cgi?id=147458
+
+ Rubber-stamped by Joseph Pecoraro.
+
+ * UserInterface/Views/RenderingFrameTimelineView.js:
+ (WebInspector.RenderingFrameTimelineView.displayNameForDurationFilter):
+
+2015-12-01 Timothy Hatcher <[email protected]>
+
Merge r187599. rdar://problem/23221163
2015-07-30 Nikita Vasilyev <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js (193039 => 193040)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-12-03 18:34:16 UTC (rev 193039)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js 2015-12-03 18:34:20 UTC (rev 193040)
@@ -100,7 +100,7 @@
case WebInspector.RenderingFrameTimelineView.DurationFilter.OverFifteenMilliseconds:
return WebInspector.UIString("Over 15 ms");
default:
- console.error("Unknown tab type", tabType);
+ console.error("Unknown filter type", filter);
}
return null;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
