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

Backed out changeset ca723ddedfe5 (bug 1262930) for being the likely cause of android m(3) crashes CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2016-07-20 11:56:59 -07:00
parent e2d9911273
commit d95537ea88
3 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dom/base/nsGlobalWindow.cpp
View File

@ -3692,38 +3692,6 @@ nsPIDOMWindow<T>::MaybeCreateDoc()
}
}
void
nsPIDOMWindowOuter::SetInitialKeyboardIndicators(
UIStateChangeType aShowAccelerators, UIStateChangeType aShowFocusRings)
{
MOZ_ASSERT(IsOuterWindow());
MOZ_ASSERT(!GetCurrentInnerWindow());
nsPIDOMWindowOuter* piWin = GetPrivateRoot();
if (!piWin) {
return;
}
MOZ_ASSERT(piWin == AsOuter());
// only change the flags that have been modified
nsCOMPtr<nsPIWindowRoot> windowRoot = do_QueryInterface(mChromeEventHandler);
if (!windowRoot) {
return;
}
if (aShowAccelerators != UIStateChangeType_NoChange) {
windowRoot->SetShowAccelerators(aShowAccelerators == UIStateChangeType_Set);
}
if (aShowFocusRings != UIStateChangeType_NoChange) {
windowRoot->SetShowFocusRings(aShowFocusRings == UIStateChangeType_Set);
}
nsContentUtils::SetKeyboardIndicatorsOnRemoteChildren(GetOuterWindow(),
aShowAccelerators,
aShowFocusRings);
}
Element*
nsPIDOMWindowOuter::GetFrameElementInternal() const
{

8
dom/base/nsPIDOMWindow.h
View File

@ -321,7 +321,7 @@ public:
{
return mMayHavePaintEventListener;
}
/**
* Call this to indicate that some node (this window, its document,
* or content in that document) has a touch event listener.
@ -847,12 +847,6 @@ public:
return GetCurrentInnerWindow();
}
/**
* Set initial keyboard indicator state for accelerators and focus rings.
*/
void SetInitialKeyboardIndicators(UIStateChangeType aShowAccelerators,
UIStateChangeType aShowFocusRings);
// Internal getter/setter for the frame element, this version of the
// getter crosses chrome boundaries whereas the public scriptable
// one doesn't for security reasons.

2
dom/ipc/TabChild.cpp
View File

@ -843,7 +843,7 @@ TabChild::Init()
do_QueryInterface(window->GetChromeEventHandler());
docShell->SetChromeEventHandler(chromeHandler);
window->SetInitialKeyboardIndicators(ShowAccelerators(), ShowFocusRings());
window->SetKeyboardIndicators(ShowAccelerators(), ShowFocusRings());
// Set prerender flag if necessary.
if (mIsPrerendered) {