DB-2460: merge with Firefox 74.0.1

alver-cliqz · alver-cliqz · commit 0afc7e4191de · 2020-04-03T16:20:43.000+02:00
diff --git a/mozilla-release/browser/app/blocklist.xml b/mozilla-release/browser/app/blocklist.xml
diff --git a/mozilla-release/browser/config/version.txt b/mozilla-release/browser/config/version.txt
@@ -1 +1 @@
-74.0
+74.0.1
diff --git a/mozilla-release/browser/config/version_display.txt b/mozilla-release/browser/config/version_display.txt
@@ -1 +1 @@
-1.34.0
+1.34.1
diff --git a/mozilla-release/config/milestone.txt b/mozilla-release/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-74.0
+74.0.1
diff --git a/mozilla-release/docshell/base/nsDocShell.cpp b/mozilla-release/docshell/base/nsDocShell.cpp
@@ -420,6 +420,12 @@ nsDocShell::~nsDocShell() {
     mSessionHistory->LegacySHistory()->ClearRootBrowsingContext();
   }
 
+  if (mContentViewer) {
+    mContentViewer->Close(nullptr);
+    mContentViewer->Destroy();
+    mContentViewer = nullptr;
+  }
+
   if (--gDocShellCount == 0) {
     NS_IF_RELEASE(sURIFixup);
   }
diff --git a/mozilla-release/dom/cache/StreamList.cpp b/mozilla-release/dom/cache/StreamList.cpp
@@ -133,7 +133,15 @@ void StreamList::Close(const nsID& aId) {
 void StreamList::CloseAll() {
   NS_ASSERT_OWNINGTHREAD(StreamList);
   if (mStreamControl) {
-    mStreamControl->CloseAll();
+    auto streamControl = mStreamControl;
+    mStreamControl = nullptr;
+
+    streamControl->CloseAll();
+
+    mStreamControl = streamControl;
+    streamControl = nullptr;
+
+    mStreamControl->Shutdown();
   }
 }
 
diff --git a/mozilla-release/js/src/tests/jstests.list b/mozilla-release/js/src/tests/jstests.list
@@ -508,3 +508,7 @@ skip script test262/language/expressions/super/call-proto-not-ctor.js
 
 # Tests expects RangeError, but should instead expect TypeError.
 skip script test262/intl402/NumberFormat/constructor-order.js
+
+# DST issues, bug 1620825.
+skip script test262/built-ins/Date/parse/without-utc-offset.js
+
diff --git a/mozilla-release/services/settings/dumps/blocklists/addons.json b/mozilla-release/services/settings/dumps/blocklists/addons.json
diff --git a/mozilla-release/services/settings/dumps/blocklists/plugins.json b/mozilla-release/services/settings/dumps/blocklists/plugins.json
diff --git a/mozilla-release/services/settings/dumps/security-state/onecrl.json b/mozilla-release/services/settings/dumps/security-state/onecrl.json
diff --git a/mozilla-release/taskcluster/ci/test/kind.yml b/mozilla-release/taskcluster/ci/test/kind.yml
@@ -13,7 +13,6 @@ kind-dependencies:
 transforms:
     - taskgraph.transforms.tests:transforms
     - taskgraph.transforms.job:transforms
-    - taskgraph.transforms.coalesce:transforms
     - taskgraph.transforms.task:transforms
 
 # Each stanza in a file pointed to by 'jobs-from' describes a particular test
diff --git a/mozilla-release/taskcluster/scripts/misc/wgpu-deps-vendoring.sh b/mozilla-release/taskcluster/scripts/misc/wgpu-deps-vendoring.sh
@@ -10,10 +10,9 @@ UPLOAD_DIR=$HOME/artifacts
 
 cd $GECKO_PATH
 export PATH=$PATH:$MOZ_FETCHES_DIR/rustc/bin:$HOME/.cargo/bin
-cargo install --version 0.1.23 cargo-vendor
 cd gfx/wgpu/
 mkdir .cargo
-cargo-vendor vendor --relative-path --sync ./Cargo.toml > .cargo/config
+cargo vendor --sync ./Cargo.toml > .cargo/config
 mkdir wgpu-deps
 mv vendor .cargo wgpu-deps/
 mkdir wgpu-deps/cargo-apk
diff --git a/mozilla-release/taskcluster/scripts/misc/wrench-deps-vendoring.sh b/mozilla-release/taskcluster/scripts/misc/wrench-deps-vendoring.sh
@@ -10,10 +10,9 @@ UPLOAD_DIR=$HOME/artifacts
 
 cd $GECKO_PATH
 export PATH=$PATH:$MOZ_FETCHES_DIR/rustc/bin:$HOME/.cargo/bin
-cargo install --version 0.1.23 cargo-vendor
 cd gfx/wr/
 mkdir .cargo
-cargo-vendor vendor --relative-path --sync ./Cargo.toml > .cargo/config
+cargo vendor --sync ./Cargo.toml > .cargo/config
 mkdir wrench-deps
 mv vendor .cargo wrench-deps/
 mkdir wrench-deps/cargo-apk
diff --git a/mozilla-release/taskcluster/taskgraph/transforms/coalesce.py b/mozilla-release/taskcluster/taskgraph/transforms/coalesce.py
diff --git a/mozilla-release/taskcluster/taskgraph/transforms/job/__init__.py b/mozilla-release/taskcluster/taskgraph/transforms/job/__init__.py
@@ -65,7 +65,6 @@
     Optional('run-on-projects'): task_description_schema['run-on-projects'],
     Optional('shipping-phase'): task_description_schema['shipping-phase'],
     Optional('shipping-product'): task_description_schema['shipping-product'],
-    Optional('coalesce'): task_description_schema['coalesce'],
     Optional('always-target'): task_description_schema['always-target'],
     Exclusive('optimization', 'optimization'): task_description_schema['optimization'],
     Optional('needs-sccache'): task_description_schema['needs-sccache'],
diff --git a/mozilla-release/taskcluster/taskgraph/transforms/openh264.py b/mozilla-release/taskcluster/taskgraph/transforms/openh264.py
@@ -15,14 +15,7 @@
 @transforms.add
 def set_mh_options(config, jobs):
     """
-    This transform enables coalescing for tasks with scm level > 1, setting the
-    name to be equal to the the first 20 chars of the sha256 of the task name
-    (label). The hashing is simply used to keep the name short, unique, and
-    alphanumeric, since it is used in AMQP routing keys.
-
-    Note, the coalescing keys themselves are not intended to be readable
-    strings or embed information. The tasks they represent contain all relevant
-    metadata.
+    This transform sets the 'openh264_rev' attribute.
     """
     for job in jobs:
         repo = job.pop('repo')
diff --git a/mozilla-release/taskcluster/taskgraph/transforms/task.py b/mozilla-release/taskcluster/taskgraph/transforms/task.py
@@ -192,27 +192,6 @@ def _compute_geckoview_version(app_version, moz_build_date):
         text_type
     ),
 
