Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=433340 backing out for linux test failure

Browse Source
This commit is contained in:
masayuki@d-toybox.com 2008-05-23 04:41:04 -07:00
parent aa70d206a0
commit 2cf410d412
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/base/src/nsGkAtomList.h
View File

@ -856,7 +856,6 @@ GK_ATOM(tooltip, "tooltip")
GK_ATOM(tooltiptext, "tooltiptext")
GK_ATOM(top, "top")
GK_ATOM(topmargin, "topmargin")
GK_ATOM(topmost, "topmost")
GK_ATOM(toppadding, "toppadding")
GK_ATOM(tr, "tr")
GK_ATOM(trailing, "trailing")

23
layout/xul/base/src/nsMenuPopupFrame.cpp
View File

@ -189,21 +189,6 @@ nsMenuPopupFrame::IsNoAutoHide()
nsGkAtoms::_true, eIgnoreCase));
}
PRBool
nsMenuPopupFrame::IsTopMost()
{
// If this popup is not a panel, this is always a topmost popup.
if (mPopupType != ePopupTypePanel)
return PR_TRUE;
// Web pages should not be able to create a topmost panel. If this panel is
// a noautohide panel, it should appear just above the parent window.
if (mInContentShell || IsNoAutoHide())
return PR_FALSE;
// Otherwise, check the topmost attribute.
return mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::topmost,
nsGkAtoms::_true, eIgnoreCase);
}
void
nsMenuPopupFrame::EnsureWidget()
{
@ -233,11 +218,11 @@ nsMenuPopupFrame::CreateWidgetForView(nsIView* aView)
tag = parentContent->Tag();
widgetData.mDropShadow = !(viewHasTransparentContent || tag == nsGkAtoms::menulist);
// panels which are not topmost need a parent widget. This allows them to
// always appear in front of the parent window but behind other windows that
// should be in front of it.
// panels which don't auto-hide need a parent widget. This allows them
// to always appear in front of the parent window but behind other windows
// that should be in front of it.
nsCOMPtr<nsIWidget> parentWidget;
if (!IsTopMost()) {
if (IsNoAutoHide()) {
nsCOMPtr<nsISupports> cont = PresContext()->GetContainer();
nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(cont);
if (!dsti)

4
layout/xul/base/src/nsMenuPopupFrame.h
View File

@ -180,10 +180,6 @@ public:
// true. These panels do not roll up automatically.
PRBool IsNoAutoHide();
// returns true if the popup is a top-most window. Otherwise, the
// panel appears in front of the parent window.
PRBool IsTopMost();
void EnsureWidget();
virtual nsresult CreateWidgetForView(nsIView* aView);