1471711 - Factor window targeting, spec sandbox, and short circuit loads out of nsDocShell::InternalLoad

Status: RESOLVED FIXED

(Core :: DOM: Navigation, enhancement, P2)

Description

[Kyle Machulis [:qdot] [:kmachulis] (INACTIVE)]

In an effort to reduce complexity of nsDocShell::InternalLoad, we can move window targeting and spec sandbox checks to their own methods.

Comment 1

[Kyle Machulis [:qdot] [:kmachulis] (INACTIVE)]

Note to self: Pay attention to changes being made in bug 1441059 when refactoring, to make sure we still cancel out correctly.

Comment 3

[Kyle Machulis [:qdot] [:kmachulis] (INACTIVE)]

Attachment: Bug 1471711 - Extract targeting from nsDocShell::InternalLoad;

Move targeting logic out of InternalLoad into its own method.

Comment 4

[Kyle Machulis [:qdot] [:kmachulis] (INACTIVE)]

Attachment: Bug 1471711 - Move ContentPolicyType and Srcdoc checking to DoURILoad;

Since targeting has been moved to another method, we don't need to
know the ContentPolicyType until we're in DoURILoad. We can also move
Srcdoc handling to DoURILoad, as all data is passed with the LoadState.

Depends on D17015

Comment 5

[Kyle Machulis [:qdot] [:kmachulis] (INACTIVE)]

Attachment: Bug 1471711 - Move bailout checks as early as possible in nsDocShell::InternalLoad;

Depends on D17016

Comment 6

[Kyle Machulis [:qdot] [:kmachulis] (INACTIVE)]

Attachment: Bug 1471711 - Extract short circuit loads to their own method;

Loading between 2 history entries is mostly a standalone procedure,
and can be extracted to its own method to clean up InternalLoad.

Depends on D17017

Comment 7

[Kyle Machulis [:qdot] [:kmachulis] (INACTIVE)]

Attachment: Bug 1471711 - Remove redundant docshell being destroyed check;

Stop all loads that are coming through Docshells that are currently
being destroyed. Keeps earliest check for this condition, removes
later one.

Depends on D17018

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/e2f05d4b4588
Extract targeting from nsDocShell::InternalLoad; r=bzbarsky
https://hg.mozilla.org/integration/autoland/rev/0923f30e1b54
Move ContentPolicyType and Srcdoc checking to DoURILoad; r=bzbarsky
https://hg.mozilla.org/integration/autoland/rev/9a1a9249d888
Move bailout checks as early as possible in nsDocShell::InternalLoad; r=bzbarsky
https://hg.mozilla.org/integration/autoland/rev/ae2f3a7e24b1
Extract short circuit loads to their own method; r=bzbarsky
https://hg.mozilla.org/integration/autoland/rev/71e4d00dc7bc
Remove redundant docshell being destroyed check; r=bzbarsky

Comment 10

[Natalia Csoregi [:nataliaCs]]

https://hg.mozilla.org/mozilla-central/rev/e2f05d4b4588
https://hg.mozilla.org/mozilla-central/rev/0923f30e1b54
https://hg.mozilla.org/mozilla-central/rev/9a1a9249d888
https://hg.mozilla.org/mozilla-central/rev/ae2f3a7e24b1
https://hg.mozilla.org/mozilla-central/rev/71e4d00dc7bc