-    # Coalescing provides the facility for tasks to be superseded by the same
-    # task in a subsequent commit, if the current task backlog reaches an
-    # explicit threshold. Both age and size thresholds need to be met in order
-    # for coalescing to be triggered.
-    Optional('coalesce'): {
-        # A unique identifier per job (typically a hash of the job label) in
-        # order to partition tasks into appropriate sets for coalescing. This
-        # is combined with the project in order to generate a unique coalescing
-        # key for the coalescing service.
-        'job-identifier': text_type,
-
-        # The minimum amount of time in seconds between two pending tasks with
-        # the same coalescing key, before the coalescing service will return
-        # tasks.
-        'age': int,
-
-        # The minimum number of backlogged tasks with the same coalescing key,
-        # before the coalescing service will return tasks.
-        'size': int,
-    },
-
     # The `always-target` attribute will cause the task to be included in the
     # target_task_graph regardless of filtering. Tasks included in this manner
     # will be candidates for optimization even when `optimize_target_tasks` is
@@ -321,10 +300,6 @@ def get_branch_repo(config):
     )]
 
 
-COALESCE_KEY = '{project}.{job-identifier}'
-SUPERSEDER_URL = 'https://coalesce.mozilla-releng.net/v1/list/{age}/{size}/{key}'
-
-
 @memoize
 def get_default_priority(graph_config, project):
     return evaluate_keyed_by(
@@ -364,24 +339,6 @@ def wrap(func):
     return wrap
 
 
-def coalesce_key(config, task):
-    return COALESCE_KEY.format(**{
-               'project': config.params['project'],
-               'job-identifier': task['coalesce']['job-identifier'],
-           })
-
-
-def superseder_url(config, task):
-    key = coalesce_key(config, task)
-    age = task['coalesce']['age']
-    size = task['coalesce']['size']
-    return SUPERSEDER_URL.format(
-        age=age,
-        size=size,
-        key=key
-    )
-
-
 UNSUPPORTED_INDEX_PRODUCT_ERROR = """\
 The gecko-v2 product {product} is not in the list of configured products in
 `taskcluster/ci/config.yml'.
@@ -685,10 +642,6 @@ def build_docker_worker_payload(config, task, task_def):
     if capabilities:
         payload['capabilities'] = capabilities
 
-    # coalesce / superseding
-    if 'coalesce' in task:
-        payload['supersederUrl'] = superseder_url(config, task)
-
     check_caches_are_volumes(task)
 
 
@@ -886,10 +839,6 @@ def build_generic_worker_payload(config, task, task_def):
     if features:
         task_def['payload']['features'] = features
 
-    # coalesce / superseding
-    if 'coalesce' in task:
-        task_def['payload']['supersederUrl'] = superseder_url(config, task)
-
 
 @payload_builder('scriptworker-signing', schema={
     # the maximum time to run, in seconds
@@ -1900,10 +1849,6 @@ def build_task(config, tasks):
         if 'deadline-after' not in task:
             task['deadline-after'] = '1 day'
 
-        if 'coalesce' in task:
-            key = coalesce_key(config, task)
-            routes.append('coalesce.v1.' + key)
-
         if 'priority' not in task:
             task['priority'] = get_default_priority(config.graph_config, config.params['project'])
 

Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,12 @@ nsDocShell::~nsDocShell() {`
`420`	`420`	`mSessionHistory->LegacySHistory()->ClearRootBrowsingContext();`
`421`	`421`	`}`
`422`	`422`
	`423`	`+ if (mContentViewer) {`
	`424`	`+ mContentViewer->Close(nullptr);`
	`425`	`+ mContentViewer->Destroy();`
	`426`	`+ mContentViewer = nullptr;`
	`427`	`+ }`
	`428`	`+`
`423`	`429`	`if (--gDocShellCount == 0) {`
`424`	`430`	`NS_IF_RELEASE(sURIFixup);`
`425`	`431`	`}`