nsMenuFrame.cpp (palemoon-29.4.1-source.tar.xz) | : | nsMenuFrame.cpp (palemoon-29.4.2-source.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 1276 | skipping to change at line 1276 | |||
new nsXULMenuCommandEvent(mContent, isTrusted, shift, control, alt, meta, | new nsXULMenuCommandEvent(mContent, isTrusted, shift, control, alt, meta, | |||
userinput, aFlipChecked); | userinput, aFlipChecked); | |||
} | } | |||
void | void | |||
nsMenuFrame::PassMenuCommandEventToPopupManager() | nsMenuFrame::PassMenuCommandEventToPopupManager() | |||
{ | { | |||
nsXULPopupManager* pm = nsXULPopupManager::GetInstance(); | nsXULPopupManager* pm = nsXULPopupManager::GetInstance(); | |||
nsMenuParent* menuParent = GetMenuParent(); | nsMenuParent* menuParent = GetMenuParent(); | |||
if (pm && menuParent && mDelayedMenuCommandEvent) { | if (pm && menuParent && mDelayedMenuCommandEvent) { | |||
pm->ExecuteMenu(mContent, mDelayedMenuCommandEvent); | nsCOMPtr<nsIContent> content = mContent; | |||
RefPtr<nsXULMenuCommandEvent> event = mDelayedMenuCommandEvent; | ||||
pm->ExecuteMenu(content, event); | ||||
} | } | |||
mDelayedMenuCommandEvent = nullptr; | mDelayedMenuCommandEvent = nullptr; | |||
} | } | |||
void | void | |||
nsMenuFrame::RemoveFrame(ChildListID aListID, | nsMenuFrame::RemoveFrame(ChildListID aListID, | |||
nsIFrame* aOldFrame) | nsIFrame* aOldFrame) | |||
{ | { | |||
nsFrameList* popupList = GetPopupList(); | nsFrameList* popupList = GetPopupList(); | |||
if (popupList && popupList->FirstChild() == aOldFrame) { | if (popupList && popupList->FirstChild() == aOldFrame) { | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 3 lines changed or added |