Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1643618 - Stylistic fixes for bug 1634363. r=NeilDeakin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D78464
This commit is contained in:
Henri Sivonen 2020-06-08 11:13:38 +00:00
parent 8601daefcb
commit 0f71e396be
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dom/base/nsFocusManager.cpp
View File

@ -287,13 +287,13 @@ Element* nsFocusManager::GetFocusedDescendant(
nsPIDOMWindowOuter* aWindow, SearchRange aSearchRange,
nsPIDOMWindowOuter** aFocusedWindow) {
bool ignored;
return GetFocusedDescendant(aWindow, &ignored, aSearchRange, aFocusedWindow);
return GetFocusedDescendant(aWindow, aSearchRange, &ignored, aFocusedWindow);
}
// static
Element* nsFocusManager::GetFocusedDescendant(
nsPIDOMWindowOuter* aWindow, bool* aFocusIsOutOfProcess,
SearchRange aSearchRange, nsPIDOMWindowOuter** aFocusedWindow) {
nsPIDOMWindowOuter* aWindow, SearchRange aSearchRange,
bool* aFocusIsOutOfProcess, nsPIDOMWindowOuter** aFocusedWindow) {
NS_ENSURE_TRUE(aWindow, nullptr);
*aFocusIsOutOfProcess = false;
@ -736,11 +736,12 @@ nsFocusManager::WindowRaised(mozIDOMWindowProxy* aWindow) {
nsCOMPtr<nsPIDOMWindowOuter> currentWindow;
bool focusInOtherContentProcess = false;
RefPtr<Element> currentFocus = GetFocusedDescendant(
window, &focusInOtherContentProcess, eIncludeAllDescendants,
window, eIncludeAllDescendants, &focusInOtherContentProcess,
getter_AddRefs(currentWindow));
// Keep mochitest-browser-chrome harness happy by ignoring
// focusInOtherContentProcess in the chrome process.
// focusInOtherContentProcess in the chrome process, because
// the harness expects that.
if (XRE_IsParentProcess()) {
focusInOtherContentProcess = false;
}
@ -948,10 +949,12 @@ nsFocusManager::WindowShown(mozIDOMWindowProxy* aWindow, bool aNeedsFocus) {
nsCOMPtr<nsPIDOMWindowOuter> currentWindow;
bool focusInOtherContentProcess = false;
RefPtr<Element> currentFocus = GetFocusedDescendant(
window, &focusInOtherContentProcess, eIncludeAllDescendants,
window, eIncludeAllDescendants, &focusInOtherContentProcess,
getter_AddRefs(currentWindow));
// Keep the mochitest-browser-chrome harness happy.
// Keep mochitest-browser-chrome harness happy by ignoring
// focusInOtherContentProcess in the chrome process, because
// the harness expects that.
if (XRE_IsParentProcess()) {
focusInOtherContentProcess = false;
}
@ -1350,11 +1353,13 @@ void nsFocusManager::SetFocusInner(Element* aNewContent, int32_t aFlags,
if (subWindow) {
// XXX What if this is an out-of-process iframe?
// https://bugzilla.mozilla.org/show_bug.cgi?id=1613054
elementToFocus =
GetFocusedDescendant(subWindow, &focusInOtherContentProcess,
eIncludeAllDescendants, getter_AddRefs(newWindow));
elementToFocus = GetFocusedDescendant(subWindow, eIncludeAllDescendants,
&focusInOtherContentProcess,
getter_AddRefs(newWindow));
// Keep mochitest-browser-chrome happy.
// Keep mochitest-browser-chrome harness happy by ignoring
// focusInOtherContentProcess in the chrome process, because
// the harness expects that.
if (XRE_IsParentProcess()) {
focusInOtherContentProcess = false;
}

6
dom/base/nsFocusManager.h
View File

@ -169,7 +169,7 @@ class nsFocusManager final : public nsIFocusManager,
* aFocusedWindow may be still be set -- this means that the document is
* focused but no element within it is focused.
*
* aWindow, aFocusIsOutOfProcess aFocusedWindow must all be non-null.
* aWindow, aFocusIsOutOfProcess, aFocusedWindow must all be non-null.
*/
enum SearchRange {
// Return focused content in aWindow. So, aFocusedWindow is always aWindow.
@ -180,8 +180,8 @@ class nsFocusManager final : public nsIFocusManager,
eIncludeVisibleDescendants,
};
static mozilla::dom::Element* GetFocusedDescendant(
nsPIDOMWindowOuter* aWindow, bool* aFocusIsOutOfProcess,
SearchRange aSearchRange, nsPIDOMWindowOuter** aFocusedWindow);
nsPIDOMWindowOuter* aWindow, SearchRange aSearchRange,
bool* aFocusIsOutOfProcess, nsPIDOMWindowOuter** aFocusedWindow);
static mozilla::dom::Element* GetFocusedDescendant(
nsPIDOMWindowOuter* aWindow, SearchRange aSearchRange,
nsPIDOMWindowOuter** aFocusedWindow);