Title: [235041] releases/WebKitGTK/webkit-2.22
- Revision
- 235041
- Author
- [email protected]
- Date
- 2018-08-20 04:11:16 -0700 (Mon, 20 Aug 2018)
Log Message
Merge r234945 - LayoutTest inspector/worker/debugger-pause.html sometimes times out
https://bugs.webkit.org/show_bug.cgi?id=188580
Patch by Joseph Pecoraro <[email protected]> on 2018-08-16
Reviewed by Matt Baker.
Source/WebInspectorUI:
* UserInterface/Protocol/Target.js:
(WI.Target.prototype.get mainResource):
(WI.Target.prototype.set mainResource):
Dispatch an event when the Main Resource is set.
LayoutTests:
* inspector/worker/debugger-pause.html:
* inspector/worker/resources/worker-utilities.js: Added.
(TestPage.registerInitializer.window.awaitTargetMainResource):
(TestPage.registerInitializer):
Use a more deterministic wait for the main resource.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog (235040 => 235041)
--- releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog 2018-08-20 11:11:08 UTC (rev 235040)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog 2018-08-20 11:11:16 UTC (rev 235041)
@@ -1,3 +1,16 @@
+2018-08-16 Joseph Pecoraro <[email protected]>
+
+ LayoutTest inspector/worker/debugger-pause.html sometimes times out
+ https://bugs.webkit.org/show_bug.cgi?id=188580
+
+ Reviewed by Matt Baker.
+
+ * inspector/worker/debugger-pause.html:
+ * inspector/worker/resources/worker-utilities.js: Added.
+ (TestPage.registerInitializer.window.awaitTargetMainResource):
+ (TestPage.registerInitializer):
+ Use a more deterministic wait for the main resource.
+
2018-08-16 Ryosuke Niwa <[email protected]>
Perform a microtask checkpoint before creating a custom element
Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/inspector/worker/debugger-pause.html (235040 => 235041)
--- releases/WebKitGTK/webkit-2.22/LayoutTests/inspector/worker/debugger-pause.html 2018-08-20 11:11:08 UTC (rev 235040)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/inspector/worker/debugger-pause.html 2018-08-20 11:11:16 UTC (rev 235041)
@@ -3,6 +3,7 @@
<head>
<script src=""
<script src=""
+<script src=""
<script>
TestPage.allowUncaughtExceptions = true;
TestPage.needToSanitizeUncaughtExceptionURLs = true;
@@ -111,8 +112,7 @@
}
});
- // Turn once to ensure workerTarget.mainResource is loaded.
- Promise.resolve().then(() => {
+ awaitTargetMainResource(workerTarget).then(() => {
window.loadLinesFromSourceCode(workerTarget.mainResource).then(() => {
suite.runTestCasesAndFinish();
});
Added: releases/WebKitGTK/webkit-2.22/LayoutTests/inspector/worker/resources/worker-utilities.js (0 => 235041)
--- releases/WebKitGTK/webkit-2.22/LayoutTests/inspector/worker/resources/worker-utilities.js (rev 0)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/inspector/worker/resources/worker-utilities.js 2018-08-20 11:11:16 UTC (rev 235041)
@@ -0,0 +1,7 @@
+TestPage.registerInitializer(() => {
+ window.awaitTargetMainResource = function(workerTarget) {
+ if (workerTarget.mainResource)
+ return Promise.resolve();
+ return workerTarget.awaitEvent(WI.Target.Event.MainResourceAdded);
+ }
+});
Modified: releases/WebKitGTK/webkit-2.22/Source/WebInspectorUI/ChangeLog (235040 => 235041)
--- releases/WebKitGTK/webkit-2.22/Source/WebInspectorUI/ChangeLog 2018-08-20 11:11:08 UTC (rev 235040)
+++ releases/WebKitGTK/webkit-2.22/Source/WebInspectorUI/ChangeLog 2018-08-20 11:11:16 UTC (rev 235041)
@@ -1,3 +1,15 @@
+2018-08-16 Joseph Pecoraro <[email protected]>
+
+ LayoutTest inspector/worker/debugger-pause.html sometimes times out
+ https://bugs.webkit.org/show_bug.cgi?id=188580
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Protocol/Target.js:
+ (WI.Target.prototype.get mainResource):
+ (WI.Target.prototype.set mainResource):
+ Dispatch an event when the Main Resource is set.
+
2018-08-15 Aditya Keerthi <[email protected]>
[Datalist] Add button to TextFieldInputs with a datalist
Modified: releases/WebKitGTK/webkit-2.22/Source/WebInspectorUI/UserInterface/Protocol/Target.js (235040 => 235041)
--- releases/WebKitGTK/webkit-2.22/Source/WebInspectorUI/UserInterface/Protocol/Target.js 2018-08-20 11:11:08 UTC (rev 235040)
+++ releases/WebKitGTK/webkit-2.22/Source/WebInspectorUI/UserInterface/Protocol/Target.js 2018-08-20 11:11:16 UTC (rev 235041)
@@ -56,9 +56,6 @@
get name() { return this._name; }
set name(name) { this._name = name; }
- get mainResource() { return this._mainResource; }
- set mainResource(resource) { this._mainResource = resource; }
-
get type() { return this._type; }
get connection() { return this._connection; }
get executionContext() { return this._executionContext; }
@@ -68,6 +65,20 @@
get displayName() { return this._name; }
+ get mainResource()
+ {
+ return this._mainResource;
+ }
+
+ set mainResource(resource)
+ {
+ console.assert(!this._mainResource);
+
+ this._mainResource = resource;
+
+ this.dispatchEventToListeners(WI.Target.Event.MainResourceAdded, {resource});
+ }
+
addResource(resource)
{
this._resourceCollection.add(resource);
@@ -98,6 +109,7 @@
};
WI.Target.Event = {
+ MainResourceAdded: "target-main-resource-added",
ResourceAdded: "target-resource-added",
ScriptAdded: "target-script-added",
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
