Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 434458, add null checks to popup box object methods, r=smaug,sr=dbaron

Browse Source
This commit is contained in:
Neil Deakin 2008-08-18 13:58:13 -04:00
parent 910df08dc8
commit b93c7c1776
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
layout/xul/base/src/crashtests/crashtests.list
View File

@ -26,3 +26,4 @@ load 408904-1.xul
load 412479-1.xhtml
load 430356-1.xhtml
load 431738.xhtml
load 434458-1.xul

16
layout/xul/base/src/nsPopupBoxObject.cpp
View File

@ -89,7 +89,7 @@ NS_IMETHODIMP
nsPopupBoxObject::HidePopup()
{
nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
if (pm)
if (pm && mContent)
pm->HidePopup(mContent, PR_FALSE, PR_TRUE, PR_FALSE);
return NS_OK;
@ -107,7 +107,7 @@ nsPopupBoxObject::ShowPopup(nsIDOMElement* aAnchorElement,
// srcContent can be null.
nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
if (pm) {
if (pm && mContent) {
nsCOMPtr<nsIContent> anchorContent(do_QueryInterface(aAnchorElement));
nsAutoString popupType(aPopupType);
nsAutoString anchor(aAnchorAlignment);
@ -127,7 +127,7 @@ nsPopupBoxObject::OpenPopup(nsIDOMElement* aAnchorElement,
PRBool aAttributesOverride)
{
nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
if (pm) {
if (pm && mContent) {
nsCOMPtr<nsIContent> anchorContent(do_QueryInterface(aAnchorElement));
pm->ShowPopup(mContent, anchorContent, aPosition, aXPos, aYPos,
aIsContextMenu, aAttributesOverride, PR_FALSE, nsnull);
@ -140,7 +140,7 @@ NS_IMETHODIMP
nsPopupBoxObject::OpenPopupAtScreen(PRInt32 aXPos, PRInt32 aYPos, PRBool aIsContextMenu)
{
nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
if (pm)
if (pm && mContent)
pm->ShowPopupAtScreen(mContent, aXPos, aYPos, aIsContextMenu, nsnull);
return NS_OK;
}
@ -159,6 +159,9 @@ nsPopupBoxObject::MoveTo(PRInt32 aLeft, PRInt32 aTop)
NS_IMETHODIMP
nsPopupBoxObject::SizeTo(PRInt32 aWidth, PRInt32 aHeight)
{
if (!mContent)
return NS_OK;
nsAutoString width, height;
width.AppendInt(aWidth);
height.AppendInt(aHeight);
@ -195,7 +198,7 @@ nsPopupBoxObject::SetAutoPosition(PRBool aShouldAutoPosition)
NS_IMETHODIMP
nsPopupBoxObject::EnableRollup(PRBool aShouldRollup)
{
// this does nothing nows
// this does nothing now
return NS_OK;
}
@ -213,6 +216,9 @@ nsPopupBoxObject::SetConsumeRollupEvent(PRUint32 aConsume)
NS_IMETHODIMP
nsPopupBoxObject::EnableKeyboardNavigator(PRBool aEnableKeyboardNavigator)
{
if (!mContent)
return NS_OK;
// Use ignorekeys="true" on the popup instead of using this function.
if (aEnableKeyboardNavigator)
mContent->UnsetAttr(kNameSpaceID_None, nsGkAtoms::ignorekeys, PR_TRUE);