Title: [193469] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193469
- Author
- timo...@apple.com
- Date
- 2015-12-04 14:15:23 -0800 (Fri, 04 Dec 2015)
Log Message
<rdar://problem/23764741> REGRESSION: Recording does not show the progress till the recording is stopped.
Fix a merge issue where variable names did not match and was causing an exception.
* UserInterface/Models/ScriptTimelineRecord.js:
* UserInterface/Views/TimelineRecordTreeElement.js:
(WebInspector.TimelineRecordTreeElement):
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193468 => 193469)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-04 21:57:41 UTC (rev 193468)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-04 22:15:23 UTC (rev 193469)
@@ -1,3 +1,13 @@
+2015-12-04 Timothy Hatcher <timo...@apple.com>
+
+ <rdar://problem/23764741> REGRESSION: Recording does not show the progress till the recording is stopped.
+
+ Fix a merge issue where variable names did not match and was causing an exception.
+
+ * UserInterface/Models/ScriptTimelineRecord.js:
+ * UserInterface/Views/TimelineRecordTreeElement.js:
+ (WebInspector.TimelineRecordTreeElement):
+
2015-12-03 Matthew Hanson <matthew_han...@apple.com>
Merge r188530. rdar://problem/23732374
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js (193468 => 193469)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-12-04 21:57:41 UTC (rev 193468)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-12-04 22:15:23 UTC (rev 193469)
@@ -161,7 +161,7 @@
ConsoleProfileRecorded: "script-timeline-record-console-profile-recorded"
};
-WebInspector.ScriptTimelineRecord.EventType.displayName = function(eventType, details, includeTimerIdentifierInMainTitle)
+WebInspector.ScriptTimelineRecord.EventType.displayName = function(eventType, details, includeDetailsInMainTitle)
{
if (details && !WebInspector.ScriptTimelineRecord._eventDisplayNames) {
// These display names are not localized because they closely represent
@@ -336,7 +336,7 @@
return WebInspector.UIString("“%s” Profile Recorded").format(details);
return WebInspector.UIString("Console Profile Recorded");
case WebInspector.ScriptTimelineRecord.EventType.TimerFired:
- if (details && includeTimerIdentifierInMainTitle)
+ if (details && includeDetailsInMainTitle)
return WebInspector.UIString("Timer %s Fired").format(details);
return WebInspector.UIString("Timer Fired");
case WebInspector.ScriptTimelineRecord.EventType.TimerInstalled:
@@ -344,7 +344,7 @@
return WebInspector.UIString("Timer %s Installed").format(details.timerId);
return WebInspector.UIString("Timer Installed");
case WebInspector.ScriptTimelineRecord.EventType.TimerRemoved:
- if (details && includeTimerIdentifierInMainTitle)
+ if (details && includeDetailsInMainTitle)
return WebInspector.UIString("Timer %s Removed").format(details);
return WebInspector.UIString("Timer Removed");
case WebInspector.ScriptTimelineRecord.EventType.AnimationFrameFired:
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js (193468 => 193469)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2015-12-04 21:57:41 UTC (rev 193468)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2015-12-04 22:15:23 UTC (rev 193469)
@@ -25,7 +25,7 @@
WebInspector.TimelineRecordTreeElement = class TimelineRecordTreeElement extends WebInspector.GeneralTreeElement
{
- constructor(timelineRecord, subtitleNameStyle, includeTimerIdentifierInMainTitle, sourceCodeLocation, representedObject)
+ constructor(timelineRecord, subtitleNameStyle, includeDetailsInMainTitle, sourceCodeLocation, representedObject)
{
console.assert(timelineRecord);
@@ -73,7 +73,7 @@
break;
case WebInspector.TimelineRecord.Type.Script:
- title = WebInspector.ScriptTimelineRecord.EventType.displayName(timelineRecord.eventType, timelineRecord.details, includeTimerIdentifierInMainTitle);
+ title = WebInspector.ScriptTimelineRecord.EventType.displayName(timelineRecord.eventType, timelineRecord.details, includeDetailsInMainTitle);
switch (timelineRecord.eventType) {
case WebInspector.ScriptTimelineRecord.EventType.ScriptEvaluated:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
