Merge mozilla-central to inbound. a=merge CLOSED TREE

browsermt · Sep 10, 2019 · dd736a1 · dd736a1
2 parents 17db683 + dffa39b
commit dd736a1
Show file tree

Hide file tree

Showing 588 changed files with 805 additions and 15,392 deletions.
diff --git a/accessible/interfaces/gecko/Makefile.in b/accessible/interfaces/gecko/Makefile.in
@@ -16,7 +16,7 @@ MIDL_GENERATED_FILES = \
 # midl targets to avoid timestamp caching issues.
 $(MIDL_GENERATED_FILES): done_gen ;
 
-done_gen: IGeckoCustom.idl
+done_gen: $(srcdir)/IGeckoCustom.idl
 	$(MIDL) $(MIDL_FLAGS) -I $(srcdir) -Oicf $(srcdir)/IGeckoCustom.idl
 	touch $@
 

diff --git a/accessible/interfaces/msaa/Makefile.in b/accessible/interfaces/msaa/Makefile.in
@@ -16,10 +16,10 @@ MIDL_GENERATED_FILES = \
 # midl targets to avoid timestamp caching issues.
 $(MIDL_GENERATED_FILES): done_gen ;
 
-done_gen: ISimpleDOM.idl \
-          ISimpleDOMNode.idl \
-          ISimpleDOMDocument.idl \
-          ISimpleDOMText.idl
+done_gen: $(srcdir)/ISimpleDOM.idl \
+          $(srcdir)/ISimpleDOMNode.idl \
+          $(srcdir)/ISimpleDOMDocument.idl \
+          $(srcdir)/ISimpleDOMText.idl
 
 	$(MIDL) $(MIDL_FLAGS) -I $(srcdir) -robust -Oicf $(srcdir)/ISimpleDOM.idl
 	touch $@

diff --git a/accessible/ipc/win/handler/Makefile.in b/accessible/ipc/win/handler/Makefile.in
@@ -21,7 +21,7 @@ export:: $(MIDL_GENERATED_FILES)
 # midl targets to avoid timestamp caching issues.
 $(MIDL_GENERATED_FILES): midl_done ;
 
-midl_done: HandlerData.acf HandlerData.idl
+midl_done: $(srcdir)/HandlerData.acf $(srcdir)/HandlerData.idl
 	$(MIDL) $(MIDL_FLAGS) $(DEFINES) -I $(topobjdir) -I $(DIST)/include -I $(IA2DIR) -I $(MSAADIR) -Oicf -acf $(srcdir)/HandlerData.acf $(srcdir)/HandlerData.idl
 	touch $@
 

diff --git a/accessible/ipc/win/typelib/Makefile.in b/accessible/ipc/win/typelib/Makefile.in
@@ -15,7 +15,7 @@ MIDL_GENERATED_FILES = \
 # midl targets to avoid timestamp caching issues.
 $(MIDL_GENERATED_FILES): done_gen ;
 
-done_gen: Accessible.idl
+done_gen: $(srcdir)/Accessible.idl
 	$(MIDL) $(MIDL_FLAGS) -Oicf $(srcdir)/Accessible.idl
 	touch $@
 

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
@@ -31,7 +31,7 @@ ifeq ($(OS_ARCH),WINNT)
 # (this dependency should really be just for firefox.exe, not other targets)
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
-EXTRA_DEPS += firefox.exe.manifest
+EXTRA_DEPS += $(srcdir)/firefox.exe.manifest
 endif
 
 PROGRAMS_DEST = $(DIST)/bin

diff --git a/browser/app/winlauncher/ErrorHandler.cpp b/browser/app/winlauncher/ErrorHandler.cpp
@@ -16,6 +16,7 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
 #include "mozilla/WindowsVersion.h"
+#include "mozilla/WinTokenUtils.h"
 #include "mozilla/XREAppData.h"
 #include "nsWindowsHelpers.h"
 
