mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 22:53:04 +00:00
b564bd67d3
- Use CompositorWidgetProxy for dispatching vsync to the compositor. (bug 1269037 part 1, r=mchang) (c8b7a4240c) - Remove unused null widget checks. (bug 1269037 part 2, r=mchang) (4f4cc9952b) - Bug 1269422: Wrap Gonk widget in |CompositorWidgetProxyWrapper|. r=dvander (4513035cbf) - Remove nsBaseWidget::NewCompositorBridgeParent. (bug 1272472 part 1, r=kats) (ca813c1f2b) - Use IPDL to schedule composites on GTK. (bug 1272472 part 2, r=nical) (7402cf834e) - Use IPC to schedule composites on Windows. (bug 1272472 part 3, r=jimm) (e5d7281dd7) - Don't use nsIWidget to check APZ in LayerManagerComposite. (bug 1269653 part 1, r=kats) (79a1644111) - Restrict SetDispAcquireFence's nsIWidget access to Gonk. (bug 1269653 part 2, r=kats) (72110b7bc7) - Bug 1264764 - Move PTexture under PCompositorBridge r=nical,dvander (17e6ec7fc1) - Move CompositorThreadHolder into its own file. (bug 1273017 part 1, r=mattwoodrow) (464ede8be1) - Move CompositorBridgeParent::CompositorLoop to CompositorThreadHolder. (bug 1273017 part 2, r=mattwoodrow) (85708f3cde) - Bug 1268313: Part 1 - Be explicit about which NewRunnableMethod callers want to be able to cancel. r=froydnj (faa07aa139) - Bug 1268313: Part 2 - Replace some NewRunnableMethods with NS_NewNonOwningRunnableMethod. r=froydnj (010c43d000) - Bug 1268313: Part 3 - Replace some NewCancelableRunnableMethod with NS_NewNonOwningCancelableRunnableMethod. r=froydnj (55018ef234) - Bug 1268313: Part 4 - Replace NewCancelableRunnableMethod with NS_NewCancelableRunnableMethod. r=froydnj (c22711b35d) - Bug 1268313: Part 5 - Make NS_NewRunnableMethod able to call const functions. r=froydnj (b0f60963a3) - Bug 1268313: Part 6 - Replace NewRunnableMethod with NS_NewRunnableMethod. r=froydnj (18d40def2c) - Bug 1260950 - Set mInitialSizeFound to true when the initial size id found. r=jesup, r=pehrsons a=kwierso (5d6abe57e0) - Bug 1237176 - Notify synth start if we get a finished event without a blocking-changed event. r=roc (c1aebe903a) - Bug 911546, use a runnable so that popups don't rollup during a grab, r=karlt (a06bd44e6c) - Bug 1237617 - Call nsWindow::ForcePresent during going active r=bas.schouten (066cad8f89) - Bug 1268313: Part 7 - Move NS_NewRunnableMethod and friends to mozilla::NewRunnableMethod. r=froydnj (8b4bf34961) - Bug 1266595: Followup to fix IPDL tests. r=billm (216f2dcff5) - Bug 1268313: Fix up IPDL tests. r=billm (228348d642) - Add WinCompositorWidgetProxy. (bug 1265975 part 1, r=jimm) (bfafe7a8e2) - Implement WinCompositorWidgetProxy::GetClientSize. (bug 1265975 part 2, r=jimm) (a8710a3259) - Move the WM_SETTEXT present lock to CompositorWidgetProxy. (bug 1265975 part 3, r=jimm) (297ce28c8a) - Move transparency handling to WinCompositorWigetProxy. (bug 1265975 part 4, r=jimm) (46ba0c6d01) - Remove Windows-specific compositor calls to nsIWidget. (bug 1265975 part 5, r=jimm) (3ef157c160) - Remove plugin-related CompositorBridgeParent use of nsIWidget. (bug 1265975 part 6, r=jimm) (6d80cdd6fd) - Hide top-level CompositorBridgeParents behind a new API. (bug 1272472 part 4, r=mattwoodrow,kats,gwagner) (228c0efdb7) - Bug 1253424 - part 1 - add a already_AddRefed nsTransactionStack::Push overload; r=erahm (7059e20914) - Bug 1253424 - part 2 - add nsTransactionStack::IsEmpty; r=erahm (7e9764a146) - Bug 1254618 - modify nsTransactionStack to use nsDeque rather than std::deque; r=ehsan (5e47ea431e) - Bug 1136857 - Make DOMStorageCache::mLoaded flag atomic to prevent potential races, r=nfroyd (39aaea1de3) - Bug 1265408 - Add webidl for IIRFilterNode; r=smaug (040ce9aa43) - Bug 1265408 - Implement IIRFilterNode; r=padenot (6bf569a412) - Bug 1265408 - Import IIRFilter from blink; r=padenot (71b28c0ad2) - Bug 1265408 - Use IIRFilter from blink; r=padenot (5d058d8568) - Bug 1265408 - Add buffersAreZero to IIRFilter; r=karlt (45edba3e13) - Bug 1265408 - Avoid subnormals in IIRFilter; r=karlt (0e1ae93f0b) - Bug 1265408 - Add LogToDeveloperConsole to WebAudioUtils; r=padenot (88d5f0222a) - Bug 1268984 - Store GMPStorage on GMPServiceParent so that it persists inside the same PB session. r=gerald (17d4d0abaf) - Bug 1267905 - Replace uses of ScopedCERTCertList with UniqueCERTCertList. r=keeler (783bf11b2a) - Bug 1270005 - Replace uses of ScopedPK11SlotInfo with UniquePK11SlotInfo in PSM. r=keeler (ea9a4011aa) - Bug 1271501 - Remove unnecessary uses of reinterpret_cast in PSM. r=keeler (6be40f0a85) - Bug 1271501 - Downgrade unnecessarily strong reinterpret_casts in PSM. r=keeler (95245f00ce) - Bug 1082346 - 01. Convert PKCS12 password endian using copyAndSwapToBigEndian. r=keeler (9cc58fc550) - Bug 1082346 - 02. Test case. r=keeler r=Cykesiopka (7fb0e8abc4) - Bug 160122 - Stop using PR_smprintf in PSM. r=keeler (1e5b68819c) - Bug 1271501 - Use mozilla::BitwiseCast instead of reinterpret_cast in PSM. r=keeler (894966a2ef) - Bug 1273855: TraceLogger - Include PID in the log names in order to support browser with e10s, r=bbouvier (8cf2233db3) - Bug 1274189. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya. (4511b3d3f7) - Bug 1274189. Part 2 - remove use of FlushableTaskQueue::Flush(). r=jya. (77e745fdd1) - Bug 1274189. Part 3 - remove use of FlushableTaskQueue. r=jya (aac61dcd02) - Bug 1269963. Part 1 - Add a SyncRunnable::DispatchToThread() overload for AbstractThread. r=bobbyholley. (839752aff4) - Bug 1269672 - part1 : revert sampling rate changing of the bug1235612. (9015782e13) - Bug 1270698 - check if we need to enter buffering periodically to ensure we start buffering when running out of decoded audio/video data. r=cpearce. (16734549b7) - Bug 1271581 - use newCurrentTime, instead of GetMediaTime() to decide the nextState; r=jwwang (9c5075eada) - Bug 1224973 - Part 1: Remove MediaDecoderOwner->IsHidden(). r=cpearce,jwwang (4fde3ede5a) - Bug 1224973 - Part 2: Set MediaDecoder visibility via NotifyOwnerActivityChanged. r=cpearce,jwwang (be917202eb) - Bug 1224973 - Part 3: Plumb element visibility into MDSM. r=jya,jwwang (9ec83fa243) - Bug 1224973 - Part 4: Pref media.suspend-bkgnd-video.enabled. r=cpearce,jwwang (43413a025f) - Bug 1269408: P1. Retry InternalSeek if previous attempt failed once more data is available. r=gerald (05db58dc7c) - crude fix (0097068989) - Bug 1269408: P2. Update mochitest. r=gerald (464b4c0724) - Bug 1269408: P3. Ensure a new seek request will cancel the previous internal seek. r=gerald (6ed4b8dc95) - Bug 1269408: P4. Ensure the decoders are flushed prior performing an internal seek. r=gerald (074234067b) - Bug 1269408: P5. Only drop the seek target if it's exactly the seek target. r=gerald (88701eb05a) - Bug 1269408: P6. Add debugging information, useful when a mochitest timeout. r=gerald (ef0270ab0d) - Bug 1269408: P7. Start skip to next keyframe logic when resume point is behind current time. r=gerald (bd40ebf3bc) - Bug 1269408: P8. Add debugging log. r=gerald (e6dbd1f0a6) - Bug 1269408: P9. Move handling logic of skip to next keyframe to its own function. r=gerald (3c8039e417) - Bug 1269408: P10. Reject promise early if in error state. r=me (8af54c574e) - Bug 1224973 - Part 5: Implement suspend decoding for background video. r=cpearce,jwwang,jya (22081521e3) - Bug 1242874 - part1 : create suspened types. r=baku (d3ac9548e5) - Bug 1242874 - part2 : window's suspend attribute. r=baku, r=ehsan (1fd9dc2647) - remove allowscirpted (39ab523036) - Bug 1242874 - part3 : implement different suspended methods. r=baku, r=jwwang (25d1f27a03) - Bug 1242874 - part4 : wrap the volume/mute/suspend for notifyStartedPlaying. r=baku (b8ba3238c2) - bug 1242874 - part5 : add test. r=baku, r=ehsan (f840139b5a) - Bug 1235612 - Part 1: Implement notify media-playback. r=baku (b5ec29da20) - Bug 1235612 - Part 2: Notify audible state in NotifyStartedPlaying. r=baku (dc38583a62) - Bug 1235612 - Part 3: Implement the logic of audible state notification for agent owners. r=baku (f65b3952fa) - Bug 1235612 - Part 4: Modify check audible method. r=jwwang (73457e39eb) - Bug 1269672 - part2 : move audible data checking from MDSM to DecodedAudioDataSink. (d2c3b6874c) - Bug 1269936 - Introduce and call a runtime-wide servo initialization hook. r=heycam (d4d505d4c2) - Bug 1263778 - Rename a bunch of low-level [[Prototype]] access methods to make their interactions with statically-known and dynamically-computed [[Prototype]]s clearer. r=efaust (66bbe8e7db) - Bug 888969 - Permit a cyclic [[Prototype]] chain to be created through a Location object. r=bz, r=efaust (3e3b9cbb16) - re-apply Bug 1054906 - Implement ES6 Symbol.hasInstance 2/2; r=jandem (8d5c7573ff) - Bug 1054906 - Implement ES6 Symbol.hasInstance 1/2; r=evilpie,bz (a836904e5d) - fix misspatch (54a5f2d708) - Bug 1270349 part 1. Add IDL parser support for [LegacyUnenumerableNamedProperties]. r=peterv (8c836bc74a) - Bug 1270349 part 2. Add [LegacyUnenumerableNamedProperties] to the interfaces that specify it in DOM and HTML. r=peterv (25d3cc1377) - Bug 1270349 part 3. Add a way to ask an interface descriptor for a proxy whether its named props should be enumerable. r=peterv (0a9f804867) - Bug 1270349 part 4. Use LegacyUnenumerableNamedProperties instead of NameIsEnumerable() calls to determine whether named props on DOM proxies should be enumerable. r=peterv (82f5158963) - Bug 1270349 part 5. Use LegacyUnenumerableNamedProperties instead of passing flags to GetSupportedNames to determine whether named props on DOM proxies should be reflected in ownPropertyKeys. r=peterv (3984176834) - Bug 1270349 followup to address a review comment. r=peterv (b49f4c5335)
896 lines
20 KiB
C++
896 lines
20 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 "mozilla/Assertions.h"
|
|
#include "mozilla/mozalloc.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsDebug.h"
|
|
#include "nsError.h"
|
|
#include "nsISupportsBase.h"
|
|
#include "nsISupportsUtils.h"
|
|
#include "nsITransaction.h"
|
|
#include "nsITransactionList.h"
|
|
#include "nsITransactionListener.h"
|
|
#include "nsIWeakReference.h"
|
|
#include "nsTransactionItem.h"
|
|
#include "nsTransactionList.h"
|
|
#include "nsTransactionManager.h"
|
|
#include "nsTransactionStack.h"
|
|
|
|
nsTransactionManager::nsTransactionManager(int32_t aMaxTransactionCount)
|
|
: mMaxTransactionCount(aMaxTransactionCount)
|
|
, mDoStack(nsTransactionStack::FOR_UNDO)
|
|
, mUndoStack(nsTransactionStack::FOR_UNDO)
|
|
, mRedoStack(nsTransactionStack::FOR_REDO)
|
|
{
|
|
}
|
|
|
|
nsTransactionManager::~nsTransactionManager()
|
|
{
|
|
}
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_CLASS(nsTransactionManager)
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsTransactionManager)
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK(mListeners)
|
|
tmp->mDoStack.DoUnlink();
|
|
tmp->mUndoStack.DoUnlink();
|
|
tmp->mRedoStack.DoUnlink();
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsTransactionManager)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mListeners)
|
|
tmp->mDoStack.DoTraverse(cb);
|
|
tmp->mUndoStack.DoTraverse(cb);
|
|
tmp->mRedoStack.DoTraverse(cb);
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTransactionManager)
|
|
NS_INTERFACE_MAP_ENTRY(nsITransactionManager)
|
|
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
|
|
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsITransactionManager)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTransactionManager)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsTransactionManager)
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::DoTransaction(nsITransaction *aTransaction)
|
|
{
|
|
nsresult result;
|
|
|
|
NS_ENSURE_TRUE(aTransaction, NS_ERROR_NULL_POINTER);
|
|
|
|
bool doInterrupt = false;
|
|
|
|
result = WillDoNotify(aTransaction, &doInterrupt);
|
|
|
|
if (NS_FAILED(result)) {
|
|
return result;
|
|
}
|
|
|
|
if (doInterrupt) {
|
|
return NS_OK;
|
|
}
|
|
|
|
result = BeginTransaction(aTransaction, nullptr);
|
|
|
|
if (NS_FAILED(result)) {
|
|
DidDoNotify(aTransaction, result);
|
|
return result;
|
|
}
|
|
|
|
result = EndTransaction(false);
|
|
|
|
nsresult result2 = DidDoNotify(aTransaction, result);
|
|
|
|
if (NS_SUCCEEDED(result))
|
|
result = result2;
|
|
|
|
return result;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::UndoTransaction()
|
|
{
|
|
nsresult result = NS_OK;
|
|
|
|
// It is illegal to call UndoTransaction() while the transaction manager is
|
|
// executing a transaction's DoTransaction() method! If this happens,
|
|
// the UndoTransaction() request is ignored, and we return NS_ERROR_FAILURE.
|
|
|
|
if (!mDoStack.IsEmpty()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// Peek at the top of the undo stack. Don't remove the transaction
|
|
// until it has successfully completed.
|
|
RefPtr<nsTransactionItem> tx = mUndoStack.Peek();
|
|
|
|
// Bail if there's nothing on the stack.
|
|
if (!tx) {
|
|
return NS_OK;
|
|
}
|
|
|
|
nsCOMPtr<nsITransaction> t = tx->GetTransaction();
|
|
|
|
bool doInterrupt = false;
|
|
|
|
result = WillUndoNotify(t, &doInterrupt);
|
|
|
|
if (NS_FAILED(result)) {
|
|
return result;
|
|
}
|
|
|
|
if (doInterrupt) {
|
|
return NS_OK;
|
|
}
|
|
|
|
result = tx->UndoTransaction(this);
|
|
|
|
if (NS_SUCCEEDED(result)) {
|
|
tx = mUndoStack.Pop();
|
|
mRedoStack.Push(tx.forget());
|
|
}
|
|
|
|
nsresult result2 = DidUndoNotify(t, result);
|
|
|
|
if (NS_SUCCEEDED(result))
|
|
result = result2;
|
|
|
|
return result;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::RedoTransaction()
|
|
{
|
|
nsresult result = NS_OK;
|
|
|
|
// It is illegal to call RedoTransaction() while the transaction manager is
|
|
// executing a transaction's DoTransaction() method! If this happens,
|
|
// the RedoTransaction() request is ignored, and we return NS_ERROR_FAILURE.
|
|
|
|
if (!mDoStack.IsEmpty()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// Peek at the top of the redo stack. Don't remove the transaction
|
|
// until it has successfully completed.
|
|
RefPtr<nsTransactionItem> tx = mRedoStack.Peek();
|
|
|
|
// Bail if there's nothing on the stack.
|
|
if (!tx) {
|
|
return NS_OK;
|
|
}
|
|
|
|
nsCOMPtr<nsITransaction> t = tx->GetTransaction();
|
|
|
|
bool doInterrupt = false;
|
|
|
|
result = WillRedoNotify(t, &doInterrupt);
|
|
|
|
if (NS_FAILED(result)) {
|
|
return result;
|
|
}
|
|
|
|
if (doInterrupt) {
|
|
return NS_OK;
|
|
}
|
|
|
|
result = tx->RedoTransaction(this);
|
|
|
|
if (NS_SUCCEEDED(result)) {
|
|
tx = mRedoStack.Pop();
|
|
mUndoStack.Push(tx.forget());
|
|
}
|
|
|
|
nsresult result2 = DidRedoNotify(t, result);
|
|
|
|
if (NS_SUCCEEDED(result))
|
|
result = result2;
|
|
|
|
return result;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::Clear()
|
|
{
|
|
nsresult result;
|
|
|
|
result = ClearRedoStack();
|
|
|
|
if (NS_FAILED(result)) {
|
|
return result;
|
|
}
|
|
|
|
result = ClearUndoStack();
|
|
|
|
return result;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::BeginBatch(nsISupports* aData)
|
|
{
|
|
nsresult result;
|
|
|
|
// We can batch independent transactions together by simply pushing
|
|
// a dummy transaction item on the do stack. This dummy transaction item
|
|
// will be popped off the do stack, and then pushed on the undo stack
|
|
// in EndBatch().
|
|
|
|
bool doInterrupt = false;
|
|
|
|
result = WillBeginBatchNotify(&doInterrupt);
|
|
|
|
if (NS_FAILED(result)) {
|
|
return result;
|
|
}
|
|
|
|
if (doInterrupt) {
|
|
return NS_OK;
|
|
}
|
|
|
|
result = BeginTransaction(0, aData);
|
|
|
|
nsresult result2 = DidBeginBatchNotify(result);
|
|
|
|
if (NS_SUCCEEDED(result))
|
|
result = result2;
|
|
|
|
return result;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::EndBatch(bool aAllowEmpty)
|
|
{
|
|
nsCOMPtr<nsITransaction> ti;
|
|
nsresult result;
|
|
|
|
// XXX: Need to add some mechanism to detect the case where the transaction
|
|
// at the top of the do stack isn't the dummy transaction, so we can
|
|
// throw an error!! This can happen if someone calls EndBatch() within
|
|
// the DoTransaction() method of a transaction.
|
|
//
|
|
// For now, we can detect this case by checking the value of the
|
|
// dummy transaction's mTransaction field. If it is our dummy
|
|
// transaction, it should be nullptr. This may not be true in the
|
|
// future when we allow users to execute a transaction when beginning
|
|
// a batch!!!!
|
|
|
|
RefPtr<nsTransactionItem> tx = mDoStack.Peek();
|
|
|
|
if (tx) {
|
|
ti = tx->GetTransaction();
|
|
}
|
|
|
|
if (!tx || ti) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
bool doInterrupt = false;
|
|
|
|
result = WillEndBatchNotify(&doInterrupt);
|
|
|
|
if (NS_FAILED(result)) {
|
|
return result;
|
|
}
|
|
|
|
if (doInterrupt) {
|
|
return NS_OK;
|
|
}
|
|
|
|
result = EndTransaction(aAllowEmpty);
|
|
|
|
nsresult result2 = DidEndBatchNotify(result);
|
|
|
|
if (NS_SUCCEEDED(result))
|
|
result = result2;
|
|
|
|
return result;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::GetNumberOfUndoItems(int32_t *aNumItems)
|
|
{
|
|
*aNumItems = mUndoStack.GetSize();
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::GetNumberOfRedoItems(int32_t *aNumItems)
|
|
{
|
|
*aNumItems = mRedoStack.GetSize();
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::GetMaxTransactionCount(int32_t *aMaxCount)
|
|
{
|
|
NS_ENSURE_TRUE(aMaxCount, NS_ERROR_NULL_POINTER);
|
|
|
|
*aMaxCount = mMaxTransactionCount;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::SetMaxTransactionCount(int32_t aMaxCount)
|
|
{
|
|
int32_t numUndoItems = 0, numRedoItems = 0, total = 0;
|
|
|
|
// It is illegal to call SetMaxTransactionCount() while the transaction
|
|
// manager is executing a transaction's DoTransaction() method because
|
|
// the undo and redo stacks might get pruned! If this happens, the
|
|
// SetMaxTransactionCount() request is ignored, and we return
|
|
// NS_ERROR_FAILURE.
|
|
|
|
if (!mDoStack.IsEmpty()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// If aMaxCount is less than zero, the user wants unlimited
|
|
// levels of undo! No need to prune the undo or redo stacks!
|
|
|
|
if (aMaxCount < 0) {
|
|
mMaxTransactionCount = -1;
|
|
return NS_OK;
|
|
}
|
|
|
|
numUndoItems = mUndoStack.GetSize();
|
|
|
|
numRedoItems = mRedoStack.GetSize();
|
|
|
|
total = numUndoItems + numRedoItems;
|
|
|
|
// If aMaxCount is greater than the number of transactions that currently
|
|
// exist on the undo and redo stack, there is no need to prune the
|
|
// undo or redo stacks!
|
|
|
|
if (aMaxCount > total ) {
|
|
mMaxTransactionCount = aMaxCount;
|
|
return NS_OK;
|
|
}
|
|
|
|
// Try getting rid of some transactions on the undo stack! Start at
|
|
// the bottom of the stack and pop towards the top.
|
|
|
|
while (numUndoItems > 0 && (numRedoItems + numUndoItems) > aMaxCount) {
|
|
RefPtr<nsTransactionItem> tx = mUndoStack.PopBottom();
|
|
|
|
if (!tx) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
--numUndoItems;
|
|
}
|
|
|
|
// If necessary, get rid of some transactions on the redo stack! Start at
|
|
// the bottom of the stack and pop towards the top.
|
|
|
|
while (numRedoItems > 0 && (numRedoItems + numUndoItems) > aMaxCount) {
|
|
RefPtr<nsTransactionItem> tx = mRedoStack.PopBottom();
|
|
|
|
if (!tx) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
--numRedoItems;
|
|
}
|
|
|
|
mMaxTransactionCount = aMaxCount;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::PeekUndoStack(nsITransaction **aTransaction)
|
|
{
|
|
MOZ_ASSERT(aTransaction);
|
|
*aTransaction = PeekUndoStack().take();
|
|
return NS_OK;
|
|
}
|
|
|
|
already_AddRefed<nsITransaction>
|
|
nsTransactionManager::PeekUndoStack()
|
|
{
|
|
RefPtr<nsTransactionItem> tx = mUndoStack.Peek();
|
|
|
|
if (!tx) {
|
|
return nullptr;
|
|
}
|
|
|
|
return tx->GetTransaction();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::PeekRedoStack(nsITransaction** aTransaction)
|
|
{
|
|
MOZ_ASSERT(aTransaction);
|
|
*aTransaction = PeekRedoStack().take();
|
|
return NS_OK;
|
|
}
|
|
|
|
already_AddRefed<nsITransaction>
|
|
nsTransactionManager::PeekRedoStack()
|
|
{
|
|
RefPtr<nsTransactionItem> tx = mRedoStack.Peek();
|
|
|
|
if (!tx) {
|
|
return nullptr;
|
|
}
|
|
|
|
return tx->GetTransaction();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::GetUndoList(nsITransactionList **aTransactionList)
|
|
{
|
|
NS_ENSURE_TRUE(aTransactionList, NS_ERROR_NULL_POINTER);
|
|
|
|
*aTransactionList = (nsITransactionList *)new nsTransactionList(this, &mUndoStack);
|
|
|
|
NS_IF_ADDREF(*aTransactionList);
|
|
|
|
return (! *aTransactionList) ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::GetRedoList(nsITransactionList **aTransactionList)
|
|
{
|
|
NS_ENSURE_TRUE(aTransactionList, NS_ERROR_NULL_POINTER);
|
|
|
|
*aTransactionList = (nsITransactionList *)new nsTransactionList(this, &mRedoStack);
|
|
|
|
NS_IF_ADDREF(*aTransactionList);
|
|
|
|
return (! *aTransactionList) ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::BatchTopUndo()
|
|
{
|
|
if (mUndoStack.GetSize() < 2) {
|
|
// Not enough transactions to merge into one batch.
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<nsTransactionItem> lastUndo;
|
|
RefPtr<nsTransactionItem> previousUndo;
|
|
|
|
lastUndo = mUndoStack.Pop();
|
|
MOZ_ASSERT(lastUndo, "There should be at least two transactions.");
|
|
|
|
previousUndo = mUndoStack.Peek();
|
|
MOZ_ASSERT(previousUndo, "There should be at least two transactions.");
|
|
|
|
nsresult result = previousUndo->AddChild(lastUndo);
|
|
|
|
// Transfer data from the transactions that is going to be
|
|
// merged to the transaction that it is being merged with.
|
|
nsCOMArray<nsISupports>& lastData = lastUndo->GetData();
|
|
nsCOMArray<nsISupports>& previousData = previousUndo->GetData();
|
|
NS_ENSURE_TRUE(previousData.AppendObjects(lastData), NS_ERROR_UNEXPECTED);
|
|
lastData.Clear();
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::RemoveTopUndo()
|
|
{
|
|
if (mUndoStack.IsEmpty()) {
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<nsTransactionItem> lastUndo = mUndoStack.Pop();
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::AddListener(nsITransactionListener *aListener)
|
|
{
|
|
NS_ENSURE_TRUE(aListener, NS_ERROR_NULL_POINTER);
|
|
|
|
return mListeners.AppendObject(aListener) ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::RemoveListener(nsITransactionListener *aListener)
|
|
{
|
|
NS_ENSURE_TRUE(aListener, NS_ERROR_NULL_POINTER);
|
|
|
|
return mListeners.RemoveObject(aListener) ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::ClearUndoStack()
|
|
{
|
|
mUndoStack.Clear();
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTransactionManager::ClearRedoStack()
|
|
{
|
|
mRedoStack.Clear();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::WillDoNotify(nsITransaction *aTransaction, bool *aInterrupt)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->WillDo(this, aTransaction, aInterrupt);
|
|
|
|
if (NS_FAILED(result) || *aInterrupt)
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::DidDoNotify(nsITransaction *aTransaction, nsresult aDoResult)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->DidDo(this, aTransaction, aDoResult);
|
|
|
|
if (NS_FAILED(result))
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::WillUndoNotify(nsITransaction *aTransaction, bool *aInterrupt)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->WillUndo(this, aTransaction, aInterrupt);
|
|
|
|
if (NS_FAILED(result) || *aInterrupt)
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::DidUndoNotify(nsITransaction *aTransaction, nsresult aUndoResult)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->DidUndo(this, aTransaction, aUndoResult);
|
|
|
|
if (NS_FAILED(result))
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::WillRedoNotify(nsITransaction *aTransaction, bool *aInterrupt)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->WillRedo(this, aTransaction, aInterrupt);
|
|
|
|
if (NS_FAILED(result) || *aInterrupt)
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::DidRedoNotify(nsITransaction *aTransaction, nsresult aRedoResult)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->DidRedo(this, aTransaction, aRedoResult);
|
|
|
|
if (NS_FAILED(result))
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::WillBeginBatchNotify(bool *aInterrupt)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->WillBeginBatch(this, aInterrupt);
|
|
|
|
if (NS_FAILED(result) || *aInterrupt)
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::DidBeginBatchNotify(nsresult aResult)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->DidBeginBatch(this, aResult);
|
|
|
|
if (NS_FAILED(result))
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::WillEndBatchNotify(bool *aInterrupt)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->WillEndBatch(this, aInterrupt);
|
|
|
|
if (NS_FAILED(result) || *aInterrupt)
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::DidEndBatchNotify(nsresult aResult)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->DidEndBatch(this, aResult);
|
|
|
|
if (NS_FAILED(result))
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::WillMergeNotify(nsITransaction *aTop, nsITransaction *aTransaction, bool *aInterrupt)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->WillMerge(this, aTop, aTransaction, aInterrupt);
|
|
|
|
if (NS_FAILED(result) || *aInterrupt)
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::DidMergeNotify(nsITransaction *aTop,
|
|
nsITransaction *aTransaction,
|
|
bool aDidMerge,
|
|
nsresult aMergeResult)
|
|
{
|
|
nsresult result = NS_OK;
|
|
for (int32_t i = 0, lcount = mListeners.Count(); i < lcount; i++)
|
|
{
|
|
nsITransactionListener *listener = mListeners[i];
|
|
|
|
NS_ENSURE_TRUE(listener, NS_ERROR_FAILURE);
|
|
|
|
result = listener->DidMerge(this, aTop, aTransaction, aDidMerge, aMergeResult);
|
|
|
|
if (NS_FAILED(result))
|
|
break;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::BeginTransaction(nsITransaction *aTransaction,
|
|
nsISupports *aData)
|
|
{
|
|
nsresult result = NS_OK;
|
|
|
|
// XXX: POSSIBLE OPTIMIZATION
|
|
// We could use a factory that pre-allocates/recycles transaction items.
|
|
RefPtr<nsTransactionItem> tx = new nsTransactionItem(aTransaction);
|
|
|
|
if (aData) {
|
|
nsCOMArray<nsISupports>& data = tx->GetData();
|
|
data.AppendObject(aData);
|
|
}
|
|
|
|
if (!tx) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
mDoStack.Push(tx);
|
|
|
|
result = tx->DoTransaction();
|
|
|
|
if (NS_FAILED(result)) {
|
|
tx = mDoStack.Pop();
|
|
return result;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsTransactionManager::EndTransaction(bool aAllowEmpty)
|
|
{
|
|
nsresult result = NS_OK;
|
|
|
|
RefPtr<nsTransactionItem> tx = mDoStack.Pop();
|
|
|
|
if (!tx)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
nsCOMPtr<nsITransaction> tint = tx->GetTransaction();
|
|
|
|
if (!tint && !aAllowEmpty) {
|
|
int32_t nc = 0;
|
|
|
|
// If we get here, the transaction must be a dummy batch transaction
|
|
// created by BeginBatch(). If it contains no children, get rid of it!
|
|
|
|
tx->GetNumberOfChildren(&nc);
|
|
|
|
if (!nc) {
|
|
return result;
|
|
}
|
|
}
|
|
|
|
// Check if the transaction is transient. If it is, there's nothing
|
|
// more to do, just return.
|
|
|
|
bool isTransient = false;
|
|
|
|
if (tint)
|
|
result = tint->GetIsTransient(&isTransient);
|
|
|
|
if (NS_FAILED(result) || isTransient || !mMaxTransactionCount) {
|
|
// XXX: Should we be clearing the redo stack if the transaction
|
|
// is transient and there is nothing on the do stack?
|
|
return result;
|
|
}
|
|
|
|
// Check if there is a transaction on the do stack. If there is,
|
|
// the current transaction is a "sub" transaction, and should
|
|
// be added to the transaction at the top of the do stack.
|
|
|
|
RefPtr<nsTransactionItem> top = mDoStack.Peek();
|
|
if (top) {
|
|
result = top->AddChild(tx);
|
|
|
|
// XXX: What do we do if this fails?
|
|
|
|
return result;
|
|
}
|
|
|
|
// The transaction succeeded, so clear the redo stack.
|
|
|
|
result = ClearRedoStack();
|
|
|
|
if (NS_FAILED(result)) {
|
|
// XXX: What do we do if this fails?
|
|
}
|
|
|
|
// Check if we can coalesce this transaction with the one at the top
|
|
// of the undo stack.
|
|
|
|
top = mUndoStack.Peek();
|
|
|
|
if (tint && top) {
|
|
bool didMerge = false;
|
|
nsCOMPtr<nsITransaction> topTransaction = top->GetTransaction();
|
|
|
|
if (topTransaction) {
|
|
|
|
bool doInterrupt = false;
|
|
|
|
result = WillMergeNotify(topTransaction, tint, &doInterrupt);
|
|
|
|
NS_ENSURE_SUCCESS(result, result);
|
|
|
|
if (!doInterrupt) {
|
|
result = topTransaction->Merge(tint, &didMerge);
|
|
|
|
nsresult result2 = DidMergeNotify(topTransaction, tint, didMerge, result);
|
|
|
|
if (NS_SUCCEEDED(result))
|
|
result = result2;
|
|
|
|
if (NS_FAILED(result)) {
|
|
// XXX: What do we do if this fails?
|
|
}
|
|
|
|
if (didMerge) {
|
|
return result;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Check to see if we've hit the max level of undo. If so,
|
|
// pop the bottom transaction off the undo stack and release it!
|
|
|
|
int32_t sz = mUndoStack.GetSize();
|
|
|
|
if (mMaxTransactionCount > 0 && sz >= mMaxTransactionCount) {
|
|
RefPtr<nsTransactionItem> overflow = mUndoStack.PopBottom();
|
|
}
|
|
|
|
// Push the transaction on the undo stack:
|
|
|
|
mUndoStack.Push(tx.forget());
|
|
|
|
return NS_OK;
|
|
}
|
|
|