Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 03:19:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

appshell whitespace cleanup, no bug

Browse Source
This commit is contained in:
Josh Aas 2009-01-06 16:25:49 -06:00
parent e3c223e4a9
commit a6be963ade
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xpfe/appshell/src/nsWindowMediator.cpp
View File

@ -316,7 +316,7 @@ nsWindowMediator::GetMostRecentWindow(const PRUnichar* inType, nsIDOMWindowInter
if (info && info->mWindow) {
nsCOMPtr<nsIDOMWindowInternal> DOMWindow;
if(NS_SUCCEEDED(GetDOMWindow(info->mWindow, DOMWindow))) {
if (NS_SUCCEEDED(GetDOMWindow(info->mWindow, DOMWindow))) {
*outWindow = DOMWindow;
NS_ADDREF(*outWindow);
return NS_OK;
@ -375,7 +375,7 @@ nsWindowMediator::UpdateWindowTitle(nsIXULWindow* inWindow,
nsAutoLock lock(mListLock);
if (mListeners && GetInfoFor(inWindow)) {
WindowTitleData winData = { inWindow, inTitle };
mListeners->EnumerateForwards(notifyWindowTitleChange, (void *)&winData);
mListeners->EnumerateForwards(notifyWindowTitleChange, (void*)&winData);
}
return NS_OK;
@ -584,9 +584,9 @@ nsWindowMediator::GetZLevel(nsIXULWindow *aWindow, PRUint32 *_retval)
NS_ENSURE_ARG_POINTER(_retval);
*_retval = nsIXULWindow::normalZ;
nsWindowInfo *info = GetInfoFor(aWindow);
if (info)
if (info) {
*_retval = info->mZLevel;
else {
} else {
NS_WARNING("getting z level of unregistered window");
// this goes off during window destruction
}

73
xpfe/appshell/src/nsXULWindow.cpp
View File

@ -440,7 +440,7 @@ NS_IMETHODIMP nsXULWindow::Create()
NS_IMETHODIMP nsXULWindow::Destroy()
{
if(!mWindow)
if (!mWindow)
return NS_OK;
nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
@ -518,19 +518,19 @@ NS_IMETHODIMP nsXULWindow::Destroy()
mContentShells.Clear();
mPrimaryContentShell = nsnull;
if(mContentTreeOwner) {
if (mContentTreeOwner) {
mContentTreeOwner->XULWindow(nsnull);
NS_RELEASE(mContentTreeOwner);
}
if(mPrimaryContentTreeOwner) {
if (mPrimaryContentTreeOwner) {
mPrimaryContentTreeOwner->XULWindow(nsnull);
NS_RELEASE(mPrimaryContentTreeOwner);
}
if(mChromeTreeOwner) {
if (mChromeTreeOwner) {
mChromeTreeOwner->XULWindow(nsnull);
NS_RELEASE(mChromeTreeOwner);
}
if(mWindow) {
if (mWindow) {
mWindow->SetClientData(0); // nsWebShellWindow hackery
mWindow = nsnull;
}
@ -622,20 +622,20 @@ NS_IMETHODIMP nsXULWindow::GetPositionAndSize(PRInt32* x, PRInt32* y, PRInt32* c
mWindow->GetScreenBounds(rect);
if(x)
if (x)
*x = rect.x;
if(y)
if (y)
*y = rect.y;
if(cx)
if (cx)
*cx = rect.width;
if(cy)
if (cy)
*cy = rect.height;
return NS_OK;
}
NS_IMETHODIMP nsXULWindow::Center(nsIXULWindow *aRelative, PRBool aScreen, PRBool aAlert) {
NS_IMETHODIMP nsXULWindow::Center(nsIXULWindow *aRelative, PRBool aScreen, PRBool aAlert)
{
PRInt32 left, top, width, height,
ourWidth, ourHeight;
PRBool screenCoordinates = PR_FALSE,
@ -866,7 +866,7 @@ NS_IMETHODIMP nsXULWindow::SetTitle(const PRUnichar* aTitle)
// Tell the window mediator that a title has changed
nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
if(!windowMediator)
if (!windowMediator)
return NS_OK;
windowMediator->UpdateWindowTitle(static_cast<nsIXULWindow*>(this), aTitle);
@ -964,12 +964,12 @@ void nsXULWindow::OnChromeLoaded()
LoadWindowClassFromXUL();
LoadIconFromXUL();
LoadSizeFromXUL();
if(mIntrinsicallySized) {
if (mIntrinsicallySized) {
// (if LoadSizeFromXUL set the size, mIntrinsicallySized will be false)
nsCOMPtr<nsIContentViewer> cv;
mDocShell->GetContentViewer(getter_AddRefs(cv));
nsCOMPtr<nsIMarkupDocumentViewer> markupViewer(do_QueryInterface(cv));
if(markupViewer)
if (markupViewer)
markupViewer->SizeToContent();
}
@ -991,7 +991,7 @@ void nsXULWindow::OnChromeLoaded()
if (mCenterAfterLoad && !positionSet)
Center(parentWindow, parentWindow ? PR_FALSE : PR_TRUE, PR_FALSE);
if(mShowAfterLoad)
if (mShowAfterLoad)
SetVisibility(PR_TRUE);
}
mPersistentAttributesMask |= PAD_POSITION | PAD_SIZE | PAD_MISC;
@ -1420,7 +1420,7 @@ NS_IMETHODIMP nsXULWindow::SavePersistentAttributes()
nsCOMPtr<nsIDOMElement> docShellElement;
GetWindowDOMElement(getter_AddRefs(docShellElement));
if(!docShellElement)
if (!docShellElement)
return NS_ERROR_FAILURE;
nsAutoString persistString;
@ -1464,14 +1464,14 @@ NS_IMETHODIMP nsXULWindow::SavePersistentAttributes()
// (only for size elements which are persisted)
if ((mPersistentAttributesDirty & PAD_POSITION) &&
sizeMode == nsSizeMode_Normal) {
if(persistString.Find("screenX") >= 0) {
if (persistString.Find("screenX") >= 0) {
PR_snprintf(sizeBuf, sizeof(sizeBuf), "%ld", (long)x);
sizeString.AssignWithConversion(sizeBuf);
docShellElement->SetAttribute(SCREENX_ATTRIBUTE, sizeString);
if (ownerXULDoc) // force persistence in case the value didn't change
ownerXULDoc->Persist(windowElementId, SCREENX_ATTRIBUTE);
}
if(persistString.Find("screenY") >= 0) {
if (persistString.Find("screenY") >= 0) {
PR_snprintf(sizeBuf, sizeof(sizeBuf), "%ld", (long)y);
sizeString.AssignWithConversion(sizeBuf);
docShellElement->SetAttribute(SCREENY_ATTRIBUTE, sizeString);
@ -1482,14 +1482,14 @@ NS_IMETHODIMP nsXULWindow::SavePersistentAttributes()
if ((mPersistentAttributesDirty & PAD_SIZE) &&
sizeMode == nsSizeMode_Normal) {
if(persistString.Find("width") >= 0) {
if (persistString.Find("width") >= 0) {
PR_snprintf(sizeBuf, sizeof(sizeBuf), "%ld", (long)cx);
sizeString.AssignWithConversion(sizeBuf);
docShellElement->SetAttribute(WIDTH_ATTRIBUTE, sizeString);
if (ownerXULDoc)
ownerXULDoc->Persist(windowElementId, WIDTH_ATTRIBUTE);
}
if(persistString.Find("height") >= 0) {
if (persistString.Find("height") >= 0) {
PR_snprintf(sizeBuf, sizeof(sizeBuf), "%ld", (long)cy);
sizeString.AssignWithConversion(sizeBuf);
docShellElement->SetAttribute(HEIGHT_ATTRIBUTE, sizeString);
@ -1575,17 +1575,17 @@ NS_IMETHODIMP nsXULWindow::GetDOMElementById(char* aID, nsIDOMElement** aDOMElem
nsCOMPtr<nsIContentViewer> cv;
mDocShell->GetContentViewer(getter_AddRefs(cv));
if(!cv)
if (!cv)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocumentViewer> docv(do_QueryInterface(cv));
if(!docv)
if (!docv)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocument> doc;
docv->GetDocument(getter_AddRefs(doc));
nsCOMPtr<nsIDOMDocument> domdoc(do_QueryInterface(doc));
if(!domdoc)
if (!domdoc)
return NS_ERROR_FAILURE;
NS_ENSURE_SUCCESS(domdoc->GetElementById(NS_ConvertASCIItoUTF16(aID), aDOMElement), NS_ERROR_FAILURE);
@ -1758,7 +1758,7 @@ NS_IMETHODIMP nsXULWindow::CreateNewChromeWindow(PRInt32 aChromeFlags,
// Just do a normal create of a window and return.
//XXXTAB remove this when appshell talks in terms of nsIXULWindow
nsCOMPtr<nsIXULWindow> parent;
if(aChromeFlags & nsIWebBrowserChrome::CHROME_DEPENDENT)
if (aChromeFlags & nsIWebBrowserChrome::CHROME_DEPENDENT)
parent = this;
nsCOMPtr<nsIXULWindow> newWindow;
@ -1862,12 +1862,11 @@ void nsXULWindow::EnableParent(PRBool aEnable)
}
// Constrain the window to its proper z-level
PRBool nsXULWindow::ConstrainToZLevel(
PRBool aImmediate,
nsWindowZ *aPlacement,
nsIWidget *aReqBelow,
nsIWidget **aActualBelow) {
PRBool nsXULWindow::ConstrainToZLevel(PRBool aImmediate,
nsWindowZ *aPlacement,
nsIWidget *aReqBelow,
nsIWidget **aActualBelow)
{
#if 0
/* Do we have a parent window? This means our z-order is already constrained,
since we're a dependent window. Our window list isn't hierarchical,
@ -1879,7 +1878,7 @@ PRBool nsXULWindow::ConstrainToZLevel(
#endif
nsCOMPtr<nsIWindowMediator> mediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
if(!mediator)
if (!mediator)
return PR_FALSE;
PRBool altered;
@ -1900,7 +1899,6 @@ PRBool nsXULWindow::ConstrainToZLevel(
if (NS_SUCCEEDED(mediator->CalculateZPosition(us, position, aReqBelow,
&newPosition, aActualBelow, &altered))) {
/* If we were asked to move to the top but constrained to remain
below one of our other windows, first move all windows in that
window's layer and above to the top. This allows the user to
@ -1909,8 +1907,7 @@ PRBool nsXULWindow::ConstrainToZLevel(
if (altered &&
(position == nsIWindowMediator::zLevelTop ||
position == nsIWindowMediator::zLevelBelow && aReqBelow == 0))
PlaceWindowLayersBehind(zLevel+1, nsIXULWindow::highestZ, 0);
PlaceWindowLayersBehind(zLevel + 1, nsIXULWindow::highestZ, 0);
if (*aPlacement != nsWindowZBottom &&
position == nsIWindowMediator::zLevelBottom)
@ -1935,7 +1932,7 @@ PRBool nsXULWindow::ConstrainToZLevel(
}
}
/* (CalculateZPosition can tell us to be below nothing, because it tries
/* CalculateZPosition can tell us to be below nothing, because it tries
not to change something it doesn't recognize. A request to verify
being below an unrecognized window, then, is treated as a request
to come to the top (below null) */
@ -1964,12 +1961,12 @@ PRBool nsXULWindow::ConstrainToZLevel(
*/
void nsXULWindow::PlaceWindowLayersBehind(PRUint32 aLowLevel,
PRUint32 aHighLevel,
nsIXULWindow *aBehind) {
nsIXULWindow *aBehind)
{
// step through windows in z-order from top to bottommost window
nsCOMPtr<nsIWindowMediator> mediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
if(!mediator)
if (!mediator)
return;
nsCOMPtr<nsISimpleEnumerator> windowEnumerator;