1271436 - some docshell cleanups

Status: RESOLVED FIXED

(Core :: DOM: Navigation, defect)

Comment 1

[Trevor Saunders (:tbsaunde)]

Attachment: use nsIDocShellTreeItem::GetWindow() more

Comment 2

[Trevor Saunders (:tbsaunde)]

Attachment: use nsIDocShellTreeItem::GetDocument() more

Comment 3

[Trevor Saunders (:tbsaunde)]

Attachment: add nsIDocShell::GetCommandManager()

Comment 4

[Trevor Saunders (:tbsaunde)]

Attachment: use do_GetInterface() a little less

Comment 5

[Olli Pettay [:smaug][[e-mail]]]

Comment on attachment 8750472 [details] [diff] [review]
use nsIDocShellTreeItem::GetWindow() more

do_GetInterface can be actually quite nice, as can be seen here, since it deals with null checks. But fine.

Comment 6

[Olli Pettay [:smaug][[e-mail]]]

Comment on attachment 8750473 [details] [diff] [review]
use nsIDocShellTreeItem::GetDocument() more

>+++ b/dom/base/nsFrameLoader.cpp
>@@ -3178,17 +3178,17 @@ nsFrameLoader::StartPersistence(uint64_t aOuterWindowID,
>   if (!aRecv) {
>     return NS_ERROR_INVALID_POINTER;
>   }
> 
>   if (mRemoteBrowser) {
>     return mRemoteBrowser->StartPersistence(aOuterWindowID, aRecv);
>   }
> 
>-  nsCOMPtr<nsIDocument> rootDoc = do_GetInterface(mDocShell);
>+  nsCOMPtr<nsIDocument> rootDoc = mDocShell->GetDocument();
You need to null check mDocShell here.

Comment 7

[Olli Pettay [:smaug][[e-mail]]]

Comment on attachment 8750474 [details] [diff] [review]
add nsIDocShell::GetCommandManager()


>+++ b/docshell/base/nsIDocShell.idl
...
>+
>+[noscript,nostdcall,notxpcom] nsICommandManager GetCommandManager();
Missing indentation.

Comment 8

[Olli Pettay [:smaug][[e-mail]]]

Comment on attachment 8750475 [details] [diff] [review]
use do_GetInterface() a little less

> SpeakerManager::Init(nsPIDOMWindowInner* aWindow)
> {
>   BindToOwner(aWindow);
> 
>-  nsCOMPtr<nsIDocShell> docshell = do_GetInterface(GetOwner());
>+  nsCOMPtr<nsIDocShell> docshell = GetOwner()->GetDocShell();
Ok, so this is fine because the only caller of Init happens to pass always non-null.

Comment 9

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/78cac68e8c4d
https://hg.mozilla.org/integration/mozilla-inbound/rev/969913024af1
https://hg.mozilla.org/integration/mozilla-inbound/rev/5e2d4fd85333
https://hg.mozilla.org/integration/mozilla-inbound/rev/9fff8c6a9844

Comment 10

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/78cac68e8c4d
https://hg.mozilla.org/mozilla-central/rev/969913024af1
https://hg.mozilla.org/mozilla-central/rev/5e2d4fd85333
https://hg.mozilla.org/mozilla-central/rev/9fff8c6a9844