corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing some places when talking to the webshell object to start talking through the new docshell interfaces.

Browse Source
This commit is contained in:
tbogard@aol.net
1999-12-18 02:09:29 +00:00
parent 2651b8b933
commit 75823eb78c
14 changed files with 256 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/plugin/base/src/nsPluginViewer.cpp
View File

@@ -39,6 +39,7 @@
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsIInterfaceRequestor.h"
#include "nsIDocShellTreeItem.h"
// Class IDs
static NS_DEFINE_IID(kChildWindowCID, NS_CHILD_CID);
@@ -834,15 +835,16 @@ NS_IMETHODIMP pluginInstanceOwner :: ShowStatus(const char *aStatusMsg)
if ((NS_OK == rv) && (nsnull != cont))
{
nsCOMPtr<nsIWebShell> ws(do_QueryInterface(cont));
nsCOMPtr<nsIDocShellTreeItem> docShellItem(do_QueryInterface(cont));
if (NS_OK == rv)
if (docShellItem)
{
nsCOMPtr<nsIWebShell> rootWebShell;
nsCOMPtr<nsIDocShellTreeItem> root;
ws->GetRootWebShell(*getter_AddRefs(rootWebShell));
docShellItem->GetSameTypeRootTreeItem(getter_AddRefs(root));
if (nsnull != rootWebShell)
nsCOMPtr<nsIWebShell> rootWebShell(do_QueryInterface(root));
if (rootWebShell)
{
nsCOMPtr<nsIWebShellContainer> rootContainer;