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

Bug 1623858: part 23) Factor dispatching selectstart event out. r=masayuki

Browse Source 
Simplifies its caller.

Differential Revision: https://phabricator.services.mozilla.com/D68960

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mirko Brodesser 2020-03-31 12:22:05 +00:00
parent 4c32def9ca
commit 9088e84d23
2 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
dom/base/Selection.cpp
View File

@ -822,6 +822,26 @@ static nsINode* DetermineSelectstartEventTarget(
return target;
}
/**
* @return true, iff the default action should be executed.
*/
static bool MaybeDispatchSelectstartEvent(
const nsRange& aRange, const bool aSelectionEventsOnTextControlsEnabled,
Document* aDocument) {
nsCOMPtr<nsINode> selectstartEventTarget = DetermineSelectstartEventTarget(
aSelectionEventsOnTextControlsEnabled, aRange);
bool executeDefaultAction = true;
if (selectstartEventTarget) {
nsContentUtils::DispatchTrustedEvent(
aDocument, selectstartEventTarget, NS_LITERAL_STRING("selectstart"),
CanBubble::eYes, Cancelable::eYes, &executeDefaultAction);
}
return executeDefaultAction;
}
nsresult Selection::AddRangesForUserSelectableNodes(
nsRange* aRange, int32_t* aOutIndex,
const DispatchSelectstartEvent aDispatchSelectstartEvent) {
@ -846,6 +866,10 @@ nsresult Selection::AddRangesForUserSelectableNodes(
if (aDispatchSelectstartEvent == DispatchSelectstartEvent::Maybe &&
mSelectionType == SelectionType::eNormal && selectEventsEnabled &&
IsCollapsed() && !IsBlockingSelectionChangeEvents()) {
// We consider a selection to be starting if we are currently collapsed,
// and the selection is becoming uncollapsed, and this is caused by a
// user initiated event.
// First, we generate the ranges to add with a scratch range, which is a
// clone of the original range passed in. We do this seperately, because
// the selectstart event could have caused the world to change, and
@ -858,36 +882,23 @@ nsresult Selection::AddRangesForUserSelectableNodes(
MOZ_ASSERT(!newRangesNonEmpty || nsContentUtils::IsSafeToRunScript());
if (newRangesNonEmpty && nsContentUtils::IsSafeToRunScript()) {
// We consider a selection to be starting if we are currently collapsed,
// and the selection is becoming uncollapsed, and this is caused by a
// user initiated event.
// The spec currently doesn't say that we should dispatch this event
// on text controls, so for now we only support doing that under a
// pref, disabled by default.
// See https://github.com/w3c/selection-api/issues/53.
nsCOMPtr<nsINode> selectstartEventTarget =
DetermineSelectstartEventTarget(
nsFrameSelection::sSelectionEventsOnTextControlsEnabled, *aRange);
const bool executeDefaultAction = MaybeDispatchSelectstartEvent(
*aRange, nsFrameSelection::sSelectionEventsOnTextControlsEnabled,
GetDocument());
if (selectstartEventTarget) {
bool defaultAction = true;
if (!executeDefaultAction) {
return NS_OK;
}
nsContentUtils::DispatchTrustedEvent(
GetDocument(), selectstartEventTarget,
NS_LITERAL_STRING("selectstart"), CanBubble::eYes, Cancelable::eYes,
&defaultAction);
if (!defaultAction) {
return NS_OK;
}
// As we just dispatched an event to the DOM, something could have
// changed under our feet. Re-generate the rangesToAdd array, and
// ensure that the range we are about to add is still valid.
if (!aRange->IsPositioned()) {
return NS_ERROR_UNEXPECTED;
}
// As we potentially dispatched an event to the DOM, something could have
// changed under our feet. Re-generate the rangesToAdd array, and
// ensure that the range we are about to add is still valid.
if (!aRange->IsPositioned()) {
return NS_ERROR_UNEXPECTED;
}
}

4
dom/base/nsContentUtils.h
View File

@ -1430,12 +1430,16 @@ class nsContentUtils {
* @param aDefaultAction Set to true if default action should be taken,
* see EventTarget::DispatchEvent.
*/
// TODO: annotate with `MOZ_CAN_RUN_SCRIPT`
// (https://bugzilla.mozilla.org/show_bug.cgi?id=1625902).
static nsresult DispatchTrustedEvent(Document* aDoc, nsISupports* aTarget,
const nsAString& aEventName, CanBubble,
Cancelable,
Composed aComposed = Composed::eDefault,
bool* aDefaultAction = nullptr);
// TODO: annotate with `MOZ_CAN_RUN_SCRIPT`
// (https://bugzilla.mozilla.org/show_bug.cgi?id=1625902).
static nsresult DispatchTrustedEvent(Document* aDoc, nsISupports* aTarget,
const nsAString& aEventName,
CanBubble aCanBubble,