widget/nsAutoRollup.cpp
author Doug Thayer <dothayer@mozilla.com>
Fri, 01 Mar 2019 18:29:09 +0000
changeset 520116 8b3fe0426ffc1b3a2ad044ef6cdde6c4f736f8e2
parent 519789 0707c5d273227aed4fb04a8f6360875165f83ddd
permissions -rw-r--r--
Bug 1442694 - Fix failures due to removing selected tab r=Gijs This adds test which reproduce the failure as well as the fix. Essentially, if we hit the edited case in SessionStore with `tab` equal to `tabbrowser.tabs[t]`, we remove the tab and then try to pin it, which obviously blows up. Note: the additional method in SessionStore.jsm was largely to get around complexity requirements inside restoreWindow. Cleaner solutions welcome. Differential Revision: https://phabricator.services.mozilla.com/D21383

/* -*- 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/widget/nsAutoRollup.h"

namespace mozilla {
namespace widget {

/*static*/
uint32_t nsAutoRollup::sCount = 0;
/*static*/
StaticRefPtr<nsIContent> nsAutoRollup::sLastRollup;

nsAutoRollup::nsAutoRollup() {
  // remember if sLastRollup was null, and only clear it upon destruction
  // if so. This prevents recursive usage of nsAutoRollup from clearing
  // sLastRollup when it shouldn't.
  mWasClear = !sLastRollup;
  sCount++;
}

nsAutoRollup::nsAutoRollup(nsIContent* aRollup) {
  MOZ_ASSERT(!sLastRollup);
  mWasClear = true;
  sCount++;
  SetLastRollup(aRollup);
}

nsAutoRollup::~nsAutoRollup() {
  if (sLastRollup && mWasClear) {
    sLastRollup = nullptr;
  }
  sCount--;
}

/*static*/
void nsAutoRollup::SetLastRollup(nsIContent* aLastRollup) {
  // There must be at least one nsAutoRollup on the stack.
  MOZ_ASSERT(sCount);

  sLastRollup = aLastRollup;
}

/*static*/
nsIContent* nsAutoRollup::GetLastRollup() { return sLastRollup.get(); }

}  // namespace widget
}  // namespace mozilla