Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out my checkin from earlier (bug 130778), it seems to be the culprit for the Tp increase.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@117039 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%netscape.com
2002-03-21 07:33:51 +00:00
parent 2260b95730
commit 71a03d2a1d
20 changed files with 266 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/layout/style/nsCSSStyleSheet.cpp
View File

@@ -95,8 +95,8 @@
#include "nsQuickSort.h"
#ifdef MOZ_XUL
#include "nsIXULContent.h"
#include "nsIMenuParent.h"
#include "nsIMenuFrame.h"
#include "nsIDOMXULPopupElement.h"
#include "nsIDOMXULMenuBarElement.h"
#include "nsXULAtoms.h"
#endif
@@ -3327,22 +3327,20 @@ RuleProcessorData::RuleProcessorData(nsIPresContext* aPresContext,
(mContent->IsContentOfType(nsIContent::eXUL) &&
(mContentTag == nsXULAtoms::menuitem || mContentTag == nsXULAtoms::menu))) {
nsCOMPtr<nsIPresShell> shell;
mPresContext->GetShell(getter_AddRefs(shell));
if (shell) {
nsIFrame* optionFrame = nsnull;
nsIMenuFrame* itemFrame = nsnull;
shell->GetPrimaryFrameFor(mContent, &optionFrame);
if (optionFrame &&
NS_SUCCEEDED(CallQueryInterface(optionFrame, &itemFrame))) {
nsIMenuParent* menuParent;
itemFrame->GetMenuParent(&menuParent);
nsIMenuFrame* currentItemFrame = nsnull;
if (menuParent &&
NS_SUCCEEDED(menuParent->GetCurrentMenuItem(&currentItemFrame)) &&
currentItemFrame == itemFrame)
mIsMenuActive = PR_TRUE;
}
nsCOMPtr<nsIDOMElement> currentItem;
nsCOMPtr<nsIDOMXULPopupElement> popupEl = do_QueryInterface(mParentContent);
if (popupEl)
popupEl->GetActiveItem(getter_AddRefs(currentItem));
else {
nsCOMPtr<nsIDOMXULMenuBarElement> menubar = do_QueryInterface(mParentContent);
if (menubar)
menubar->GetActiveMenu(getter_AddRefs(currentItem));
}
if (currentItem) {
nsCOMPtr<nsIDOMElement> element = do_QueryInterface(mContent);
if (currentItem == element)
mIsMenuActive = PR_TRUE;
}
}
}