[WebGL] Flip the validation state for gl_KHR_no_validation.

The original state was inverted due to confusion due to a double
negative (not:no_error).
This validation should only be enabled on Windows (for now).
Future tracking and discussion in BZ 1862039

config/rules.mk

@@ -411,6 +411,10 @@ EXTRA_DSO_LDOPTS += -Wl,--version-script,$(SYMBOLS_FILE)
 else
 ifeq ($(OS_TARGET),Darwin)
 EXTRA_DSO_LDOPTS += -Wl,-exported_symbols_list,$(SYMBOLS_FILE)
+else
+ifeq ($(OS_TARGET),SunOS)
+EXTRA_DSO_LDOPTS += -Wl,-M,$(SYMBOLS_FILE)
+endif
 endif
 endif
 endif

dom/base/Crypto.cpp

@@ -118,7 +118,7 @@ Crypto::GetRandomValues(JSContext* aCx, const ArrayBufferView& aArray,
 void Crypto::RandomUUID(nsAString& aRetVal)
 {
   // NSID_LENGTH == 39 == 36 UUID chars + 2 curly braces + 1 NUL byte
-  static_assert(NSID_LENGTH == 39);
+  static_assert(NSID_LENGTH == 39, "Crypto:RandomUUID: NSID_LENGTH must be 39");
 
   nsCOMPtr<nsIUUIDGenerator> uuidgen =
     do_GetService("@mozilla.org/uuid-generator;1");

dom/canvas/WebGLContext.cpp

@@ -676,9 +676,11 @@ WebGLContext::CreateAndInitGL(bool forceEnabled,
                               std::vector<FailureReason>* const out_failReasons)
 {
     const gl::SurfaceCaps baseCaps = BaseCaps(mOptions, this);
-    gl::CreateContextFlags flags = gl::CreateContextFlags::NO_VALIDATION;
-    bool tryNativeGL = true;
-    bool tryANGLE = false;
+    gl::CreateContextFlags flags = gl::CreateContextFlags::NONE;
+    
+    if (Preferences::GetBool("webgl.gl_khr_no_validation", false)) {
+        flags |= gl::CreateContextFlags::NO_VALIDATION;
+    }
 
     if (forceEnabled) {
         flags |= gl::CreateContextFlags::FORCE_ENABLE_HARDWARE;
@@ -694,6 +696,9 @@ WebGLContext::CreateAndInitGL(bool forceEnabled,
 
     const bool useEGL = PR_GetEnv("MOZ_WEBGL_FORCE_EGL");
 
+    bool tryNativeGL = true;
+    bool tryANGLE = false;
+
 #ifdef XP_WIN
     tryNativeGL = false;
     tryANGLE = true;

dom/canvas/WebGLTextureUpload.cpp

@@ -2188,6 +2188,7 @@ WebGLTexture::CopyTexImage2D(TexImageTarget target, GLint level, GLenum internal
                              srcTotalWidth, srcTotalHeight, srcUsage, 0, 0, 0, width,
                              height, dstUsage))
     {
+        Truncate();
         return;
     }
 

dom/locales/en-US/chrome/plugins.properties

@@ -22,7 +22,6 @@ suffixes_label=Suffixes
 learn_more_label=Learn More
 
 # GMP Plugins
-#ifdef MOZ_GMP
 gmp_license_info=License information
 gmp_privacy_info=Privacy Information
 
@@ -31,4 +30,3 @@ openH264_description2=This plugin is automatically installed by Mozilla to compl
 
 widevine_name=Widevine Content Decryption Module provided by Google Inc.
 widevine_description2=Play back protected web video.
-#endif

dom/locales/jar.mn

@@ -15,7 +15,7 @@
   locale/@AB_CD@/global/global.dtd                             (%chrome/global.dtd)
   locale/@AB_CD@/global/appstrings.properties                  (%chrome/appstrings.properties)
   locale/@AB_CD@/global/global-strres.properties               (%chrome/global-strres.properties)
-* locale/@AB_CD@/global/plugins.properties                     (%chrome/plugins.properties)
+  locale/@AB_CD@/global/plugins.properties                     (%chrome/plugins.properties)
   locale/@AB_CD@/global/nsWebBrowserPersist.properties         (%chrome/nsWebBrowserPersist.properties)
   locale/@AB_CD@/global/xslt/xslt.properties                   (%chrome/xslt/xslt.properties)
   locale/@AB_CD@/global/dom/dom.properties                     (%chrome/dom/dom.properties)

dom/messagechannel/MessagePort.cpp

@@ -296,6 +296,11 @@ MessagePort::MessagePort(nsIGlobalObject* aGlobal)
 MessagePort::~MessagePort()
 {
   CloseForced();
+  MOZ_ASSERT(!mActor);
+  if (mActor) {
+    mActor->SetPort(nullptr);
+    mActor = nullptr;
+  }
   MOZ_ASSERT(!mWorkerHolder);
 }
 
@@ -370,6 +375,7 @@ MessagePort::Initialize(const nsID& aUUID,
 
     nsAutoPtr<WorkerHolder> workerHolder(new MessagePortWorkerHolder(this));
     if (NS_WARN_IF(!workerHolder->HoldWorker(workerPrivate, Closing))) {
+      CloseForced();
       aRv.Throw(NS_ERROR_FAILURE);
       return;
     }

dom/security/nsMixedContentBlocker.cpp

@@ -729,10 +729,10 @@ nsMixedContentBlocker::ShouldLoad(bool aHadInsecureImageRedirect,
   docShell->GetSameTypeRootTreeItem(getter_AddRefs(sameTypeRoot));
   NS_ASSERTION(sameTypeRoot, "No root tree item from docshell!");
 
-  // When navigating an iframe, the iframe may be https
-  // but its parents may not be.  Check the parents to see if any of them are https.
-  // If none of the parents are https, allow the load.
-  if (aContentType == TYPE_SUBDOCUMENT && !rootHasSecureConnection) {
+  // When navigating an iframe, the iframe may be https but its parents may not
+  // be. Check the parents to see if any of them are https. If none of the
+  // parents are https, allow the load.
+  if (aContentType == TYPE_SUBDOCUMENT && !rootHasSecureConnection && !parentIsHttps) {
 
     bool httpsParentExists = false;
 

dom/svg/SVGUseElement.cpp

@@ -426,6 +426,17 @@ SVGUseElement::LookupHref()
   nsCOMPtr<nsIURI> targetURI;
   nsContentUtils::NewURIWithDocumentCharset(getter_AddRefs(targetURI), href,
                                             GetComposedDoc(), baseURI);
+  
+  // Do not allow 'data:' schemes in <use> elements.
+  // See spec update: https://github.com/w3c/svgwg/pull/901
+  if (targetURI) {
+    bool isData;
+    mozilla::Unused << targetURI->SchemeIs("data", &isData);
+    if (isData) {
+      return;
+    }
+  }
+  
   mSource.Reset(this, targetURI);
 }
 

js/src/old-configure.in

@@ -925,11 +925,11 @@ case "$target" in
     ;;
 
 i*86-*-solaris*)
-    MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib"
+    MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/10/lib"
     ;;
 
 x86_64-*-solaris*)
-    MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib/amd64"
+    MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/10/lib/amd64"
     ;;
 
 esac

modules/libpref/init/all.js

@@ -4288,6 +4288,13 @@ pref("webgl.dxgl.enabled", true);
 pref("webgl.dxgl.needs-finish", false);
 #endif
 
+// Disable ANGLE's validation layer?
+#ifdef XP_WIN
+pref("webgl.gl_khr_no_validation", false);
+#else
+pref("webgl.gl_khr_no_validation", true);
+#endif
+
 pref("gfx.offscreencanvas.enabled", false);
 
 // Stagefright prefs
@@ -5100,3 +5107,10 @@ pref("media.sourceErrorDetails.enabled", true);
 #else
 pref("media.sourceErrorDetails.enabled", false);
 #endif
+
+// Whether Navigator.Clipboard methods are a thing.
+pref("dom.events.asyncClipboard", false);
+// Whether arbitrary data transfer methods (not plaintext) are allowed.
+pref("dom.events.asyncClipboard.dataTransfer", false);
+// Whether to use ClipboardItem spec or not.
+pref("dom.events.asyncClipboard.clipboardItem", false);

netwerk/base/nsStandardURL.cpp

@@ -2541,7 +2541,15 @@ nsStandardURL::Resolve(const nsACString &in, nsACString &out)
         // locate result path
         resultPath = PL_strstr(result, "://");
         if (resultPath) {
-            resultPath = PL_strchr(resultPath + 3, '/');
+            // If there are multiple slashes after :// we must ignore them
+            // otherwise net_CoalesceDirs may think the host is a part of the path.
+            resultPath += 3;
+            if (protocol.IsEmpty() && !SegmentIs(mScheme,"file")) {
+              while (*resultPath == '/') {
+                resultPath++;
+              }
+            }
+            resultPath = PL_strchr(resultPath, '/');
             if (resultPath)
                 net_CoalesceDirs(coalesceFlag,resultPath);
         }

old-configure.in

@@ -1127,9 +1127,9 @@ dnl default mode that relies on relative symlinks being handled a certain way.
     fi
 
     if test "$CPU_ARCH" = "x86"; then
-       MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib"
+       MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/10/lib"
     elif test "$CPU_ARCH" = "x86_64"; then
-       MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/7/lib/amd64"
+       MOZ_FIX_LINK_PATHS="-L${DIST}/bin -R'\$\$ORIGIN':/usr/gcc/10/lib/amd64"
     fi    
     ;;
 

python/mozbuild/mozbuild/action/generate_symbols_file.py

@@ -83,6 +83,20 @@ def generate_symbols_file(output, *args):
         # };
         output.write('{\nglobal:\n  %s;\nlocal:\n  *;\n};'
                      % ';\n  '.join(symbols))
+    elif buildconfig.substs['OS_TARGET'] == 'SunOS':
+        # A linker version script is generated for Sun LD that looks like the
+        # following:
+        # $mapfile_version 2
+        # SYMBOL_VERSION SUNW_1.1 {
+        # global:
+        #   symbol1;
+        #   symbol2;
+        #   ...
+        # local:
+        #   *;
+        # };
+        output.write('$mapfile_version 2\nSYMBOL_VERSION SUNW_1.1 {\nglobal:\n  %s;\nlocal:\n  *;\n};'
+                     % ';\n  '.join(symbols))
     elif buildconfig.substs['OS_TARGET'] == 'Darwin':
         # A list of symbols is generated for Apple ld that simply lists all
         # symbols, with an underscore prefix.

toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties

@@ -58,9 +58,7 @@ notification.installError=There was an error installing %1$S.
 notification.installError.retry=Try again
 notification.installError.retry.tooltip=Try downloading and installing this add-on again
 #LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
-#ifdef MOZ_GMP
 notification.gmpPending=%1$S will be installed shortly.
-#endif
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Suggested Contribution: %S
@@ -103,9 +101,7 @@ details.notification.uninstall=%1$S will be uninstalled after you restart %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S will be updated after you restart %2$S.
 #LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
-#ifdef MOZ_GMP
 details.notification.gmpPending=%1$S will be installed shortly.
-#endif
 
 installFromFile.dialogTitle=Select add-on to install
 installFromFile.filterName=Add-ons

toolkit/locales/jar.mn

@@ -96,7 +96,7 @@
   locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (%chrome/mozapps/downloads/downloads.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (%chrome/mozapps/downloads/downloads.properties)
   locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
-* locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/extensions/extensions.properties)
+  locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/extensions/extensions.properties)
   locale/@AB_CD@/mozapps/extensions/blocklist.dtd                 (%chrome/mozapps/extensions/blocklist.dtd)
   locale/@AB_CD@/mozapps/extensions/about.dtd                     (%chrome/mozapps/extensions/about.dtd)
   locale/@AB_CD@/mozapps/extensions/selectAddons.dtd              (%chrome/mozapps/extensions/selectAddons.dtd)