mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
212144c57f
- Bug 1153936 - nsIHttpChannelInteral attribute to opt out of alt-svc on per channel basis r=hurley (0e5667321) - Bug 1137287 - Part 2: Send non-200/404 synthesized responses via the parent HTTP implementation for proper processing. r=mayhemer (3c38a1908) - Bug 1137287 - Part 0: Test for synthesized redirects. r=jdm (6f12f95de) - Bug 1137287 - Build fix. rs=KWierso for a CLOSED TREE (85694256a) - Bug 1095098 - move do_QueryObject templates into their own header; r=froydnj (5d349c248) - Bug 1095098 - followup - add back some static analysis attributes lost in a rebase; r=me (917a6b5da) - Bug 1159303 - Reduce noise due to sort operations warnings. r=bent (cac3c3e12) - Bug 1164559 - Part 1: Remove instances of #ifdef PR_LOGGING in storage. r=froydnj (5dd0f92b0) - Bug 1164559 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (54e94d1ce) - Bug 1148833 part 1 - Remove nsMathMLContainerFrame::WillReflow, reset the NS_MATHML_ERROR bit at the start of Reflow instead. r=roc (803abb8d9) - Bug 1148833 part 2 - Makes sure gLogModule is initialized by calling GetLogModuleInfo(). r=roc (722e2019d) - Bug 1148833 part 3 - Remove nsIFrame::WillReflow and add a non-virtual MarkInReflow method instead that sets NS_FRAME_IN_REFLOW. Call it at the start of Reflow(). r=roc (9cceb221d) - Bug 1148833 part 4 - Fix indentation of some Reflow params (white-space changes only). (b2ba3e18a) - Bug 1158546 - Remove nsDisplayHeaderFooter::mFrame in favor of nsDisplayItem::mFrame; r=roc (f6a20967f) - Bug 1162673 - Part 1: Remove instances of #ifdef PR_LOGGING in layout. r=froydnj (453a452fc) - Bug 1162673 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (d745eab19) - Bug 1144031 - fix use of uninitialized variable, r=mcmanus (327dc1af9) - Bug 1144270 : Update remaining callers of newChannel to newChannel2 in netwerk/ (r=mcmanus) (60c21d7cb) - Bug 1161558 cleanup some nsIObserver shutdown paths r=bagder (eb8441bb9) - Bug 1162336 - Part 1: Remove instances of #ifdef PR_LOGGING in netwerk. r=froydnj (8cadc40a2) - Bug 1162336 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (4e26e4886) - Bug 1163194 - Part 1: Remove instances of #ifdef PR_LOGGING in dom/xul. r=froydnj (4f840564b) - Bug 1163194 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (653707f34) - Bug 1153737: Avoid unnecessary uses of mozilla::pkix::ScopedPtr, r=keeler (fd9eb9aa2) - Bug 1038072 - signature verification for JAR files unpacked into a directory. r=keeler (32469e1dd) - Bug 1124076 - Properly detect certs when loaded and prompt to import them. r=sworkman/dkeeler (d860e3cac) - Bug 1124076 followup - fix the build when PR_LOGGING is not defined. r=mrbkap (657b18bf2) - Bug 1162691 - Part 1: Remove instances of #ifdef PR_LOGGING in security. r=froydnj (98a916e82) - Bug 1162691 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj (000c2fe42) - bug 1147085 - remove nsINSSCertCache (replace it with nsIX509CertDB.getCerts()) r=Cykesiopka (88f7eba23) - Bug 1149888 - Make PLDHashTable::mRecursionLevel atomic, r=froydnj. Pushing on CLOSED TREE with a=ryanvm. (25d8e2da1) - Bug 1050035 (part 1, attempt 2) - Lazily allocate PLDHashTable::mEntryStore. r=froydnj. (195615f16) - Bug 1159972 - Remove the fallible version of PL_DHashTableInit(). r=froydnj. (d31806eeb)
119 lines
3.3 KiB
C++
119 lines
3.3 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 "InsertTextTxn.h"
|
|
|
|
#include "mozilla/dom/Selection.h" // Selection local var
|
|
#include "mozilla/dom/Text.h" // mTextNode
|
|
#include "nsAString.h" // nsAString parameter
|
|
#include "nsDebug.h" // for NS_ASSERTION, etc
|
|
#include "nsEditor.h" // mEditor
|
|
#include "nsError.h" // for NS_OK, etc
|
|
#include "nsQueryObject.h" // for do_QueryObject
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
class nsITransaction;
|
|
|
|
InsertTextTxn::InsertTextTxn(Text& aTextNode, uint32_t aOffset,
|
|
const nsAString& aStringToInsert,
|
|
nsEditor& aEditor)
|
|
: EditTxn()
|
|
, mTextNode(&aTextNode)
|
|
, mOffset(aOffset)
|
|
, mStringToInsert(aStringToInsert)
|
|
, mEditor(aEditor)
|
|
{
|
|
}
|
|
|
|
InsertTextTxn::~InsertTextTxn()
|
|
{
|
|
}
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_INHERITED(InsertTextTxn, EditTxn,
|
|
mTextNode)
|
|
|
|
NS_IMPL_ADDREF_INHERITED(InsertTextTxn, EditTxn)
|
|
NS_IMPL_RELEASE_INHERITED(InsertTextTxn, EditTxn)
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(InsertTextTxn)
|
|
if (aIID.Equals(NS_GET_IID(InsertTextTxn))) {
|
|
foundInterface = static_cast<nsITransaction*>(this);
|
|
} else
|
|
NS_INTERFACE_MAP_END_INHERITING(EditTxn)
|
|
|
|
|
|
NS_IMETHODIMP
|
|
InsertTextTxn::DoTransaction()
|
|
{
|
|
nsresult res = mTextNode->InsertData(mOffset, mStringToInsert);
|
|
NS_ENSURE_SUCCESS(res, res);
|
|
|
|
// Only set selection to insertion point if editor gives permission
|
|
if (mEditor.GetShouldTxnSetSelection()) {
|
|
nsRefPtr<Selection> selection = mEditor.GetSelection();
|
|
NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
|
|
res = selection->Collapse(mTextNode,
|
|
mOffset + mStringToInsert.Length());
|
|
NS_ASSERTION(NS_SUCCEEDED(res),
|
|
"Selection could not be collapsed after insert");
|
|
} else {
|
|
// Do nothing - DOM Range gravity will adjust selection
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
InsertTextTxn::UndoTransaction()
|
|
{
|
|
return mTextNode->DeleteData(mOffset, mStringToInsert.Length());
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
InsertTextTxn::Merge(nsITransaction* aTransaction, bool* aDidMerge)
|
|
{
|
|
if (!aTransaction || !aDidMerge) {
|
|
return NS_OK;
|
|
}
|
|
// Set out param default value
|
|
*aDidMerge = false;
|
|
|
|
// If aTransaction is a InsertTextTxn, and if the selection hasn't changed,
|
|
// then absorb it
|
|
nsRefPtr<InsertTextTxn> otherInsTxn = do_QueryObject(aTransaction);
|
|
if (otherInsTxn && IsSequentialInsert(*otherInsTxn)) {
|
|
nsAutoString otherData;
|
|
otherInsTxn->GetData(otherData);
|
|
mStringToInsert += otherData;
|
|
*aDidMerge = true;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
InsertTextTxn::GetTxnDescription(nsAString& aString)
|
|
{
|
|
aString.AssignLiteral("InsertTextTxn: ");
|
|
aString += mStringToInsert;
|
|
return NS_OK;
|
|
}
|
|
|
|
/* ============ private methods ================== */
|
|
|
|
void
|
|
InsertTextTxn::GetData(nsString& aResult)
|
|
{
|
|
aResult = mStringToInsert;
|
|
}
|
|
|
|
bool
|
|
InsertTextTxn::IsSequentialInsert(InsertTextTxn& aOtherTxn)
|
|
{
|
|
return aOtherTxn.mTextNode == mTextNode &&
|
|
aOtherTxn.mOffset == mOffset + mStringToInsert.Length();
|
|
}
|