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

Backed out changeset 26a792be5ec3 (bug 1745720) for causing failures complaining about Event.cpp. CLOSED TREE

Browse Source
This commit is contained in:
Butkovits Atila 2022-01-13 03:19:10 +02:00
parent d6b8aba9b9
commit 60d2addde1
5 changed files with 43 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
browser/actors/ClickHandlerChild.jsm
View File

@ -3,12 +3,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var EXPORTED_SYMBOLS = ["ClickHandlerChild", "MiddleMousePasteHandlerChild"];
var EXPORTED_SYMBOLS = ["ClickHandlerChild"];
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
ChromeUtils.defineModuleGetter(
this,
@ -32,42 +29,13 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/BrowserUtils.jsm"
);
class MiddleMousePasteHandlerChild extends JSWindowActorChild {
handleEvent(clickEvent) {
if (
clickEvent.defaultPrevented ||
clickEvent.button != 1 ||
MiddleMousePasteHandlerChild.autoscrollEnabled
) {
return;
}
this.manager
.getActor("ClickHandler")
.handleClickEvent(
clickEvent,
/* is from middle mouse paste handler */ true
);
}
onProcessedClick(data) {
this.sendAsyncMessage("MiddleClickPaste", data);
}
}
XPCOMUtils.defineLazyPreferenceGetter(
MiddleMousePasteHandlerChild,
"autoscrollEnabled",
"general.autoScroll",
true
);
class ClickHandlerChild extends JSWindowActorChild {
handleEvent(wrapperEvent) {
this.handleClickEvent(wrapperEvent.sourceEvent);
}
handleClickEvent(event, isFromMiddleMousePasteHandler = false) {
if (event.defaultPrevented || event.button == 2) {
handleEvent(event) {
if (
event.defaultPrevented ||
event.button == 2 ||
(event.type == "click" && event.button == 1)
) {
return;
}
// Don't do anything on editable things, we shouldn't open links in
@ -139,7 +107,7 @@ class ClickHandlerChild extends JSWindowActorChild {
),
};
if (href && !isFromMiddleMousePasteHandler) {
if (href) {
try {
Services.scriptSecurityManager.checkLoadURIStrWithPrincipal(
principal,
@ -189,11 +157,12 @@ class ClickHandlerChild extends JSWindowActorChild {
}
this.sendAsyncMessage("Content:Click", json);
return;
}
// This might be middle mouse navigation, in which case pass this back:
if (!href && event.button == 1 && isFromMiddleMousePasteHandler) {
this.manager.getActor("MiddleMousePasteHandler").onProcessedClick(json);
// This might be middle mouse navigation.
if (event.button == 1) {
this.sendAsyncMessage("Content:Click", json);
}
}
}

31
browser/actors/ClickHandlerParent.jsm
View File

@ -5,7 +5,9 @@
"use strict";
var EXPORTED_SYMBOLS = ["ClickHandlerParent", "MiddleMousePasteHandlerParent"];
var EXPORTED_SYMBOLS = ["ClickHandlerParent"];
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.defineModuleGetter(
this,
@ -25,22 +27,6 @@ ChromeUtils.defineModuleGetter(
let gContentClickListeners = new Set();
class MiddleMousePasteHandlerParent extends JSWindowActorParent {
receiveMessage(message) {
if (message.name == "MiddleClickPaste") {
// This is heavily based on contentAreaClick from browser.js (Bug 903016)
// The data is set up in a way to look like an Event.
let browser = this.manager.browsingContext.top.embedderElement;
if (!browser) {
// Can be null if the tab disappeared by the time we got the message.
// Just bail.
return;
}
browser.ownerGlobal.middleMousePaste(message.data);
}
}
}
class ClickHandlerParent extends JSWindowActorParent {
static addContentClickListener(listener) {
gContentClickListeners.add(listener);
@ -76,6 +62,17 @@ class ClickHandlerParent extends JSWindowActorParent {
}
let window = browser.ownerGlobal;
if (!data.href) {
// Might be middle mouse navigation.
if (
Services.prefs.getBoolPref("middlemouse.contentLoadURL") &&
!Services.prefs.getBoolPref("general.autoScroll")
) {
window.middleMousePaste(data);
}
return;
}
// If the browser is not in a place where we can open links, bail out.
// This can happen in osx sheets, dialogs, etc. that are not browser
// windows. Specifically the payments UI is in an osx sheet.

24
browser/components/BrowserGlue.jsm
View File

@ -393,34 +393,14 @@ let JSWINDOWACTORS = {
child: {
moduleURI: "resource:///actors/ClickHandlerChild.jsm",
events: {
chromelinkclick: { capture: true, mozSystemGroup: true },
click: { capture: true, mozSystemGroup: true, wantUntrusted: true },
auxclick: { capture: true, mozSystemGroup: true, wantUntrusted: true },
},
},
allFrames: true,
},
/* Note: this uses the same JSMs as ClickHandler, but because it
* relies on "normal" click events anywhere on the page (not just
* links) and is expensive, and only does something for the
* small group of people who have the feature enabled, it is its
* own actor which is only registered if the pref is enabled.
*/
MiddleMousePasteHandler: {
parent: {
moduleURI: "resource:///actors/ClickHandlerParent.jsm",
},
child: {
moduleURI: "resource:///actors/ClickHandlerChild.jsm",
events: {
auxclick: { capture: true, mozSystemGroup: true },
},
},
enablePreference: "middlemouse.contentLoadURL",
allFrames: true,
},
ContentSearch: {
parent: {
moduleURI: "resource:///actors/ContentSearchParent.jsm",

59
dom/base/Element.cpp
View File

@ -88,7 +88,6 @@
#include "mozilla/dom/HTMLTemplateElement.h"
#include "mozilla/dom/KeyframeAnimationOptionsBinding.h"
#include "mozilla/dom/KeyframeEffect.h"
#include "mozilla/dom/MouseEvent.h"
#include "mozilla/dom/MouseEventBinding.h"
#include "mozilla/dom/MutationEventBinding.h"
#include "mozilla/dom/MutationObservers.h"
@ -101,7 +100,6 @@
#include "mozilla/dom/ShadowRoot.h"
#include "mozilla/dom/Text.h"
#include "mozilla/dom/WindowBinding.h"
#include "mozilla/dom/XULCommandEvent.h"
#include "mozilla/dom/nsCSPContext.h"
#include "mozilla/gfx/BasePoint.h"
#include "mozilla/gfx/BaseRect.h"
@ -3070,51 +3068,12 @@ void Element::GetEventTargetParentForLinks(EventChainPreVisitor& aVisitor) {
}
}
// This dispatches a 'chromelinkclick' CustomEvent to chrome-only listeners,
// so that frontend can handle middle-clicks and ctrl/cmd/shift/etc.-clicks
// on links, without getting a call for every single click the user makes.
// Only supported for click or auxclick events.
void Element::DispatchChromeOnlyLinkClickEvent(
EventChainPostVisitor& aVisitor) {
MOZ_ASSERT(aVisitor.mEvent->mMessage == eMouseAuxClick ||
aVisitor.mEvent->mMessage == eMouseClick,
"DispatchChromeOnlyLinkClickEvent supports only click and "
"auxclick source events");
Document* doc = OwnerDoc();
RefPtr<XULCommandEvent> event =
new XULCommandEvent(doc, aVisitor.mPresContext, nullptr);
RefPtr<dom::Event> mouseDOMEvent = aVisitor.mDOMEvent;
if (!mouseDOMEvent) {
mouseDOMEvent = EventDispatcher::CreateEvent(
aVisitor.mEvent->mOriginalTarget, aVisitor.mPresContext,
aVisitor.mEvent, u""_ns);
aVisitor.mDOMEvent = mouseDOMEvent;
}
MouseEvent* mouseEvent = mouseDOMEvent->AsMouseEvent();
event->InitCommandEvent(
u"chromelinkclick"_ns, /* CanBubble */ true,
/* Cancelable */ true, nsGlobalWindowInner::Cast(doc->GetInnerWindow()),
0, mouseEvent->CtrlKey(), mouseEvent->AltKey(), mouseEvent->ShiftKey(),
mouseEvent->MetaKey(), mouseEvent->Button(), mouseDOMEvent,
mouseEvent->MozInputSource(), IgnoreErrors());
// Note: we're always trusted, but the event we pass as the `sourceEvent`
// might not be. Frontend code will check that event's trusted property to
// make that determination; doing it this way means we don't also start
// acting on web-generated custom 'chromelinkclick' events which would
// provide additional attack surface for a malicious actor.
event->SetTrusted(true);
event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true;
DispatchEvent(*event);
}
nsresult Element::PostHandleEventForLinks(EventChainPostVisitor& aVisitor) {
// Optimisation: return early if this event doesn't interest us.
// IMPORTANT: this switch and the switch below it must be kept in sync!
switch (aVisitor.mEvent->mMessage) {
case eMouseDown:
case eMouseClick:
case eMouseAuxClick:
case eLegacyDOMActivate:
case eKeyPress:
break;
@ -3169,12 +3128,15 @@ nsresult Element::PostHandleEventForLinks(EventChainPostVisitor& aVisitor) {
case eMouseClick: {
WidgetMouseEvent* mouseEvent = aVisitor.mEvent->AsMouseEvent();
if (mouseEvent->IsLeftClickEvent()) {
if (!mouseEvent->IsControl() && !mouseEvent->IsMeta() &&
!mouseEvent->IsAlt() && !mouseEvent->IsShift()) {
if (mouseEvent->IsControl() || mouseEvent->IsMeta() ||
mouseEvent->IsAlt() || mouseEvent->IsShift()) {
break;
}
// The default action is simply to dispatch DOMActivate
nsEventStatus status = nsEventStatus_eIgnore;
// DOMActivate event should be trusted since the activation is
// actually occurred even if the cause is an untrusted click event.
// DOMActive event should be trusted since the activation is actually
// occurred even if the cause is an untrusted click event.
InternalUIEvent actEvent(true, eLegacyDOMActivate, mouseEvent);
actEvent.mDetail = 1;
@ -3184,13 +3146,6 @@ nsresult Element::PostHandleEventForLinks(EventChainPostVisitor& aVisitor) {
aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
}
}
DispatchChromeOnlyLinkClickEvent(aVisitor);
}
break;
}
case eMouseAuxClick: {
DispatchChromeOnlyLinkClickEvent(aVisitor);
break;
}
case eLegacyDOMActivate: {

2
dom/base/Element.h
View File

@ -1950,8 +1950,6 @@ class Element : public FragmentOrElement {
*/
void GetEventTargetParentForLinks(EventChainPreVisitor& aVisitor);
void DispatchChromeOnlyLinkClickEvent(EventChainPostVisitor& aVisitor);
/**
* Handle default actions for link event if the event isn't consumed yet.
*/