mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-06 17:16:12 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
99 lines
2.9 KiB
C++
99 lines
2.9 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 "DeleteTextTxn.h"
|
|
#include "mozilla/Assertions.h"
|
|
#include "mozilla/dom/Selection.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsDebug.h"
|
|
#include "nsEditor.h"
|
|
#include "nsError.h"
|
|
#include "nsIEditor.h"
|
|
#include "nsISupportsImpl.h"
|
|
#include "nsSelectionState.h"
|
|
#include "nsAString.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
DeleteTextTxn::DeleteTextTxn(nsEditor& aEditor,
|
|
nsGenericDOMDataNode& aCharData, uint32_t aOffset,
|
|
uint32_t aNumCharsToDelete,
|
|
nsRangeUpdater* aRangeUpdater)
|
|
: EditTxn()
|
|
, mEditor(aEditor)
|
|
, mCharData(&aCharData)
|
|
, mOffset(aOffset)
|
|
, mNumCharsToDelete(aNumCharsToDelete)
|
|
, mRangeUpdater(aRangeUpdater)
|
|
{
|
|
NS_ASSERTION(mCharData->Length() >= aOffset + aNumCharsToDelete,
|
|
"Trying to delete more characters than in node");
|
|
}
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_INHERITED(DeleteTextTxn, EditTxn,
|
|
mCharData)
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DeleteTextTxn)
|
|
NS_INTERFACE_MAP_END_INHERITING(EditTxn)
|
|
|
|
nsresult
|
|
DeleteTextTxn::Init()
|
|
{
|
|
// Do nothing if the node is read-only
|
|
if (!mEditor.IsModifiableNode(mCharData)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DeleteTextTxn::DoTransaction()
|
|
{
|
|
MOZ_ASSERT(mCharData);
|
|
|
|
// Get the text that we're about to delete
|
|
nsresult res = mCharData->SubstringData(mOffset, mNumCharsToDelete,
|
|
mDeletedText);
|
|
MOZ_ASSERT(NS_SUCCEEDED(res));
|
|
res = mCharData->DeleteData(mOffset, mNumCharsToDelete);
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
|
|
if (mRangeUpdater) {
|
|
mRangeUpdater->SelAdjDeleteText(mCharData, mOffset, mNumCharsToDelete);
|
|
}
|
|
|
|
// Only set selection to deletion point if editor gives permission
|
|
if (mEditor.GetShouldTxnSetSelection()) {
|
|
RefPtr<Selection> selection = mEditor.GetSelection();
|
|
NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
|
|
res = selection->Collapse(mCharData, mOffset);
|
|
NS_ASSERTION(NS_SUCCEEDED(res),
|
|
"Selection could not be collapsed after undo of deletetext");
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
}
|
|
// Else do nothing - DOM Range gravity will adjust selection
|
|
return NS_OK;
|
|
}
|
|
|
|
//XXX: We may want to store the selection state and restore it properly. Was
|
|
// it an insertion point or an extended selection?
|
|
NS_IMETHODIMP
|
|
DeleteTextTxn::UndoTransaction()
|
|
{
|
|
MOZ_ASSERT(mCharData);
|
|
|
|
return mCharData->InsertData(mOffset, mDeletedText);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DeleteTextTxn::GetTxnDescription(nsAString& aString)
|
|
{
|
|
aString.AssignLiteral("DeleteTextTxn: ");
|
|
aString += mDeletedText;
|
|
return NS_OK;
|
|
}
|