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

SetJSStatus, SetJSDefaultStatus and SetOverLink now poke a DOM attribute on element WebBrowserChrome in the xul window if one exists. Renamed nsXULWindow::GetDOMElementFromDocShell to be nsXULWindow::GetWindowDOMElement. This cleans up having to pass in the same docShell over and over and make it mean more of what it is. Added a nsXULWindow::GetElementById which returns an element of the specified id within the xul window. nsContentTreeOwner doesn't need to cache the defaultStatus. nsWebShellWindow doesn't need to call ExecutStartupCode anymore as that was only there for nsIXULWindowCallbacks code which is gone. nsWebShellWindow doesn't need to cache mStatus or mDefaultStatus.

Browse Source
This commit is contained in:
tbogard@aol.net
2000-03-16 05:45:26 +00:00
parent fe2aef0cf4
commit 55d1fe1372
6 changed files with 55 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
xpfe/appshell/src/nsContentTreeOwner.cpp
View File

@@ -193,32 +193,30 @@ NS_IMETHODIMP nsContentTreeOwner::GetNewWindow(PRInt32 aChromeFlags,
NS_IMETHODIMP nsContentTreeOwner::SetJSStatus(const PRUnichar* aStatus)
{
nsAutoString status(aStatus);
if(!status.Length())
status = mDefaultStatus;
nsAutoString statusName("status");
NS_ENSURE_SUCCESS(mXULWindow->NotifyObservers(statusName.GetUnicode(),
status.GetUnicode()), NS_ERROR_FAILURE);
nsCOMPtr<nsIDOMElement> window;
mXULWindow->GetDOMElementById("WebBrowserChrome", getter_AddRefs(window));
if(window)
window->SetAttribute("status", aStatus);
return NS_OK;
}
NS_IMETHODIMP nsContentTreeOwner::SetJSDefaultStatus(const PRUnichar* aStatus)
{
mDefaultStatus = aStatus;
nsAutoString statusName("defaultStatus");
NS_ENSURE_SUCCESS(mXULWindow->NotifyObservers(statusName.GetUnicode(),
aStatus), NS_ERROR_FAILURE);
nsCOMPtr<nsIDOMElement> window;
mXULWindow->GetDOMElementById("WebBrowserChrome", getter_AddRefs(window));
if(window)
window->SetAttribute("defaultStatus", aStatus);
return NS_OK;
}
NS_IMETHODIMP nsContentTreeOwner::SetOverLink(const PRUnichar* aLink)
{
return SetJSStatus(aLink);
nsCOMPtr<nsIDOMElement> window;
mXULWindow->GetDOMElementById("WebBrowserChrome", getter_AddRefs(window));
if(window)
window->SetAttribute("overLink", aLink);
return NS_OK;
}
NS_IMETHODIMP nsContentTreeOwner::SetWebBrowser(nsIWebBrowser* aWebBrowser)
@@ -441,7 +439,7 @@ NS_IMETHODIMP nsContentTreeOwner::ApplyChromeMask()
return NS_OK; // We'll do this later when chrome is loaded
nsCOMPtr<nsIDOMElement> window;
mXULWindow->GetDOMElementFromDocShell(mXULWindow->mDocShell, getter_AddRefs(window));
mXULWindow->GetWindowDOMElement(getter_AddRefs(window));
NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
mXULWindow->mWindow->ShowMenuBar(mChromeMask &
@@ -496,8 +494,7 @@ void nsContentTreeOwner::XULWindow(nsXULWindow* aXULWindow)
{
// Get the window title modifiers
nsCOMPtr<nsIDOMElement> docShellElement;
mXULWindow->GetDOMElementFromDocShell(mXULWindow->mDocShell,
getter_AddRefs(docShellElement));
mXULWindow->GetWindowDOMElement(getter_AddRefs(docShellElement));
nsAutoString contentTitleSetting;