mirror of
https://github.com/roytam1/mozilla45esr.git
synced 2026-05-26 15:39:48 +00:00
ac0651448a
- issue #385: unconditionally disable JS source compression (6a91f9666) - #359: security.pki.sha1_enforcement_level -> 1 (966d8cab8) - for #375: M1349940 M1355595 M1334635 M1353708 M1354782 M1354781 M1349742 M1345315 M1356655 M1356663 M1357638 M1358809 M1307134 M1331342 M1220466 (964aa7e7c) - #378: ensure remaining users of faulty LZ4 module never execute (922a32738) - #387: pulled nsGenConList.* with relevant deps up to mozilla-central (b1831fc75) - prerequisite for #375: M1347759 (8e58b5c8f) - #375: M1348278 (8d665811d) - #368: pref on Brotli (7da09aa4e) - #375: M1330912 (sync patch only) (bea84e507) - #375: M1342719 M1342720 (f4015e0c1) - Bug 1071646 - Light refactoring of lexical binding helpers in Parser. (r=jorendorff) (167ad8564) - Bug 1071646 - Make functions block-scoped in JS and implement Annex B semantics for compatibility. (r=jorendorff) (25844de1b) - Bug 1071646 - Support labelled function declarations in sloppy mode per Annex B.3.2. (r=jorendorff) (37bf861a9) - Bug 1071646 - Introduce JSOP_BINDVAR to support Annex B.3.3.3. (r=jorendorff) (884bd2ab5) - Bug 1071646 - Cast ParseNode to Definition using as<T>. (r=jorendorff) (feba46e3f) - Bug 1071646 - Support JSOP_BINDVAR in Baseline. (r=jandem) (92b6a3b48) - #372: merge changeset 299512 (c28302281) - Bug 1071646 - Support JSOP_BINDVAR in Ion. (r=jandem) (d05f77998) - Bug 1231758 - Fix bogus assertion in BCE for Annex B function assignment. (r=jorendorff) (a11dcf0cc) - Bug 1234717 - Fix upvar TDZ for block-scoped functions. (r=jorendorff) (2ec542b5a) - Bug 1071646 - Forgot to commit tests on backout and relanding cycle. (r=me) (069a26bf9) - #372: merge changeset 303861 (745f7e7a2) - Bug 1235590 - Allow redeclaring block-scoped functions and warn about deprecation for now. (r=jorendorff) (8a51cc1f9) - Bug 1243793 - Fix handling of labels when emitting hoisted function definitions. (r=jorendorff) (c0ffd70f9) - Bug 1236875 - Fix BytecodeEmitter::atBodyLevel() for modules r=efaust (5b2c22f62) - Bug 1304641 - TraceLogger: Also throw compartment mismatch error when running in the jits, r=bbouvier (717134569) - Bug 1198833 - Variable redeclaration should be a syntax error r=shu (ac6710b0f) - #393, Bug 1135377 - Part 1: Implement RegExp unicode flag. r=till, f=anba (d00063089) - #393, Bug 1135377 - Part 2: Parse RegExp unicode character in non-CharacterClass. r=till, f=anba (c85a176bd) - #393, Bug 1135377 - Part 3: Parse RegExp unicode character in CharacterClass. r=till, f=anba (68f44ec41) - #393, Bug 1135377 - Part 4: Support everything Atom in RegExp with unicode flag. r=till, f=anba (4e924a688) - #393, Bug 1135377 - Part 5: Support CharacterClassEscape in RegExp with unicode flag. r=till, f=anba (45a4712b0) - #393, Bug 1135377 - Part 6: Support ignoreCase for BMP in RegExp with unicode flag. r=till, f=anba (cf744e9d3) - #393, Bug 1135377 - Part 7: Support ignoreCase for non-BMP in RegExp with unicode flag. r=till, f=anba (f31a9f9e8) - #393, Bug 1135377 - Part 8: Disallow extended pattern in RegExp with unicode flag. r=till, f=anba (c05db4075) - #393, Bug 1135377 - Part 9: Use RegExp unicode flag in String.prototype.{match,replace,split}. r=till, f=anba (8636a96b7) - #393, Bug 1135377 - Part 10: Decrement index when it points trail surrogate that has corresponding lead surrogate. r=till, f=anba (522d06ab3) - #393, Bug 1135377 - Part 11: Support back reference with unicode flag. r=till, f=anba (122e41a28) - #393, Bug 1279467 - Fix null handling in RegExp character class with unicode flag. r=till (741f170e6) - #393: bustage fix (3e39760c8) - #393, Bug 1281739 - Do not match K, S, k, s, KELVIN SIGN, LATIN SMALL LETTER LONG S with \W in unicode ignoreCase RegExp. r=till (3c5d4bab8) - #375: M1233101 (a6a0b895f) - #375, #391: branch hint malloc and recursion checks, clean up MAsm type barrier spooge (a008a1978) - closes #380: fix toSource() tests (f9de6783b) - #394: fix and enable ES7 exponentiation operator (6dc5f54dc) - #396: M1342009, plus refactor to PLDHashTable a la M1352888 (06fcc091f) - #375: M1347634 1352235 (aa6b13c59) - #375: M1351303 (f7badd24e) - #375: M1287277 M1259677; temporarily disable M1351303 due to crashes (75d95f15b) - #375: M1363423 M1273828 M1364661 (e7767cdaa)
239 lines
6.8 KiB
C++
239 lines
6.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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/. */
|
|
|
|
#include "DeleteRangeTxn.h"
|
|
|
|
#include "DeleteNodeTxn.h"
|
|
#include "DeleteTextTxn.h"
|
|
#include "mozilla/Assertions.h"
|
|
#include "mozilla/dom/Selection.h"
|
|
#include "mozilla/mozalloc.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsDebug.h"
|
|
#include "nsEditor.h"
|
|
#include "nsError.h"
|
|
#include "nsIContent.h"
|
|
#include "nsIContentIterator.h"
|
|
#include "nsIDOMCharacterData.h"
|
|
#include "nsINode.h"
|
|
#include "nsAString.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
// note that aEditor is not refcounted
|
|
DeleteRangeTxn::DeleteRangeTxn()
|
|
: EditAggregateTxn(),
|
|
mRange(),
|
|
mEditor(nullptr),
|
|
mRangeUpdater(nullptr)
|
|
{
|
|
}
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_INHERITED(DeleteRangeTxn, EditAggregateTxn,
|
|
mRange)
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DeleteRangeTxn)
|
|
NS_INTERFACE_MAP_END_INHERITING(EditAggregateTxn)
|
|
|
|
nsresult
|
|
DeleteRangeTxn::Init(nsEditor* aEditor,
|
|
nsRange* aRange,
|
|
nsRangeUpdater* aRangeUpdater)
|
|
{
|
|
MOZ_ASSERT(aEditor && aRange);
|
|
|
|
mEditor = aEditor;
|
|
mRange = aRange->CloneRange();
|
|
mRangeUpdater = aRangeUpdater;
|
|
|
|
NS_ENSURE_TRUE(mEditor->IsModifiableNode(mRange->GetStartParent()),
|
|
NS_ERROR_FAILURE);
|
|
NS_ENSURE_TRUE(mEditor->IsModifiableNode(mRange->GetEndParent()),
|
|
NS_ERROR_FAILURE);
|
|
NS_ENSURE_TRUE(mEditor->IsModifiableNode(mRange->GetCommonAncestor()),
|
|
NS_ERROR_FAILURE);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DeleteRangeTxn::DoTransaction()
|
|
{
|
|
MOZ_ASSERT(mRange && mEditor);
|
|
nsresult res;
|
|
|
|
// Swap mRange out into a stack variable, so we make sure to null it
|
|
// out on return from this function. Once this function returns, we no longer
|
|
// need mRange, and keeping it alive in the long term slows down all
|
|
// DOM mutations because it's observing them.
|
|
// (Modified from bug 1349940.)
|
|
RefPtr<nsRange> rangeToDelete;
|
|
rangeToDelete.swap(mRange);
|
|
|
|
// build the child transactions
|
|
nsCOMPtr<nsINode> startParent = rangeToDelete->GetStartParent();
|
|
int32_t startOffset = rangeToDelete->StartOffset();
|
|
nsCOMPtr<nsINode> endParent = rangeToDelete->GetEndParent();
|
|
int32_t endOffset = rangeToDelete->EndOffset();
|
|
MOZ_ASSERT(startParent && endParent);
|
|
|
|
if (startParent == endParent) {
|
|
// the selection begins and ends in the same node
|
|
res = CreateTxnsToDeleteBetween(startParent, startOffset, endOffset);
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
} else {
|
|
// the selection ends in a different node from where it started. delete
|
|
// the relevant content in the start node
|
|
res = CreateTxnsToDeleteContent(startParent, startOffset, nsIEditor::eNext);
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
// delete the intervening nodes
|
|
res = CreateTxnsToDeleteNodesBetween(rangeToDelete);
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
// delete the relevant content in the end node
|
|
res = CreateTxnsToDeleteContent(endParent, endOffset, nsIEditor::ePrevious);
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
}
|
|
|
|
// if we've successfully built this aggregate transaction, then do it.
|
|
res = EditAggregateTxn::DoTransaction();
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
|
|
// only set selection to deletion point if editor gives permission
|
|
bool bAdjustSelection;
|
|
mEditor->ShouldTxnSetSelection(&bAdjustSelection);
|
|
if (bAdjustSelection) {
|
|
RefPtr<Selection> selection = mEditor->GetSelection();
|
|
NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
|
|
res = selection->Collapse(startParent, startOffset);
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
}
|
|
// else do nothing - dom range gravity will adjust selection
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DeleteRangeTxn::UndoTransaction()
|
|
{
|
|
return EditAggregateTxn::UndoTransaction();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DeleteRangeTxn::RedoTransaction()
|
|
{
|
|
return EditAggregateTxn::RedoTransaction();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DeleteRangeTxn::GetTxnDescription(nsAString& aString)
|
|
{
|
|
aString.AssignLiteral("DeleteRangeTxn");
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
DeleteRangeTxn::CreateTxnsToDeleteBetween(nsINode* aNode,
|
|
int32_t aStartOffset,
|
|
int32_t aEndOffset)
|
|
{
|
|
// see what kind of node we have
|
|
if (aNode->IsNodeOfType(nsINode::eDATA_NODE)) {
|
|
// if the node is a chardata node, then delete chardata content
|
|
int32_t numToDel;
|
|
if (aStartOffset == aEndOffset) {
|
|
numToDel = 1;
|
|
} else {
|
|
numToDel = aEndOffset - aStartOffset;
|
|
}
|
|
|
|
RefPtr<nsGenericDOMDataNode> charDataNode =
|
|
static_cast<nsGenericDOMDataNode*>(aNode);
|
|
|
|
RefPtr<DeleteTextTxn> txn =
|
|
new DeleteTextTxn(*mEditor, *charDataNode, aStartOffset, numToDel,
|
|
mRangeUpdater);
|
|
|
|
nsresult res = txn->Init();
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
|
|
AppendChild(txn);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsCOMPtr<nsIContent> child = aNode->GetChildAt(aStartOffset);
|
|
NS_ENSURE_STATE(child);
|
|
|
|
nsresult res = NS_OK;
|
|
for (int32_t i = aStartOffset; i < aEndOffset; ++i) {
|
|
RefPtr<DeleteNodeTxn> txn = new DeleteNodeTxn();
|
|
res = txn->Init(mEditor, child, mRangeUpdater);
|
|
if (NS_SUCCEEDED(res)) {
|
|
AppendChild(txn);
|
|
}
|
|
|
|
child = child->GetNextSibling();
|
|
}
|
|
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
DeleteRangeTxn::CreateTxnsToDeleteContent(nsINode* aNode,
|
|
int32_t aOffset,
|
|
nsIEditor::EDirection aAction)
|
|
{
|
|
// see what kind of node we have
|
|
if (aNode->IsNodeOfType(nsINode::eDATA_NODE)) {
|
|
// if the node is a chardata node, then delete chardata content
|
|
uint32_t start, numToDelete;
|
|
if (nsIEditor::eNext == aAction) {
|
|
start = aOffset;
|
|
numToDelete = aNode->Length() - aOffset;
|
|
} else {
|
|
start = 0;
|
|
numToDelete = aOffset;
|
|
}
|
|
|
|
if (numToDelete) {
|
|
RefPtr<nsGenericDOMDataNode> dataNode =
|
|
static_cast<nsGenericDOMDataNode*>(aNode);
|
|
RefPtr<DeleteTextTxn> txn = new DeleteTextTxn(*mEditor, *dataNode,
|
|
start, numToDelete, mRangeUpdater);
|
|
|
|
nsresult res = txn->Init();
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
|
|
AppendChild(txn);
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsRange *aRangeToDelete)
|
|
{
|
|
nsCOMPtr<nsIContentIterator> iter = NS_NewContentSubtreeIterator();
|
|
|
|
nsresult res = iter->Init(aRangeToDelete);
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
|
|
while (!iter->IsDone()) {
|
|
nsCOMPtr<nsINode> node = iter->GetCurrentNode();
|
|
NS_ENSURE_TRUE(node, NS_ERROR_NULL_POINTER);
|
|
|
|
RefPtr<DeleteNodeTxn> txn = new DeleteNodeTxn();
|
|
|
|
res = txn->Init(mEditor, node, mRangeUpdater);
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
AppendChild(txn);
|
|
|
|
iter->Next();
|
|
}
|
|
return NS_OK;
|
|
}
|