@@ -535,6 +536,12 @@ static bool PrepPing(const PingThreadContext& aContext, const std::wstring& aId,
   aJson.IntProperty("cpu_arch", sysInfo.wProcessorArchitecture);
   aJson.IntProperty("num_logical_cpus", sysInfo.dwNumberOfProcessors);
 
+  mozilla::LauncherResult<bool> isAdminWithoutUac =
+      mozilla::IsAdminWithoutUac();
+  if (isAdminWithoutUac.isOk()) {
+    aJson.BoolProperty("is_admin_without_uac", isAdminWithoutUac.unwrap());
+  }
+
   MEMORYSTATUSEX memStatus = {sizeof(memStatus)};
   if (::GlobalMemoryStatusEx(&memStatus)) {
     aJson.StartObjectProperty("memory");

diff --git a/browser/base/content/test/permissions/browser_temporary_permissions.js b/browser/base/content/test/permissions/browser_temporary_permissions.js
@@ -67,6 +67,19 @@ add_task(async function testTempPermissionSubframes() {
       "popupshown"
     );
 
+    await new Promise(r => {
+      SpecialPowers.pushPrefEnv(
+        {
+          set: [
+            ["dom.security.featurePolicy.enabled", true],
+            ["dom.security.featurePolicy.header.enabled", true],
+            ["dom.security.featurePolicy.webidl.enabled", true],
+          ],
+        },
+        r
+      );
+    });
+
     // Request a permission.
     await ContentTask.spawn(browser, uri.host, async function(host0) {
       // FIXME(Fission): The load event fires before cross-origin iframes have

diff --git a/browser/base/content/test/permissions/temporary_permissions_subframe.html b/browser/base/content/test/permissions/temporary_permissions_subframe.html
@@ -5,6 +5,6 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8"></meta>
 </head>
 <body>
-  <iframe id="frame" src="https://example.org/browser/browser/base/content/test/permissions/permissions.html" />
+  <iframe id="frame" src="https://example.org/browser/browser/base/content/test/permissions/permissions.html" allow="geolocation"/>
 </body>
 </html>
diff --git a/build/mozconfig.cache b/build/mozconfig.cache
@@ -9,51 +9,64 @@ if test -z "$bucket" -a -z "$SCCACHE_DISABLE" -a -z "$MOZ_PGO"; then
 
     # prevent rerun if az is set, or wget is not available
     if test -z "$availability_zone" -a -x "$(command -v wget)"; then
-        if test -n "${TASKCLUSTER_WORKER_GROUP}"; then
-            # TASKCLUSTER_WORKER_GROUP is just the region now, so
-            # stick an extra character on to make the already-convoluted logic
-            # here simpler.
-            availability_zone="${TASKCLUSTER_WORKER_GROUP}x"
-        elif [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
-            # gcp availability_zone is of the form <region>-<letter> where region is e.g. us-west2, and az is us-west2-a
-            gcp_zone=$(wget -T 1 -t 1 -q -O - http://169.254.169.254/computeMetadata/v1beta1/instance/zone || true)
-            availability_zone=${gcp_zone##*/}
-        else
-            # timeout after 1 second, and don't retry (failure indicates instance is not in ec2 or network issue)
-            # ec2 availability_zone is of the form <region><letter> where region is e.g. us-west-2, and az is us-west-2a
-            availability_zone=$(wget -T 1 -t 1 -q -O - http://169.254.169.254/latest/meta-data/placement/availability-zone || true)
+        if test -n "$TASKCLUSTER_WORKER_LOCATION" -a -x "$(command -v jq)"; then
+            cloud=$(echo $TASKCLUSTER_WORKER_LOCATION | jq .cloud | tr -d \")
+            case $cloud in
+                aws|google)
+                    availability_zone=$(echo $TASKCLUSTER_WORKER_LOCATION | jq .availabilityZone | tr -d \")
+                    region=$(echo $TASKCLUSTER_WORKER_LOCATION | jq .region | tr -d \")
+                    ;;
+            esac
+        fi
+        if test -z "$availability_zone" -o -z "$region"; then
+            if test -n "${TASKCLUSTER_WORKER_GROUP}"; then
+                # TASKCLUSTER_WORKER_GROUP is just the region now, so
+                # stick an extra character on to make the already-convoluted logic
+                # here simpler.
+                availability_zone="${TASKCLUSTER_WORKER_GROUP}x"
+            elif [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
+                # gcp availability_zone is of the form <region>-<letter> where region is e.g. us-west2, and az is us-west2-a
+                gcp_zone=$(wget -T 1 -t 1 -q -O - http://169.254.169.254/computeMetadata/v1beta1/instance/zone || true)
+                availability_zone=${gcp_zone##*/}
+            else
+                # timeout after 1 second, and don't retry (failure indicates instance is not in ec2 or network issue)
+                # ec2 availability_zone is of the form <region><letter> where region is e.g. us-west-2, and az is us-west-2a
+                availability_zone=$(wget -T 1 -t 1 -q -O - http://169.254.169.254/latest/meta-data/placement/availability-zone || true)
+            fi
         fi
         if test -z "$availability_zone" -o "$availability_zone" = "not-ec2"; then
             availability_zone=not-ec2
-        elif [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
-            # gcp region is az with last two letters trimmed
-            region=${availability_zone::${#availability_zone}-2}
-            case "${GECKO_HEAD_REPOSITORY}" in
-            *hg.mozilla.org/try*)
-                bucket=taskcluster-level-1-sccache-${region}
+        elif test -n "$cloud"; then
+            case $cloud in
+            google)
+                bucket=sccache-l${MOZ_SCM_LEVEL}-${region}
                 ;;
-            *hg.mozilla.org/integration/autoland*|*hg.mozilla.org/integration/mozilla-inbound*)
-                bucket=taskcluster-level-3-sccache-${region}
+            aws)
+                bucket=taskcluster-level-${MOZ_SCM_LEVEL}-sccache-${region}
                 ;;
             esac
+        elif [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
+            # gcp region is az with last two letters trimmed
+            if test -z "$region"; then
+                region=${availability_zone::${#availability_zone}-2}
+            fi
+            bucket=taskcluster-level-${MOZ_SCM_LEVEL}-sccache-${region}
         else
             # ec2 region is az with last letter trimmed
-            region=${availability_zone%?}
-            # set S3 bucket according to tree (level)
-            case "${GECKO_HEAD_REPOSITORY}" in
-            *hg.mozilla.org/try*)
-                bucket=taskcluster-level-1-sccache-${region}
-                ;;
-            *hg.mozilla.org/integration/autoland*|*hg.mozilla.org/integration/mozilla-inbound*)
-                bucket=taskcluster-level-3-sccache-${region}
-                ;;
-            esac
+            if test -z "$region"; then
+                region=${availability_zone%?}
+            fi
+            bucket=taskcluster-level-${MOZ_SCM_LEVEL}-sccache-${region}
         fi
     fi
 fi
 
 if test -n "$bucket"; then
-    if [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
+    if test "$cloud" = "google"; then
+        mk_add_options "export SCCACHE_GCS_BUCKET=$bucket"
+        mk_add_options "export SCCACHE_GCS_RW_MODE=READ_WRITE"
+        mk_add_options "export SCCACHE_GCS_CREDENTIALS_URL=http://taskcluster/auth/v1/gcp/credentials/$SCCACHE_GCS_PROJECT/sccache-l${MOZ_SCM_LEVEL}-${region}@$SCCACHE_GCS_PROJECT.iam.gserviceaccount.com"
+    elif [ -n "${SCCACHE_GCS_KEY_PATH}" ]; then
         mk_add_options "export SCCACHE_GCS_BUCKET=$bucket"
     else
         mk_add_options "export SCCACHE_BUCKET=$bucket"

diff --git a/config/rules.mk b/config/rules.mk
@@ -43,8 +43,6 @@ endif
 
 EXEC			= exec
 
-_VPATH_SRCS = $(abspath $<)
-
 ################################################################################
 # Testing frameworks support
 ################################################################################
@@ -711,31 +709,31 @@ $(OBJS) $(HOST_OBJS) $(PROGOBJS) $(HOST_PROGOBJS): $(GLOBAL_DEPS)
 # Rules for building native targets must come first because of the host_ prefix
 $(HOST_COBJS):
 	$(REPORT_BUILD_VERBOSE)
-	$(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CFLAGS) $(NSPR_CFLAGS) $(_VPATH_SRCS)
+	$(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CFLAGS) $(NSPR_CFLAGS) $<
 
 $(HOST_CPPOBJS):
 	$(REPORT_BUILD_VERBOSE)
 	$(call BUILDSTATUS,OBJECT_FILE $@)
-	$(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CXXFLAGS) $(NSPR_CFLAGS) $(_VPATH_SRCS)
+	$(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CXXFLAGS) $(NSPR_CFLAGS) $<
 
 $(HOST_CMOBJS):
 	$(REPORT_BUILD_VERBOSE)
-	$(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CFLAGS) $(HOST_CMFLAGS) $(NSPR_CFLAGS) $(_VPATH_SRCS)
+	$(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CFLAGS) $(HOST_CMFLAGS) $(NSPR_CFLAGS) $<
 
 $(HOST_CMMOBJS):
 	$(REPORT_BUILD_VERBOSE)
-	$(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(NSPR_CFLAGS) $(_VPATH_SRCS)
+	$(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(NSPR_CFLAGS) $<
 
 $(COBJS):
 	$(REPORT_BUILD_VERBOSE)
-	$(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
+	$(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) $<
 
 ifdef ASFILES
 # The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
 # a '-c' flag.
 $(ASOBJS):
 	$(REPORT_BUILD_VERBOSE)
-	$(AS) $(ASOUTOPTION)$@ $(ASFLAGS) $($(notdir $<)_FLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
+	$(AS) $(ASOUTOPTION)$@ $(ASFLAGS) $($(notdir $<)_FLAGS) $(AS_DASH_C_FLAG) $<
 endif
 
 define syms_template
@@ -786,31 +784,31 @@ $(SOBJS):
 $(CPPOBJS):
 	$(REPORT_BUILD_VERBOSE)
 	$(call BUILDSTATUS,OBJECT_FILE $@)
-	$(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
+	$(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $<
 
 $(CMMOBJS):
 	$(REPORT_BUILD_VERBOSE)
-	$(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
+	$(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $($(notdir $<)_FLAGS) $<
 
 $(CMOBJS):
 	$(REPORT_BUILD_VERBOSE)
-	$(CC) -o $@ -c $(COMPILE_CFLAGS) $(COMPILE_CMFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
+	$(CC) -o $@ -c $(COMPILE_CFLAGS) $(COMPILE_CMFLAGS) $($(notdir $<)_FLAGS) $<
 
 $(filter %.s,$(CPPSRCS:%.cpp=%.s)): %.s: %.cpp $(call mkdir_deps,$(MDDEPDIR))
 	$(REPORT_BUILD_VERBOSE)
-	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
+	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $<
 
 $(filter %.s,$(CPPSRCS:%.cc=%.s)): %.s: %.cc $(call mkdir_deps,$(MDDEPDIR))
 	$(REPORT_BUILD_VERBOSE)
-	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
+	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $<
 
 $(filter %.s,$(CPPSRCS:%.cxx=%.s)): %.s: %.cpp $(call mkdir_deps,$(MDDEPDIR))
 	$(REPORT_BUILD_VERBOSE)
-	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
+	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $<
 
 $(filter %.s,$(CSRCS:%.c=%.s)): %.s: %.c $(call mkdir_deps,$(MDDEPDIR))
 	$(REPORT_BUILD_VERBOSE)
-	$(CC) -S $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
+	$(CC) -S $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) $<
 
 ifneq (,$(filter %.i,$(MAKECMDGOALS)))
 # Call as $(call _group_srcs,extension,$(SRCS)) - this will create a list
@@ -837,7 +835,7 @@ $$(_PREPROCESSED_$1_FILES): _DEPEND_CFLAGS=
 $$(_PREPROCESSED_$1_FILES): %.i: %.$1
 	$$(REPORT_BUILD_VERBOSE)
 	$$(addprefix $$(MKDIR) -p ,$$(filter-out .,$$(@D)))
-	$$($3) -C $$(PREPROCESS_OPTION)$$@ $(foreach var,$4,$$($(var))) $$($$(notdir $$<)_FLAGS) $$(_VPATH_SRCS)
+	$$($3) -C $$(PREPROCESS_OPTION)$$@ $(foreach var,$4,$$($(var))) $$($$(notdir $$<)_FLAGS) $$<
 
 endef
 
@@ -899,13 +897,13 @@ endif
 
 endif
 
-$(RESFILE): %.res: %.rc
+$(RESFILE): %.res: $(RCFILE)
 	$(REPORT_BUILD)
 	@echo Creating Resource file: $@
 ifdef GNU_CC
-	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) $(OUTOPTION)$@ $(_VPATH_SRCS)
+	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) $(OUTOPTION)$@ $<
 else
-	$(RC) $(RCFLAGS) -r $(DEFINES) $(INCLUDES) $(OUTOPTION)$@ $(_VPATH_SRCS)
+	$(RC) $(RCFLAGS) -r $(DEFINES) $(INCLUDES) $(OUTOPTION)$@ $<
 endif
 
 # Cancel GNU make built-in implicit rules

diff --git a/config/version.mk b/config/version.mk
@@ -34,7 +34,7 @@ endif
 endif
 endif
 ifdef RCINCLUDE
-_RC_STRING += -RCINCLUDE $(srcdir)/$(RCINCLUDE)
+_RC_STRING += -RCINCLUDE $(RCINCLUDE)
 endif
 
 GARBAGE += $(RESFILE) $(RCFILE)

diff --git a/devtools/client/debugger/src/components/Editor/Footer.css b/devtools/client/debugger/src/components/Editor/Footer.css
@@ -33,11 +33,11 @@
   user-select: none;
 }
 
-.source-footer > .source-footer-start > .commands {
+.source-footer .commands {
   display: flex;
 }
 
-.source-footer > .source-footer-start > .commands > .action {
+.source-footer .commands .action {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -47,33 +47,25 @@
   padding: 4px 6px;
 }
 
-.source-footer > .source-footer-start > .commands > button.action:hover {
+.source-footer .commands button.action:hover {
   background: var(--theme-toolbar-background-hover);
 }
 
-:root.theme-dark .source-footer > .source-footer-start > .commands > .action {
+:root.theme-dark .source-footer .commands .action {
   fill: var(--theme-body-color);
 }
 
-:root.theme-dark
-  .source-footer
-  > .source-footer-start
-  > .commands
-  > .action:hover {
+:root.theme-dark .source-footer .commands .action:hover {
   fill: var(--theme-selection-color);
 }
 
-.source-footer > .source-footer-start > .commands > div.loader {
+.source-footer .commands div.loader {
   vertical-align: top;
   width: 20px;
   margin: 0 4px;
 }
 
-.source-footer
-  > .source-footer-start
-  > .commands
-  > .blackboxed
-  > .img.blackBox {
+.source-footer .blackboxed .img.blackBox {
   background-color: var(--theme-icon-checked-color);
 }