gecko-dev/editor/libeditor/PlaceholderTransaction.cpp

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

258 строки
8.9 KiB
C++
Исходник Обычный вид История

/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
2012-05-21 15:12:37 +04:00
/* 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 "PlaceholderTransaction.h"
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj This was done by: This was done by applying: ``` diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py index 789affde7bbf..fe33c4c7d4d1 100644 --- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py +++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py @@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase): from subprocess import Popen, PIPE, check_output, CalledProcessError diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE) - args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format] + args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes'] if not output_file: args.append("-i") ``` Then running `./mach clang-format -c <commit-hash>` Then undoing that patch. Then running check_spidermonkey_style.py --fixup Then running `./mach clang-format` I had to fix four things: * I needed to move <utility> back down in GuardObjects.h because I was hitting obscure problems with our system include wrappers like this: 0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration 0:03.94 extern void *realloc (void *__ptr, size_t __size) 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here 0:03.94 MALLOC_DECL(realloc, void*, void*, size_t) 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL' 0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__); 0:03.94 ^ 0:03.94 <scratch space>:178:1: note: expanded from here 0:03.94 realloc_impl 0:03.94 ^ 0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl' 0:03.94 #define realloc_impl mozmem_malloc_impl(realloc) Which I really didn't feel like digging into. * I had to restore the order of TrustOverrideUtils.h and related files in nss because the .inc files depend on TrustOverrideUtils.h being included earlier. * I had to add a missing include to RollingNumber.h * Also had to partially restore include order in JsepSessionImpl.cpp to avoid some -WError issues due to some static inline functions being defined in a header but not used in the rest of the compilation unit. Differential Revision: https://phabricator.services.mozilla.com/D60327 --HG-- extra : moz-landing-system : lando
2020-01-20 19:19:48 +03:00
#include <utility>
#include "CompositionTransaction.h"
#include "mozilla/EditorBase.h"
#include "mozilla/dom/Selection.h"
#include "nsGkAtoms.h"
#include "nsQueryObject.h"
namespace mozilla {
using namespace dom;
PlaceholderTransaction::PlaceholderTransaction(
EditorBase& aEditorBase, nsStaticAtom& aName,
Maybe<SelectionState>&& aSelState)
: mEditorBase(&aEditorBase),
mCompositionTransaction(nullptr),
mStartSel(*std::move(aSelState)),
mAbsorb(true),
mCommitted(false) {
mName = &aName;
}
NS_IMPL_CYCLE_COLLECTION_CLASS(PlaceholderTransaction)
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PlaceholderTransaction,
EditAggregateTransaction)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mEditorBase);
NS_IMPL_CYCLE_COLLECTION_UNLINK(mStartSel);
NS_IMPL_CYCLE_COLLECTION_UNLINK(mEndSel);
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(PlaceholderTransaction,
EditAggregateTransaction)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mEditorBase);
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStartSel);
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mEndSel);
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PlaceholderTransaction)
NS_INTERFACE_MAP_END_INHERITING(EditAggregateTransaction)
NS_IMPL_ADDREF_INHERITED(PlaceholderTransaction, EditAggregateTransaction)
NS_IMPL_RELEASE_INHERITED(PlaceholderTransaction, EditAggregateTransaction)
NS_IMETHODIMP PlaceholderTransaction::DoTransaction() { return NS_OK; }
NS_IMETHODIMP PlaceholderTransaction::UndoTransaction() {
if (NS_WARN_IF(!mEditorBase)) {
return NS_ERROR_NOT_INITIALIZED;
}
// Undo transactions.
nsresult rv = EditAggregateTransaction::UndoTransaction();
if (NS_FAILED(rv)) {
NS_WARNING("EditAggregateTransaction::UndoTransaction() failed");
return rv;
}
// now restore selection
RefPtr<Selection> selection = mEditorBase->GetSelection();
if (NS_WARN_IF(!selection)) {
return NS_ERROR_FAILURE;
}
rv = mStartSel.RestoreSelection(*selection);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"SelectionState::RestoreSelection() failed");
return rv;
}
NS_IMETHODIMP PlaceholderTransaction::RedoTransaction() {
if (NS_WARN_IF(!mEditorBase)) {
return NS_ERROR_NOT_INITIALIZED;
}
// Redo transactions.
nsresult rv = EditAggregateTransaction::RedoTransaction();
if (NS_FAILED(rv)) {
NS_WARNING("EditAggregateTransaction::RedoTransaction() failed");
return rv;
}
// now restore selection
RefPtr<Selection> selection = mEditorBase->GetSelection();
if (NS_WARN_IF(!selection)) {
return NS_ERROR_FAILURE;
}
rv = mEndSel.RestoreSelection(*selection);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"SelectionState::RestoreSelection() failed");
return rv;
}
NS_IMETHODIMP PlaceholderTransaction::Merge(nsITransaction* aOtherTransaction,
bool* aDidMerge) {
if (NS_WARN_IF(!aDidMerge) || NS_WARN_IF(!aOtherTransaction)) {
return NS_ERROR_INVALID_ARG;
}
// set out param default value
*aDidMerge = false;
if (mForwardingTransaction) {
MOZ_ASSERT_UNREACHABLE(
"tried to merge into a placeholder that was in "
"forwarding mode!");
return NS_ERROR_FAILURE;
}
RefPtr<EditTransactionBase> otherTransactionBase =
aOtherTransaction->GetAsEditTransactionBase();
if (!otherTransactionBase) {
return NS_OK;
}
// We are absorbing all transactions if mAbsorb is lit.
if (mAbsorb) {
if (CompositionTransaction* otherCompositionTransaction =
otherTransactionBase->GetAsCompositionTransaction()) {
// special handling for CompositionTransaction's: they need to merge with
// any previous CompositionTransaction in this placeholder, if possible.
if (!mCompositionTransaction) {
// this is the first IME txn in the placeholder
mCompositionTransaction = otherCompositionTransaction;
DebugOnly<nsresult> rvIgnored =
AppendChild(otherCompositionTransaction);
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rvIgnored),
"EditAggregateTransaction::AppendChild() failed, but ignored");
} else {
bool didMerge;
mCompositionTransaction->Merge(otherCompositionTransaction, &didMerge);
if (!didMerge) {
2007-11-10 07:24:42 +03:00
// it wouldn't merge. Earlier IME txn is already committed and will
// not absorb further IME txns. So just stack this one after it
// and remember it as a candidate for further merges.
mCompositionTransaction = otherCompositionTransaction;
DebugOnly<nsresult> rvIgnored =
AppendChild(otherCompositionTransaction);
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rvIgnored),
"EditAggregateTransaction::AppendChild() failed, but ignored");
}
}
} else {
PlaceholderTransaction* otherPlaceholderTransaction =
otherTransactionBase->GetAsPlaceholderTransaction();
if (!otherPlaceholderTransaction) {
// See bug 171243: just drop incoming placeholders on the floor.
// Their children will be swallowed by this preexisting one.
DebugOnly<nsresult> rvIgnored = AppendChild(otherTransactionBase);
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rvIgnored),
"EditAggregateTransaction::AppendChild() failed, but ignored");
}
}
*aDidMerge = true;
// RememberEndingSelection();
// efficiency hack: no need to remember selection here, as we haven't yet
2007-11-11 05:43:32 +03:00
// finished the initial batch and we know we will be told when the batch
// ends. we can remeber the selection then.
return NS_OK;
}
// merge typing or IME or deletion transactions if the selection matches
if (mCommitted ||
(mName != nsGkAtoms::TypingTxnName && mName != nsGkAtoms::IMETxnName &&
mName != nsGkAtoms::DeleteTxnName)) {
return NS_OK;
}
PlaceholderTransaction* otherPlaceholderTransaction =
otherTransactionBase->GetAsPlaceholderTransaction();
if (!otherPlaceholderTransaction) {
return NS_OK;
}
RefPtr<nsAtom> otherTransactionName;
DebugOnly<nsresult> rvIgnored = otherPlaceholderTransaction->GetName(
getter_AddRefs(otherTransactionName));
NS_WARNING_ASSERTION(NS_SUCCEEDED(rvIgnored),
"PlaceholderTransaction::GetName() failed, but ignored");
if (!otherTransactionName || otherTransactionName == nsGkAtoms::_empty ||
otherTransactionName != mName) {
return NS_OK;
}
// check if start selection of next placeholder matches
// end selection of this placeholder
if (!otherPlaceholderTransaction->StartSelectionEquals(mEndSel)) {
return NS_OK;
}
mAbsorb = true; // we need to start absorbing again
otherPlaceholderTransaction->ForwardEndBatchTo(*this);
// AppendChild(editTransactionBase);
// see bug 171243: we don't need to merge placeholders
// into placeholders. We just reactivate merging in the
// pre-existing placeholder and drop the new one on the floor. The
// EndPlaceHolderBatch() call on the new placeholder will be
// forwarded to this older one.
rvIgnored = RememberEndingSelection();
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rvIgnored),
"PlaceholderTransaction::RememberEndingSelection() failed, but "
"ignored");
*aDidMerge = true;
return NS_OK;
}
bool PlaceholderTransaction::StartSelectionEquals(
SelectionState& aSelectionState) {
// determine if starting selection matches the given selection state.
// note that we only care about collapsed selections.
return mStartSel.IsCollapsed() && aSelectionState.IsCollapsed() &&
mStartSel.Equals(aSelectionState);
}
nsresult PlaceholderTransaction::EndPlaceHolderBatch() {
mAbsorb = false;
if (mForwardingTransaction) {
if (mForwardingTransaction) {
DebugOnly<nsresult> rvIgnored =
mForwardingTransaction->EndPlaceHolderBatch();
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rvIgnored),
"PlaceholderTransaction::EndPlaceHolderBatch() failed, but ignored");
}
}
// remember our selection state.
nsresult rv = RememberEndingSelection();
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv),
"PlaceholderTransaction::RememberEndingSelection() failed");
return rv;
}
nsresult PlaceholderTransaction::RememberEndingSelection() {
if (NS_WARN_IF(!mEditorBase)) {
return NS_ERROR_NOT_INITIALIZED;
}
RefPtr<Selection> selection = mEditorBase->GetSelection();
if (NS_WARN_IF(!selection)) {
return NS_ERROR_FAILURE;
}
mEndSel.SaveSelection(*selection);
return NS_OK;
}
} // namespace mozilla