727666 - Worker hang at shutdown with XHR

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Attachment: Patch

Third time is the charm?

Comment 1

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Attachment: Patch

Comment 2

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 598061 [details] [diff] [review]
Patch

Oops, older patch.

Comment 4

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Attachment: Patch

Comment 5

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 604253 [details] [diff] [review]
Patch

Review of attachment 604253 [details] [diff] [review]:
-----------------------------------------------------------------

Needs moar comment, r=me with that!

::: dom/workers/XMLHttpRequestPrivate.cpp
@@ +1443,5 @@
>    // may be gone.
>  
>    if (mProxy) {
> +    // This isn't necessary if the worker is going away or the XHR is going away.
> +    if (aType == Default) {

Let's move this inside the 'else' case below. That way it's not so confusing.

::: dom/workers/XMLHttpRequestPrivate.h
@@ +165,5 @@
>  
>    bool
>    SendInProgress() const
>    {
> +    return mJSObjectRooted != 0;

Remove != 0

Comment 6

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Attachment: Part 2

Comment 7

[Ben Turner (not reading bugmail, use the needinfo flag!)]

Comment on attachment 604472 [details] [diff] [review]
Part 2

Review of attachment 604472 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/workers/XMLHttpRequestPrivate.cpp
@@ +1092,5 @@
>      }
>  
>      mProxy->mPreviousStatusText.Truncate();
>  
> +    mProxy->mInOpen = true;

Please assert !mProxy->mInOpen

@@ +1097,2 @@
>      rv = mProxy->mXHR->Open(mMethod, mURL, true, mUser, mPassword, 1);
> +    mProxy->mInOpen = false;

Please assert mProxy->mInOpen

Comment 8

[Marco Bonardo [:mak]]

I assume the landing was a coalesce of the 2 patches, if not please reopen.

https://hg.mozilla.org/mozilla-central/rev/b02fb1d9d533