Bommels05/Mozilla
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 
git-svn-id: svn://10.0.0.236/trunk@56167 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tbogard%aol.net
1999-12-18 02:09:29 +00:00
parent 62fc3719a4
commit b5cb13131e
14 changed files with 256 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mozilla/layout/html/base/src/nsObjectFrame.cpp
View File

@@ -50,6 +50,7 @@
#include "nsITimer.h"
#include "nsITimerCallback.h"
#include "nsLayoutAtoms.h"
#include "nsIDocShellTreeItem.h"
// XXX For temporary paint code
#include "nsIStyleContext.h"
@@ -1733,50 +1734,40 @@ NS_IMETHODIMP nsPluginInstanceOwner::ShowStatus(const char *aStatusMsg)
if (nsnull != mContext)
{
nsISupports *cont;
nsCOMPtr<nsISupports> cont;
rv = mContext->GetContainer(&cont);
rv = mContext->GetContainer(getter_AddRefs(cont));
if ((NS_OK == rv) && (nsnull != cont))
{
nsIWebShell *ws;
rv = cont->QueryInterface(nsIWebShell::GetIID(), (void **)&ws);
if (NS_OK == rv)
nsCOMPtr<nsIDocShellTreeItem> docShellItem(do_QueryInterface(cont));
if (docShellItem)
{
nsIWebShell *rootWebShell;
nsCOMPtr<nsIDocShellTreeItem> root;
ws->GetRootWebShell(rootWebShell);
docShellItem->GetSameTypeRootTreeItem(getter_AddRefs(root));
if (nsnull != rootWebShell)
nsCOMPtr<nsIWebShell> rootWebShell(do_QueryInterface(root));
if (rootWebShell)
{
nsIWebShellContainer *rootContainer;
nsCOMPtr<nsIWebShellContainer> rootContainer;
rv = rootWebShell->GetContainer(rootContainer);
rv = rootWebShell->GetContainer(*getter_AddRefs(rootContainer));
if (nsnull != rootContainer)
{
nsIBrowserWindow *browserWindow;
nsCOMPtr<nsIBrowserWindow> browserWindow(do_QueryInterface(rootContainer));
if (NS_OK == rootContainer->QueryInterface(kIBrowserWindowIID, (void**)&browserWindow))
if (rootContainer)
{
nsAutoString msg = nsAutoString(aStatusMsg);
rv = browserWindow->SetStatus(msg.GetUnicode());
NS_RELEASE(browserWindow);
}
NS_RELEASE(rootContainer);
}
NS_RELEASE(rootWebShell);
}
NS_RELEASE(ws);
}
NS_RELEASE(cont);
}
}