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

Bug 1684001 - IsURIInPrefList should be infallible. r=masayuki

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D107455
This commit is contained in:
Emilio Cobos Álvarez 2021-03-08 23:36:40 +00:00
parent 3505b7d66e
commit 7dac28d4c1
2 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
caps/nsIPrincipal.idl
View File

@ -308,22 +308,15 @@ interface nsIPrincipal : nsISerializable
*
* @param scheme The scheme to be checked
*/
[infallible]
boolean schemeIs(in string scheme);
// Nicer, C++ Callable Version of SchemeIs
%{C++
inline bool SchemeIs(const char* aScheme) {
bool ret;
SchemeIs(aScheme, &ret);
return ret;
}
%}
/*
* Checks if the Principal's URI is contained in the given Pref
* @param pref The pref to be checked
*/
bool isURIInPrefList(in string pref);
* Checks if the Principal's URI is contained in the given Pref
* @param pref The pref to be checked
*/
[infallible]
boolean isURIInPrefList(in string pref);
/*
* Uses NS_Security Compare to determine if the

50
layout/base/PresShell.cpp
View File

@ -8641,41 +8641,25 @@ nsresult PresShell::EventHandler::DispatchEventToDOM(
// behave so, however, some web apps may be broken. On such web apps,
// we should keep using legacy our behavior.
if (!mPresShell->mInitializedWithKeyPressEventDispatchingBlacklist) {
bool isInPrefList = false;
mPresShell->mInitializedWithKeyPressEventDispatchingBlacklist = true;
nsCOMPtr<nsIPrincipal> principal =
GetDocumentPrincipalToCompareWithBlacklist(*mPresShell);
if (principal) {
principal->IsURIInPrefList(
"dom.keyboardevent.keypress.hack.dispatch_non_printable_keys",
&isInPrefList);
mPresShell->mForceDispatchKeyPressEventsForNonPrintableKeys =
isInPrefList;
principal->IsURIInPrefList(
"dom.keyboardevent.keypress.hack.dispatch_non_printable_"
"keys") ||
principal->IsURIInPrefList(
"dom.keyboardevent.keypress.hack."
"dispatch_non_printable_keys.addl");
principal->IsURIInPrefList(
"dom.keyboardevent.keypress.hack."
"dispatch_non_printable_keys.addl",
&isInPrefList);
mPresShell->mForceDispatchKeyPressEventsForNonPrintableKeys |=
isInPrefList;
principal->IsURIInPrefList(
"dom.keyboardevent.keypress.hack."
"use_legacy_keycode_and_charcode",
&isInPrefList);
mPresShell->mForceUseLegacyKeyCodeAndCharCodeValues |= isInPrefList;
principal->IsURIInPrefList(
"dom.keyboardevent.keypress.hack."
"use_legacy_keycode_and_charcode",
&isInPrefList);
mPresShell->mForceUseLegacyKeyCodeAndCharCodeValues |= isInPrefList;
principal->IsURIInPrefList(
"dom.keyboardevent.keypress.hack."
"use_legacy_keycode_and_charcode.addl",
&isInPrefList);
mPresShell->mForceUseLegacyKeyCodeAndCharCodeValues |= isInPrefList;
mPresShell->mForceUseLegacyKeyCodeAndCharCodeValues |=
principal->IsURIInPrefList(
"dom.keyboardevent.keypress.hack."
"use_legacy_keycode_and_charcode") ||
principal->IsURIInPrefList(
"dom.keyboardevent.keypress.hack."
"use_legacy_keycode_and_charcode.addl");
}
}
if (mPresShell->mForceDispatchKeyPressEventsForNonPrintableKeys) {
@ -8699,11 +8683,9 @@ nsresult PresShell::EventHandler::DispatchEventToDOM(
GetDocumentPrincipalToCompareWithBlacklist(*mPresShell);
if (principal) {
bool isInPrefList = false;
principal->IsURIInPrefList(
"dom.mouseevent.click.hack.use_legacy_non-primary_dispatch",
&isInPrefList);
mPresShell->mForceUseLegacyNonPrimaryDispatch = isInPrefList;
mPresShell->mForceUseLegacyNonPrimaryDispatch =
principal->IsURIInPrefList(
"dom.mouseevent.click.hack.use_legacy_non-primary_dispatch");
}
}
if (mPresShell->mForceUseLegacyNonPrimaryDispatch) {