Title: [227328] branches/safari-605-branch/Source/WebInspectorUI
- Revision
- 227328
- Author
- [email protected]
- Date
- 2018-01-22 09:58:36 -0800 (Mon, 22 Jan 2018)
Log Message
Cherry-pick r227243. rdar://problem/36722430
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebInspectorUI/ChangeLog (227327 => 227328)
--- branches/safari-605-branch/Source/WebInspectorUI/ChangeLog 2018-01-22 17:58:33 UTC (rev 227327)
+++ branches/safari-605-branch/Source/WebInspectorUI/ChangeLog 2018-01-22 17:58:36 UTC (rev 227328)
@@ -1,5 +1,21 @@
2018-01-22 Jason Marcell <[email protected]>
+ Cherry-pick r227243. rdar://problem/36722430
+
+ 2018-01-19 Matt Baker <[email protected]>
+
+ Web Inspector: Canvas Tab: Multiple "waiting for frames" messages displayed
+ https://bugs.webkit.org/show_bug.cgi?id=181865
+ <rdar://problem/36664737>
+
+ Reviewed by Devin Rousso.
+
+ * UserInterface/Views/CanvasContentView.js:
+ (WI.CanvasContentView.prototype._recordingStarted):
+ (WI.CanvasContentView.prototype._recordingStopped):
+
+2018-01-22 Jason Marcell <[email protected]>
+
Cherry-pick r227232. rdar://problem/36722564
2018-01-19 Nikita Vasilyev <[email protected]>
Modified: branches/safari-605-branch/Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js (227327 => 227328)
--- branches/safari-605-branch/Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js 2018-01-22 17:58:33 UTC (rev 227327)
+++ branches/safari-605-branch/Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js 2018-01-22 17:58:36 UTC (rev 227328)
@@ -263,6 +263,9 @@
{
this._updateRecordNavigationItem();
+ if (!this.representedObject.isRecording)
+ return;
+
if (!this._recordingProgressElement) {
this._recordingProgressElement = this._previewContainerElement.insertAdjacentElement("beforebegin", document.createElement("div"));
this._recordingProgressElement.className = "progress";
@@ -297,13 +300,16 @@
this._updateRecordNavigationItem();
let {canvas, recording} = event.data;
- if (canvas !== this.representedObject || !recording)
+ if (canvas !== this.representedObject)
return;
- this._addRecording(recording);
+ if (recording)
+ this._addRecording(recording);
- this._recordingProgressElement.remove();
- this._recordingProgressElement = null;
+ if (this._recordingProgressElement) {
+ this._recordingProgressElement.remove();
+ this._recordingProgressElement = null;
+ }
}
_handleRecordingSelectElementChange(event)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
