Commit 299b5e79 authored by Razvan Maries's avatar Razvan Maries
Browse files

Merge mozilla-inbound to mozilla-central a=merge

parents 599c8191 d86ab4b7

docshell/base/nsDocShell.cpp

+1 −1
Original line number Diff line number Diff line
@@ -10381,7 +10381,7 @@ nsresult nsDocShell::DoChannelLoad(nsIChannel* aChannel, 
  // We're about to load a new page and it may take time before necko

  // gives back any data, so main thread might have a chance to process a

  // collector slice

  nsJSContext::MaybeRunNextCollectorSlice(this, JS::gcreason::DOCSHELL);

  nsJSContext::MaybeRunNextCollectorSlice(this, JS::GCReason::DOCSHELL);



  // Success.  Keep the initial ClientSource if it exists.

  cleanupInitialClient.release();

dom/base/FuzzingFunctions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ namespace mozilla { 
namespace dom {



/* static */ void FuzzingFunctions::GarbageCollect(const GlobalObject&) {

  nsJSContext::GarbageCollectNow(JS::gcreason::COMPONENT_UTILS,

  nsJSContext::GarbageCollectNow(JS::GCReason::COMPONENT_UTILS,

                                 nsJSContext::NonIncrementalGC,

                                 nsJSContext::NonShrinkingGC);

}

dom/base/nsDOMWindowUtils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ NS_IMETHODIMP 
nsDOMWindowUtils::GarbageCollect(nsICycleCollectorListener* aListener) {

  AUTO_PROFILER_LABEL("nsDOMWindowUtils::GarbageCollect", GCCC);



  nsJSContext::GarbageCollectNow(JS::gcreason::DOM_UTILS);

  nsJSContext::GarbageCollectNow(JS::GCReason::DOM_UTILS);

  nsJSContext::CycleCollectNow(aListener);



  return NS_OK;
@@ -1051,7 +1051,7 @@ nsDOMWindowUtils::CycleCollect(nsICycleCollectorListener* aListener) { 


NS_IMETHODIMP

nsDOMWindowUtils::RunNextCollectorTimer() {

  nsJSContext::RunNextCollectorTimer(JS::gcreason::DOM_WINDOW_UTILS);

  nsJSContext::RunNextCollectorTimer(JS::GCReason::DOM_WINDOW_UTILS);



  return NS_OK;

}

dom/base/nsGlobalWindowInner.cpp

+3 −2
Original line number Diff line number Diff line
@@ -6006,10 +6006,11 @@ bool nsGlobalWindowInner::RunTimeoutHandler(Timeout* aTimeout, 
        nsJSUtils::ExecutionContext exec(aes.cx(), global);

        rv = exec.Compile(options, handler->GetHandlerText());



        if (rv == NS_OK) {

        JS::Rooted<JSScript*> script(aes.cx(), exec.MaybeGetScript());

        if (script) {

          LoadedScript* initiatingScript = handler->GetInitiatingScript();

          if (initiatingScript) {

            initiatingScript->AssociateWithScript(exec.GetScript());

            initiatingScript->AssociateWithScript(script);

          }



          rv = exec.ExecScript();

dom/base/nsGlobalWindowOuter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2495,7 +2495,7 @@ void nsGlobalWindowOuter::DetachFromDocShell() { 
    // When we're about to destroy a top level content window

    // (for example a tab), we trigger a full GC by passing null as the last

    // param. We also trigger a full GC for chrome windows.

    nsJSContext::PokeGC(JS::gcreason::SET_DOC_SHELL,

    nsJSContext::PokeGC(JS::GCReason::SET_DOC_SHELL,

                        (mTopLevelOuterContentWindow || mIsChrome)

                            ? nullptr

                            : GetWrapperPreserveColor());