Commit 9729661c authored by Butkovits Atila's avatar Butkovits Atila
Browse files

Merge autoland to mozilla-central. a=merge

parents d7a9009c 7355d8d0

.cargo/config.in

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ rev = "2689788cecf24c385e6b7440e3aa1a89c511f14a" 
[source."https://github.com/mozilla-spidermonkey/jsparagus"]

git = "https://github.com/mozilla-spidermonkey/jsparagus"

replace-with = "vendored-sources"

rev = "20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2"

rev = "fdc257c896c6deb9f293676ec9508123611dec62"



[source."https://github.com/kinetiknz/mio-named-pipes"]

git = "https://github.com/kinetiknz/mio-named-pipes"

Cargo.lock

+8 −8
Original line number Diff line number Diff line
@@ -2715,7 +2715,7 @@ version = "0.3.100" 
[[package]]

name = "jsparagus"

version = "0.1.0"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2#20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=fdc257c896c6deb9f293676ec9508123611dec62#fdc257c896c6deb9f293676ec9508123611dec62"

dependencies = [

 "jsparagus-ast",

 "jsparagus-emitter",
@@ -2729,7 +2729,7 @@ dependencies = [ 
[[package]]

name = "jsparagus-ast"

version = "0.1.0"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2#20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=fdc257c896c6deb9f293676ec9508123611dec62#fdc257c896c6deb9f293676ec9508123611dec62"

dependencies = [

 "bumpalo",

 "indexmap",
@@ -2738,7 +2738,7 @@ dependencies = [ 
[[package]]

name = "jsparagus-emitter"

version = "0.1.0"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2#20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=fdc257c896c6deb9f293676ec9508123611dec62#fdc257c896c6deb9f293676ec9508123611dec62"

dependencies = [

 "bumpalo",

 "byteorder",
@@ -2751,7 +2751,7 @@ dependencies = [ 
[[package]]

name = "jsparagus-generated-parser"

version = "0.1.0"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2#20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=fdc257c896c6deb9f293676ec9508123611dec62#fdc257c896c6deb9f293676ec9508123611dec62"

dependencies = [

 "bumpalo",

 "jsparagus-ast",
@@ -2761,12 +2761,12 @@ dependencies = [ 
[[package]]

name = "jsparagus-json-log"

version = "0.1.0"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2#20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=fdc257c896c6deb9f293676ec9508123611dec62#fdc257c896c6deb9f293676ec9508123611dec62"



[[package]]

name = "jsparagus-parser"

version = "0.1.0"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2#20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=fdc257c896c6deb9f293676ec9508123611dec62#fdc257c896c6deb9f293676ec9508123611dec62"

dependencies = [

 "arrayvec",

 "bumpalo",
@@ -2778,7 +2778,7 @@ dependencies = [ 
[[package]]

name = "jsparagus-scope"

version = "0.1.0"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2#20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=fdc257c896c6deb9f293676ec9508123611dec62#fdc257c896c6deb9f293676ec9508123611dec62"

dependencies = [

 "indexmap",

 "jsparagus-ast",
@@ -2788,7 +2788,7 @@ dependencies = [ 
[[package]]

name = "jsparagus-stencil"

version = "0.1.0"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2#20d01b2c01a5be01d3dea3ec7a1ede2fdda3d9d2"

source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=fdc257c896c6deb9f293676ec9508123611dec62#fdc257c896c6deb9f293676ec9508123611dec62"

dependencies = [

 "jsparagus-ast",

]

docshell/base/CanonicalBrowsingContext.cpp

+10 −0
Original line number Diff line number Diff line
@@ -314,6 +314,16 @@ void CanonicalBrowsingContext::ReplacedBy( 
  txn.SetEmbedderColorScheme(GetEmbedderColorScheme());

  txn.SetHasRestoreData(GetHasRestoreData());

  txn.SetShouldDelayMediaFromStart(GetShouldDelayMediaFromStart());



  // Propagate some settings on BrowsingContext replacement so they're not lost

  // on bfcached navigations. These are important for GeckoView (see bug

  // 1781936).

  txn.SetAllowJavascript(GetAllowJavascript());

  txn.SetForceEnableTrackingProtection(GetForceEnableTrackingProtection());

  txn.SetUserAgentOverride(GetUserAgentOverride());

  txn.SetSuspendMediaWhenInactive(GetSuspendMediaWhenInactive());

  txn.SetDisplayMode(GetDisplayMode());



  // As this is a different BrowsingContext, set InitialSandboxFlags to the

  // current flags in the new context so that they also apply to any initial

  // about:blank documents created in it.

docshell/base/nsDocShell.cpp

+0 −1
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext, 
      mTitleValidForCurrentURI(false),

      mWillChangeProcess(false),

      mIsNavigating(false),

      mSuspendMediaWhenInactive(false),

      mForcedAutodetection(false),

      mCheckingSessionHistory(false),

      mNeedToReportActiveAfterLoadingBecomesActive(false) {

docshell/base/nsDocShell.h

+0 −4
Original line number Diff line number Diff line
@@ -1362,10 +1362,6 @@ class nsDocShell final : public nsDocLoader, 
  // nsIWebNavigation navigation method.

  bool mIsNavigating : 1;



  // This flag indicates whether the media in this docshell should be suspended

  // when the docshell is inactive.

  bool mSuspendMediaWhenInactive : 1;



  // Whether we have a pending encoding autodetection request from the

  // menu for all encodings.

  bool mForcedAutodetection : 1;