Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (222173 => 222174)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-09-18 19:14:10 UTC (rev 222173)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-09-18 19:35:18 UTC (rev 222174)
@@ -1,3 +1,21 @@
+2017-09-18 Matt Baker <[email protected]>
+
+ Web Inspector: console.assert messages shouldn't end in an exclamation point
+ https://bugs.webkit.org/show_bug.cgi?id=177054
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/EventListener.js:
+ * UserInterface/Base/EventListenerSet.js:
+ (WI.EventListenerSet.prototype.register):
+ Drive-by: make assertions the same in both.
+
+ * UserInterface/Views/LayoutTimelineView.js:
+ (WI.LayoutTimelineView.prototype._processPendingRecords):
+
+ * UserInterface/Views/Resizer.js:
+ (WI.Resizer.prototype._currentPosition):
+
2017-09-18 Devin Rousso <[email protected]>
Web Inspector: REGRESSION(r221901): Single frame recordings don't reset the recording navigation item
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/EventListener.js (222173 => 222174)
--- trunk/Source/WebInspectorUI/UserInterface/Base/EventListener.js 2017-09-18 19:14:10 UTC (rev 222173)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/EventListener.js 2017-09-18 19:35:18 UTC (rev 222174)
@@ -39,10 +39,11 @@
connect(emitter, type, callback, usesCapture)
{
console.assert(!this._emitter && !this._callback, "EventListener already bound to a callback.", this);
- console.assert(callback, "Missing callback for event: " + type);
- console.assert(emitter, "Missing event emitter for event: " + type);
+ console.assert(emitter, `Missing event emitter for event: ${type}.`);
+ console.assert(type, `Missing event type.`);
+ console.assert(callback, `Missing callback for event: ${type}.`);
var emitterIsValid = emitter && (emitter instanceof WI.Object || emitter instanceof Node || (typeof emitter.addEventListener === "function"));
- console.assert(emitterIsValid, "Event emitter ", emitter, " (type:" + type + ") is null or does not implement Node or WI.Object!");
+ console.assert(emitterIsValid, "Event emitter ", emitter, ` (type: ${type}) is null or does not implement Node or WI.Object.`);
if (!emitterIsValid || !type || !callback)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/EventListenerSet.js (222173 => 222174)
--- trunk/Source/WebInspectorUI/UserInterface/Base/EventListenerSet.js 2017-09-18 19:14:10 UTC (rev 222173)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/EventListenerSet.js 2017-09-18 19:35:18 UTC (rev 222174)
@@ -44,10 +44,11 @@
register(emitter, type, callback, thisObject, usesCapture)
{
- console.assert(callback, "Missing callback for event: " + type);
- console.assert(type, "Tried to register listener for unknown event: " + type);
+ console.assert(emitter, `Missing event emitter for event: ${type}.`);
+ console.assert(type, `Missing event type.`);
+ console.assert(callback, `Missing callback for event: ${type}.`);
var emitterIsValid = emitter && (emitter instanceof WI.Object || emitter instanceof Node || (typeof emitter.addEventListener === "function"));
- console.assert(emitterIsValid, "Event emitter ", emitter, " (type:" + type + ") is null or does not implement Node or WI.Object!");
+ console.assert(emitterIsValid, "Event emitter ", emitter, ` (type: ${type}) is null or does not implement Node or WI.Object.`);
if (!emitterIsValid || !type || !callback)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (222173 => 222174)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2017-09-18 19:14:10 UTC (rev 222173)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2017-09-18 19:35:18 UTC (rev 222174)
@@ -217,7 +217,7 @@
console.assert(childRecord.type === WI.TimelineRecord.Type.Layout, childRecord);
let childDataGridNode = new WI.LayoutTimelineDataGridNode(childRecord, this.zeroTime);
- console.assert(entry.parentDataGridNode, "entry without parent!");
+ console.assert(entry.parentDataGridNode, "Missing parent node for entry.", entry);
this._dataGrid.addRowInSortOrder(null, childDataGridNode, entry.parentDataGridNode);
if (childDataGridNode && childRecord.children.length)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Resizer.js (222173 => 222174)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Resizer.js 2017-09-18 19:14:10 UTC (rev 222173)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Resizer.js 2017-09-18 19:35:18 UTC (rev 222174)
@@ -73,7 +73,7 @@
if (this._orientation === WI.Resizer.RuleOrientation.Horizontal)
return event.pageY;
- console.assert(false, "Should not be reached!");
+ console.assert(false, "Unexpected Resizer orientation.", this._orientation);
}
_resizerMouseDown(event)
