WebKit Bugzilla
Attachment 347115 Details for
Bug 188580
: LayoutTest inspector/worker/debugger-pause.html sometimes times out
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
[PATCH] Proposed Fix
wait-for-main-resource-1.patch (text/plain), 4.41 KB, created by
Joseph Pecoraro
on 2018-08-14 15:10:45 PDT
(
hide
)
Description:
[PATCH] Proposed Fix
Filename:
MIME Type:
Creator:
Joseph Pecoraro
Created:
2018-08-14 15:10:45 PDT
Size:
4.41 KB
patch
obsolete
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index e8bcc0d0086..3a44b16c318 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,16 @@ >+2018-08-14 Joseph Pecoraro <pecoraro@apple.com> >+ >+ LayoutTest inspector/worker/debugger-pause.html sometimes times out >+ https://bugs.webkit.org/show_bug.cgi?id=188580 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * 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-13 Joseph Pecoraro <pecoraro@apple.com> > > [macOS debug] LayoutTest inspector/worker/resources-in-worker.html is a flaky timeout >diff --git a/LayoutTests/inspector/worker/debugger-pause.html b/LayoutTests/inspector/worker/debugger-pause.html >index 0de5134a34d..8f4425e0366 100644 >--- a/LayoutTests/inspector/worker/debugger-pause.html >+++ b/LayoutTests/inspector/worker/debugger-pause.html >@@ -3,6 +3,7 @@ > <head> > <script src="../../http/tests/inspector/resources/inspector-test.js"></script> > <script src="../debugger/resources/log-pause-location.js"></script> >+<script src="resources/worker-utilities.js"></script> > <script> > TestPage.allowUncaughtExceptions = true; > TestPage.needToSanitizeUncaughtExceptionURLs = true; >@@ -111,8 +112,7 @@ function test() > } > }); > >- // Turn once to ensure workerTarget.mainResource is loaded. >- Promise.resolve().then(() => { >+ awaitTargetMainResource(workerTarget).then(() => { > window.loadLinesFromSourceCode(workerTarget.mainResource).then(() => { > suite.runTestCasesAndFinish(); > }); >diff --git a/LayoutTests/inspector/worker/resources/worker-utilities.js b/LayoutTests/inspector/worker/resources/worker-utilities.js >new file mode 100644 >index 00000000000..ae17aa3c924 >--- /dev/null >+++ b/LayoutTests/inspector/worker/resources/worker-utilities.js >@@ -0,0 +1,7 @@ >+TestPage.registerInitializer(() => { >+ window.awaitTargetMainResource = function(workerTarget) { >+ if (workerTarget.mainResource) >+ return Promise.resolve(); >+ return workerTarget.awaitEvent(WI.Target.Event.MainResourceAdded); >+ } >+}); >diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog >index ef94d4b5e50..71b9f96f6a1 100644 >--- a/Source/WebInspectorUI/ChangeLog >+++ b/Source/WebInspectorUI/ChangeLog >@@ -1,3 +1,15 @@ >+2018-08-14 Joseph Pecoraro <pecoraro@apple.com> >+ >+ LayoutTest inspector/worker/debugger-pause.html sometimes times out >+ https://bugs.webkit.org/show_bug.cgi?id=188580 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * 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-12 Aditya Keerthi <akeerthi@apple.com> > > [macOS] Color wells should appear pressed when presenting a color picker >diff --git a/Source/WebInspectorUI/UserInterface/Protocol/Target.js b/Source/WebInspectorUI/UserInterface/Protocol/Target.js >index 2d4cf13100e..92d13fcf5c8 100644 >--- a/Source/WebInspectorUI/UserInterface/Protocol/Target.js >+++ b/Source/WebInspectorUI/UserInterface/Protocol/Target.js >@@ -56,9 +56,6 @@ WI.Target = class Target extends WI.Object > 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 @@ WI.Target = class Target extends WI.Object > > 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.Type = { > }; > > WI.Target.Event = { >+ MainResourceAdded: "target-main-resource-added", > ResourceAdded: "target-resource-added", > ScriptAdded: "target-script-added", > };
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 188580
: 347115