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

Backed out changeset d4e94246b3b4 (bug 1274868) for wrong reviewer name

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-06-30 06:32:37 +02:00
parent 7d0789d464
commit d8d1e0b986
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/xul/nsMenuBarFrame.cpp
View File

@ -85,8 +85,6 @@ nsMenuBarFrame::Init(nsIContent* aContent,
mTarget->AddEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, true);
mTarget->AddEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, false);
mTarget->AddEventListener(NS_LITERAL_STRING("blur"), mMenuBarListener, true);
mTarget->AddEventListener(NS_LITERAL_STRING("MozDOMFullscreen:Entered"), mMenuBarListener, false);
}
NS_IMETHODIMP
@ -425,8 +423,6 @@ nsMenuBarFrame::DestroyFrom(nsIFrame* aDestructRoot)
mTarget->RemoveEventListener(NS_LITERAL_STRING("mousedown"), mMenuBarListener, false);
mTarget->RemoveEventListener(NS_LITERAL_STRING("blur"), mMenuBarListener, true);
mTarget->RemoveEventListener(NS_LITERAL_STRING("MozDOMFullscreen:Entered"), mMenuBarListener, false);
mMenuBarListener->OnDestroyMenuBarFrame();
mMenuBarListener = nullptr;

14
layout/xul/nsMenuBarListener.cpp
View File

@ -403,17 +403,6 @@ nsMenuBarListener::MouseDown(nsIDOMEvent* aMouseEvent)
return NS_OK; // means I am NOT consuming event
}
////////////////////////////////////////////////////////////////////////
nsresult
nsMenuBarListener::Fullscreen(nsIDOMEvent* aEvent)
{
if (mMenuBarFrame->IsActive()) {
ToggleMenuActiveState();
}
return NS_OK;
}
////////////////////////////////////////////////////////////////////////
nsresult
nsMenuBarListener::HandleEvent(nsIDOMEvent* aEvent)
@ -444,9 +433,6 @@ nsMenuBarListener::HandleEvent(nsIDOMEvent* aEvent)
if (eventType.EqualsLiteral("mousedown")) {
return MouseDown(aEvent);
}
if (eventType.EqualsLiteral("MozDOMFullscreen:Entered")) {
return Fullscreen(aEvent);
}
NS_ABORT();

1
layout/xul/nsMenuBarListener.h
View File

@ -35,7 +35,6 @@ public:
nsresult KeyPress(nsIDOMEvent* aMouseEvent);
nsresult Blur(nsIDOMEvent* aEvent);
nsresult MouseDown(nsIDOMEvent* aMouseEvent);
nsresult Fullscreen(nsIDOMEvent* aEvent);
static nsresult GetMenuAccessKey(int32_t* aAccessKey);