Skip to content

Commit

Permalink
68.14.4 bugfix version
Browse files Browse the repository at this point in the history
  • Loading branch information
Fedor committed Aug 3, 2024
1 parent 48cfaac commit 1b3a309
Show file tree
Hide file tree
Showing 239 changed files with 7,010 additions and 5,694 deletions.
12 changes: 3 additions & 9 deletions accessible/aom/AccessibleNode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "mozilla/dom/AccessibleNodeBinding.h"
#include "mozilla/dom/BindingDeclarations.h"
#include "mozilla/dom/DOMStringList.h"
#include "mozilla/StaticPrefs_accessibility.h"
#include "nsIPersistentProperties2.h"
#include "nsISimpleEnumerator.h"

Expand All @@ -18,15 +19,8 @@ using namespace mozilla::a11y;
using namespace mozilla::dom;

bool AccessibleNode::IsAOMEnabled(JSContext* aCx, JSObject* /*unused*/) {
static bool sPrefCached = false;
static bool sPrefCacheValue = false;

if (!sPrefCached) {
sPrefCached = true;
Preferences::AddBoolVarCache(&sPrefCacheValue, "accessibility.AOM.enabled");
}

return nsContentUtils::IsSystemCaller(aCx) || sPrefCacheValue;
return nsContentUtils::IsSystemCaller(aCx) ||
StaticPrefs::accessibility_AOM_enabled();
}

NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(AccessibleNode, mRelationProperties,
Expand Down
94 changes: 57 additions & 37 deletions browser/actors/ContextMenuChild.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ class ContextMenuChild extends ActorChild {
// The same-origin check will be done in nsContextMenu.openLinkInTab.
let parentAllowsMixedContent = !!this.docShell.mixedContentChannel;

let disableSetDesktopBackground = null;
let disableSetDesktopBg = null;

// Media related cache info parent needs for saving
let contentType = null;
Expand All @@ -544,7 +544,7 @@ class ContextMenuChild extends ActorChild {
aEvent.composedTarget instanceof Ci.nsIImageLoadingContent &&
aEvent.composedTarget.currentURI
) {
disableSetDesktopBackground = this._disableSetDesktopBackground(
disableSetDesktopBg = this._disableSetDesktopBackground(
aEvent.composedTarget
);

Expand Down Expand Up @@ -590,7 +590,6 @@ class ContextMenuChild extends ActorChild {
Ci.nsIReferrerInfo
);
referrerInfo.initWithElement(aEvent.composedTarget);
referrerInfo = E10SUtils.serializeReferrerInfo(referrerInfo);

// In the case "onLink" we may have to send link referrerInfo to use in
// _openLinkInParameters
Expand All @@ -607,33 +606,40 @@ class ContextMenuChild extends ActorChild {
this._cleanContext();
}

editFlags = SpellCheckHelper.isEditable(
aEvent.composedTarget,
this.content
);
let isRemote =
Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT;

if (editFlags & SpellCheckHelper.SPELLCHECKABLE) {
spellInfo = InlineSpellCheckerContent.initContextMenu(
aEvent,
editFlags,
this
if (isRemote) {
editFlags = SpellCheckHelper.isEditable(
aEvent.composedTarget,
this.content
);
}

// Set the event target first as the copy image command needs it to
// determine what was context-clicked on. Then, update the state of the
// commands on the context menu.
this.docShell.contentViewer
.QueryInterface(Ci.nsIContentViewerEdit)
.setCommandNode(aEvent.composedTarget);
aEvent.composedTarget.ownerGlobal.updateCommands("contentcontextmenu");
if (editFlags & SpellCheckHelper.SPELLCHECKABLE) {
spellInfo = InlineSpellCheckerContent.initContextMenu(
aEvent,
editFlags,
this.mm
);
}

// Set the event target first as the copy image command needs it to
// determine what was context-clicked on. Then, update the state of the
// commands on the context menu.
this.docShell.contentViewer
.QueryInterface(Ci.nsIContentViewerEdit)
.setCommandNode(aEvent.composedTarget);
aEvent.composedTarget.ownerGlobal.updateCommands("contentcontextmenu");

principal = doc.nodePrincipal;
customMenuItems = PageMenuChild.build(aEvent.composedTarget);
principal = doc.nodePrincipal;
}

let data = {
context,
charSet,
baseURI,
isRemote,
referrerInfo,
editFlags,
principal,
Expand All @@ -647,37 +653,51 @@ class ContextMenuChild extends ActorChild {
contentDisposition,
frameOuterWindowID,
popupNodeSelectors,
disableSetDesktopBackground,
disableSetDesktopBg,
parentAllowsMixedContent,
};

if (context.inFrame && !context.inSrcdocFrame) {
data.frameReferrerInfo = E10SUtils.serializeReferrerInfo(
doc.referrerInfo
);
}

if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
data.customMenuItems = PageMenuChild.build(aEvent.composedTarget);
if (isRemote) {
data.frameReferrerInfo = E10SUtils.serializeReferrerInfo(
doc.referrerInfo
);
} else {
data.frameReferrerInfo = doc.referrerInfo;
}
}

if (linkReferrerInfo) {
data.linkReferrerInfo = E10SUtils.serializeReferrerInfo(linkReferrerInfo);
if (isRemote) {
data.linkReferrerInfo = E10SUtils.serializeReferrerInfo(linkReferrerInfo);
} else {
data.linkReferrerInfo = linkReferrerInfo;
}
}

Services.obs.notifyObservers(
{ wrappedJSObject: data },
"on-prepare-contextmenu"
);

// In the event that the content is running in the parent process, we don't
// actually want the contextmenu events to reach the parent - we'll dispatch
// a new contextmenu event after the async message has reached the parent
// instead.
aEvent.preventDefault();
aEvent.stopPropagation();
if (isRemote) {
data.referrerInfo = E10SUtils.serializeReferrerInfo(data.referrerInfo);
if (data.frameReferrerInfo) {
data.frameReferrerInfo =
E10SUtils.serializeReferrerInfo(data.frameReferrerInfo);
}

this.mm.sendAsyncMessage("contextmenu", data);
this.mm.sendAsyncMessage("contextmenu", data);
} else {
let browser = this.docShell.chromeEventHandler;
let mainWin = browser.ownerGlobal;

data.documentURIObject = doc.documentURIObject;
data.disableSetDesktopBackground = data.disableSetDesktopBg;
delete data.disableSetDesktopBg;

mainWin.setContextMenuContentData(data);
}
}

/**
Expand Down
7 changes: 1 addition & 6 deletions browser/actors/PluginChild.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -958,9 +958,9 @@ class PluginChild extends ActorChild {
plugins: [...this.pluginData.values()],
showNow,
location,
principal,
},
null,
principal
);
}

Expand Down Expand Up @@ -1221,10 +1221,5 @@ class PluginChild extends ActorChild {
messageString,
pluginID,
});

// Remove the notification when the page is reloaded.
doc.defaultView.top.addEventListener("unload", event => {
this.hideNotificationBar("plugin-crashed");
});
}
}
23 changes: 0 additions & 23 deletions browser/app/profile/mypal.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,6 @@ pref("extensions.update.interval", 86400); // Check for updates to Extensions a

pref("lightweightThemes.getMoreURL", "data:text/plain,");

#if defined(MOZ_WIDEVINE_EME)
pref("browser.eme.ui.enabled", true);
#else
pref("browser.eme.ui.enabled", false);
#endif

pref("keyword.enabled", false);
pref("browser.fixup.domainwhitelist.localhost", true);

Expand Down Expand Up @@ -676,9 +670,6 @@ pref("plugin.defaultXpi.state", 2);
pref("plugin.state.flash", 1);
#endif

// Enables the download and use of the flash blocklists.
pref("plugins.flashBlock.enabled", true);

// Prefer HTML5 video over Flash content, and don't
// load plugin instances with no src declared.
// These prefs are documented in details on all.js.
Expand Down Expand Up @@ -938,14 +929,6 @@ pref("browser.bookmarks.editDialog.showForNewBookmarks", true);
// bookmarking dialog
pref("browser.bookmarks.editDialog.firstEditField", "namePicker");

pref("dom.ipc.plugins.flash.disable-protected-mode", false);

// Feature-disable the protected-mode auto-flip
pref("browser.flash-protected-mode-flip.enable", false);

// Whether we've already flipped protected mode automatically
pref("browser.flash-protected-mode-flip.done", false);

pref("dom.ipc.shims.enabledWarnings", false);

#if defined(XP_WIN) && defined(MOZ_SANDBOX)
Expand Down Expand Up @@ -1156,7 +1139,6 @@ pref("services.sync.prefs.sync.extensions.activeThemeID", true);
pref("services.sync.prefs.sync.intl.accept_languages", true);
pref("services.sync.prefs.sync.layout.spellcheckDefault", true);
pref("services.sync.prefs.sync.media.autoplay.default", true);
pref("services.sync.prefs.sync.media.eme.enabled", true);
pref("services.sync.prefs.sync.network.cookie.cookieBehavior", true);
pref("services.sync.prefs.sync.network.cookie.lifetimePolicy", true);
pref("services.sync.prefs.sync.network.cookie.thirdparty.sessionOnly", true);
Expand Down Expand Up @@ -1389,11 +1371,6 @@ pref("media.gmp.trial-create.enabled", true);
// to enable the CDM if its disabled; it's as if the keysystem is completely
// unsupported.

#ifdef MOZ_WIDEVINE_EME
pref("media.gmp-widevinecdm.visible", true);
pref("media.gmp-widevinecdm.enabled", true);
#endif

pref("media.gmp-gmpopenh264.visible", true);
pref("media.gmp-gmpopenh264.enabled", true);

Expand Down
8 changes: 0 additions & 8 deletions browser/base/content/browser-context.inc
Original file line number Diff line number Diff line change
Expand Up @@ -448,11 +448,3 @@
hidden="true"
label="&inspectA11YContextMenu.label;"
oncommand="gContextMenu.inspectA11Y();"/>
<menuseparator id="context-media-eme-separator" hidden="true"/>
<menuitem id="context-media-eme-learnmore"
class="menuitem-iconic"
hidden="true"
label="&emeLearnMoreContextMenu.label;"
accesskey="&emeLearnMoreContextMenu.accesskey;"
oncommand="gContextMenu.drmLearnMore(event);"
onclick="checkForMiddleClick(this, event);"/>
Loading

0 comments on commit 1b3a309

Please sign in to comment.