Merge pull request BrowserWorks#1164 from hawkeye116477/master

Add GtkFileChooserNative, new JS properties and other improvements to Waterfox Classic.

.mozconfig

@@ -38,6 +38,8 @@ ac_add_options --enable-rust-simd # on x86 requires SSE2
 ac_add_options --enable-stylo=build
 fi
 
+ac_add_options --enable-av1
+
 export MOZ_GECKO_PROFILER=
 export MOZ_ENABLE_PROFILER_SPS=
 export MOZ_PROFILING=

browser/components/extensions/test/browser/browser-common.ini

@@ -13,7 +13,7 @@ support-files =
   file_popup_api_injection_a.html
   file_popup_api_injection_b.html
   file_iframe_document.html
-  file_iframe_document.sjs
+  file_slowed_document.sjs
   file_bypass_cache.sjs
   file_language_fr_en.html
   file_language_ja.html

browser/components/extensions/test/browser/browser_ext_tabs_executeScript_runAt.js

@@ -21,25 +21,30 @@ add_task(async function testExecuteScript() {
     let tab;
 
     const BASE = "http://mochi.test:8888/browser/browser/components/extensions/test/browser/";
-    const URL = BASE + "file_iframe_document.sjs";
+    const URL = BASE + "file_slowed_document.sjs";
 
     const MAX_TRIES = 10;
 
+    let onUpdatedPromise = (tabId, url, status) => {
+      return new Promise(resolve => {
+        browser.tabs.onUpdated.addListener(function listener(_, changed, tab) {
+          if (tabId == tab.id && changed.status == status && tab.url == url) {
+            browser.tabs.onUpdated.removeListener(listener);
+            resolve();
+          }
+        });
+      });
+    };
+
     try {
       [tab] = await browser.tabs.query({active: true, currentWindow: true});
 
       let success = false;
       for (let tries = 0; !success && tries < MAX_TRIES; tries++) {
-        let url = `${URL}?r=${Math.random()}`;
-
-        let loadingPromise = new Promise(resolve => {
-          browser.tabs.onUpdated.addListener(function listener(tabId, changed, tab_) {
-            if (tabId == tab.id && changed.status == "loading" && tab_.url == url) {
-              browser.tabs.onUpdated.removeListener(listener);
-              resolve();
-            }
-          });
-        });
+        let url = `${URL}?with-iframe&r=${Math.random()}`;
+
+        let loadingPromise = onUpdatedPromise(tab.id, url, "loading");
+        let completePromise = onUpdatedPromise(tab.id, url, "complete");
 
         // TODO: Test allFrames and frameId.
 
@@ -74,15 +79,17 @@ add_task(async function testExecuteScript() {
         // regardless of retries.
         browser.test.assertTrue(states[1] == "interactive" || states[1] == "complete",
                                 `document_end state is valid: ${states[1]}`);
-        browser.test.assertTrue(states[2] == "complete",
+        browser.test.assertTrue(states[2] == "interactive" || states[2] == "complete",
                                 `document_idle state is valid: ${states[2]}`);
 
         // If we have the earliest valid states for each script, we're done.
         // Otherwise, try again.
         success = (states[0] == "loading" &&
                    states[1] == "interactive" &&
-                   states[2] == "complete" &&
-                   states[3] == "complete");
+                   states[2] == "interactive" &&
+                   states[3] == "interactive");
+
+        await completePromise;
       }
 
       browser.test.assertTrue(success, "Got the earliest expected states at least once");

mobile/android/components/extensions/test/mochitest/file_iframe_document.sjs → browser/components/extensions/test/browser/file_slowed_document.sjs

@@ -7,7 +7,9 @@
 
 /* eslint-disable no-unused-vars */
 
-const DELAY = 1 * 1000; // Delay one second before completing the request.
+const URL = "file_slowed_document.sjs";
+
+const DELAY = 2 * 1000; // Delay two seconds before completing the request.
 
 const Ci = Components.interfaces;
 
@@ -32,10 +34,10 @@ function handleRequest(request, response) {
   // Note: We need to store a reference to the timer to prevent it from being
   // canceled when it's GCed.
   timer = new nsTimer(() => {
-    response.write(`
-        <iframe src="/"></iframe>
-      </body>
-      </html>`);
+    if (request.queryString.includes("with-iframe")) {
+      response.write(`<iframe src="${URL}?r=${Math.random()}"></iframe>`);
+    }
+    response.write(`</body></html>`);
     response.finish();
   }, DELAY, Ci.nsITimer.TYPE_ONE_SHOT);
 }

caps/BasePrincipal.h

@@ -40,6 +40,19 @@ class BasePrincipal : public nsJSPrincipals
 
   explicit BasePrincipal(PrincipalKind aKind);
 
+  template<typename T>
+  bool Is() const
+  {
+    return mKind == T::Kind();
+  }
+
+  template<typename T>
+  T* As()
+  {
+    MOZ_ASSERT(Is<T>());
+    return static_cast<T*>(this);
+  }
+
   enum DocumentDomainConsideration { DontConsiderDocumentDomain, ConsiderDocumentDomain};
   bool Subsumes(nsIPrincipal* aOther, DocumentDomainConsideration aConsideration);
 

caps/ContentPrincipal.h

@@ -30,6 +30,8 @@ class ContentPrincipal final : public mozilla::BasePrincipal
 
   ContentPrincipal();
 
+  static PrincipalKind Kind() { return eCodebasePrincipal; }
+
   // Init() must be called before the principal is in a usable state.
   nsresult Init(nsIURI* aCodebase,
                 const mozilla::OriginAttributes& aOriginAttributes,

caps/ExpandedPrincipal.h

@@ -20,6 +20,8 @@ class ExpandedPrincipal : public nsIExpandedPrincipal
   Create(nsTArray<nsCOMPtr<nsIPrincipal>>& aWhiteList,
          const mozilla::OriginAttributes& aAttrs);
 
+  static PrincipalKind Kind() { return eExpandedPrincipal; }
+
   NS_DECL_NSIEXPANDEDPRINCIPAL
   NS_DECL_NSISERIALIZABLE
 

caps/NullPrincipal.h

@@ -41,6 +41,8 @@ class NullPrincipal final : public mozilla::BasePrincipal
   {
   }
 
+  static PrincipalKind Kind() { return eNullPrincipal; }
+
   NS_DECL_NSISERIALIZABLE
 
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;

caps/SystemPrincipal.h

@@ -30,6 +30,8 @@ class SystemPrincipal final : public mozilla::BasePrincipal
 public:
   static already_AddRefed<SystemPrincipal> Create();
 
+  static PrincipalKind Kind() { return eSystemPrincipal; }
+
   NS_DECL_NSISERIALIZABLE
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;
   NS_IMETHOD GetHashValue(uint32_t* aHashValue) override;

caps/nsIAddonPolicyService.idl

@@ -52,6 +52,12 @@ interface nsIAddonPolicyService : nsISupports
    */
   boolean addonMayLoadURI(in AString aAddonId, in nsIURI aURI, [optional] in boolean aExplicit);
 
+  /**
+   * Returns the name of the WebExtension with the given ID, or the ID string
+   * if no matching add-on can be found.
+   */
+  AString getExtensionName(in AString aAddonId);
+
   /**
    * Returns true if a given extension:// URI is web-accessible.
    */

devtools/shared/css/generated/properties-db.js

@@ -782,7 +782,8 @@ exports.CSS_PROPERTIES = {
       "column-gap"
     ],
     "supports": [
-      6
+      6,
+      8
     ],
     "values": [
       "calc",
@@ -5684,7 +5685,8 @@ exports.CSS_PROPERTIES = {
       "column-gap"
     ],
     "supports": [
-      6
+      6,
+      8
     ],
     "values": [
       "calc",

dom/base/DOMIntersectionObserver.cpp

@@ -161,6 +161,10 @@ DOMIntersectionObserver::Observe(Element& aTarget)
 void
 DOMIntersectionObserver::Unobserve(Element& aTarget)
 {
+  if (!mObservationTargets.Contains(&aTarget)) {
+    return;
+  }
+
   if (mObservationTargets.Length() == 1) {
     Disconnect();
     return;

dom/base/Element.cpp

@@ -1320,6 +1320,42 @@ Element::GetAttribute(const nsAString& aName, DOMString& aReturn)
   }
 }
 
+bool
+Element::ToggleAttribute(const nsAString& aName,
+                         const Optional<bool>& aForce,
+                         ErrorResult& aError)
+{
+  aError = nsContentUtils::CheckQName(aName, false);
+  if (aError.Failed()) {
+    return false;
+  }
+
+  nsAutoString nameToUse;
+  const nsAttrName* name = InternalGetAttrNameFromQName(aName, &nameToUse);
+  if (!name) {
+    if (aForce.WasPassed() && !aForce.Value()) {
+      return false;
+    }
+    nsCOMPtr<nsIAtom> nameAtom = NS_Atomize(nameToUse);
+    if (!nameAtom) {
+      aError.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return false;
+    }
+    aError = SetAttr(kNameSpaceID_None, nameAtom, EmptyString(), true);
+    return true;
+  }
+  if (aForce.WasPassed() && aForce.Value()) {
+    return true;
+  }
+  // Hold a strong reference here so that the atom or nodeinfo doesn't go
+  // away during UnsetAttr. If it did UnsetAttr would be left with a
+  // dangling pointer as argument without knowing it.
+  nsAttrName tmp(*name);
+
+  aError = UnsetAttr(name->NamespaceID(), name->LocalName(), true);
+  return false;
+}
+
 void
 Element::SetAttribute(const nsAString& aName,
                       const nsAString& aValue,

dom/base/Element.h

@@ -878,6 +878,8 @@ class Element : public FragmentOrElement
   void GetAttributeNS(const nsAString& aNamespaceURI,
                       const nsAString& aLocalName,
                       nsAString& aReturn);
+  bool ToggleAttribute(const nsAString& aName, const Optional<bool>& aForce,
+                       ErrorResult& aError);
   void SetAttribute(const nsAString& aName, const nsAString& aValue,
                     ErrorResult& aError);
   void SetAttributeNS(const nsAString& aNamespaceURI,

dom/base/EventSource.cpp

@@ -51,6 +51,8 @@ namespace dom {
 
 using namespace workers;
 
+static LazyLogModule gEventSourceLog("EventSource");
+
 #define SPACE_CHAR           (char16_t)0x0020
 #define CR_CHAR              (char16_t)0x000D
 #define LF_CHAR              (char16_t)0x000A
@@ -953,8 +955,7 @@ EventSourceImpl::SetupHttpChannel()
 {
   AssertIsOnMainThread();
   MOZ_ASSERT(!IsShutDown());
-  DebugOnly<nsresult> rv =
-    mHttpChannel->SetRequestMethod(NS_LITERAL_CSTRING("GET"));
+  nsresult rv = mHttpChannel->SetRequestMethod(NS_LITERAL_CSTRING("GET"));
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 
   /* set the http request headers */
@@ -965,11 +966,19 @@ EventSourceImpl::SetupHttpChannel()
 
   // LOAD_BYPASS_CACHE already adds the Cache-Control: no-cache header
 
-  if (!mLastEventID.IsEmpty()) {
-    rv = mHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Last-Event-ID"),
-      NS_ConvertUTF16toUTF8(mLastEventID), false);
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
+  if (mLastEventID.IsEmpty()) {
+    return;
   }
+  NS_ConvertUTF16toUTF8 eventId(mLastEventID);
+  rv = mHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Last-Event-ID"),
+                                      eventId, false);
+#ifdef DEBUG
+  if (NS_FAILED(rv)) {
+    MOZ_LOG(gEventSourceLog, LogLevel::Warning,
+            ("SetupHttpChannel. rv=%x (%s)", uint32_t(rv), eventId.get()));
+  }
+#endif
+  Unused << rv;
 }
 
 nsresult
@@ -1729,7 +1738,8 @@ EventSourceImpl::ParseCharacter(char16_t aChr)
         NS_ENSURE_SUCCESS(rv, rv);
 
         mStatus = PARSE_STATE_BEGIN_OF_LINE;
-      } else {
+      } else if (aChr != 0) {
+        // Avoid appending the null char to the field value.
         mLastFieldValue += aChr;
       }
 
@@ -1748,7 +1758,8 @@ EventSourceImpl::ParseCharacter(char16_t aChr)
         mStatus = PARSE_STATE_BEGIN_OF_LINE;
       } else if (aChr == COLON_CHAR) {
         mStatus = PARSE_STATE_COMMENT;
-      } else {
+      } else if (aChr != 0) {
+        // Avoid appending the null char to the field name.
         mLastFieldName += aChr;
         mStatus = PARSE_STATE_FIELD_NAME;
       }

dom/base/nsDocument.cpp

@@ -10667,11 +10667,12 @@ class UnblockParsingPromiseHandler final : public PromiseNativeHandler
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS(UnblockParsingPromiseHandler)
 
-  explicit UnblockParsingPromiseHandler(nsIDocument* aDocument, Promise* aPromise)
+  explicit UnblockParsingPromiseHandler(nsIDocument* aDocument, Promise* aPromise,
+                                        const BlockParsingOptions& aOptions)
     : mPromise(aPromise)
   {
     nsCOMPtr<nsIParser> parser = aDocument->CreatorParserOrNull();
-    if (parser) {
+    if (parser && (aOptions.mBlockScriptCreated || !parser->IsScriptCreated())) {
       parser->BlockParser();
       mParser = do_GetWeakReference(parser);
       mDocument = aDocument;
@@ -10734,14 +10735,15 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(UnblockParsingPromiseHandler)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(UnblockParsingPromiseHandler)
 
 already_AddRefed<Promise>
-nsIDocument::BlockParsing(Promise& aPromise, ErrorResult& aRv)
+nsIDocument::BlockParsing(Promise& aPromise, const BlockParsingOptions& aOptions, ErrorResult& aRv)
 {
   RefPtr<Promise> resultPromise = Promise::Create(aPromise.GetParentObject(), aRv);
   if (aRv.Failed()) {
     return nullptr;
   }
 
-  RefPtr<PromiseNativeHandler> promiseHandler = new UnblockParsingPromiseHandler(this, resultPromise);
+  RefPtr<PromiseNativeHandler> promiseHandler = new UnblockParsingPromiseHandler(this, resultPromise,
+                                                                                 aOptions);
   aPromise.AppendNativeHandler(promiseHandler);
 
   return resultPromise.forget();

dom/base/nsGlobalWindow.cpp

@@ -1144,11 +1144,6 @@ class nsOuterWindowProxy : public js::Wrapper
     return false;
   }
 
-  bool watch(JSContext *cx, JS::Handle<JSObject*> proxy,
-             JS::Handle<jsid> id, JS::Handle<JSObject*> callable) const override;
-  bool unwatch(JSContext *cx, JS::Handle<JSObject*> proxy,
-               JS::Handle<jsid> id) const override;
-
   static void ObjectMoved(JSObject *obj, const JSObject *old);
 
   static const nsOuterWindowProxy singleton;
@@ -1504,20 +1499,6 @@ nsOuterWindowProxy::AppendIndexedPropertyNames(JSContext *cx, JSObject *proxy,
   return true;
 }
 
-bool
-nsOuterWindowProxy::watch(JSContext *cx, JS::Handle<JSObject*> proxy,
-                          JS::Handle<jsid> id, JS::Handle<JSObject*> callable) const
-{
-  return js::WatchGuts(cx, proxy, id, callable);
-}
-
-bool
-nsOuterWindowProxy::unwatch(JSContext *cx, JS::Handle<JSObject*> proxy,
-                            JS::Handle<jsid> id) const
-{
-  return js::UnwatchGuts(cx, proxy, id);
-}
-
 void
 nsOuterWindowProxy::ObjectMoved(JSObject *obj, const JSObject *old)
 {

dom/base/nsIDocument.h

@@ -2939,6 +2939,7 @@ class nsIDocument : public nsINode,
   void ObsoleteSheet(const nsAString& aSheetURI, mozilla::ErrorResult& rv);
 
   already_AddRefed<mozilla::dom::Promise> BlockParsing(mozilla::dom::Promise& aPromise,
+                                                       const mozilla::dom::BlockParsingOptions& aOptions,
                                                        mozilla::ErrorResult& aRv);
 
   already_AddRefed<nsIURI> GetMozDocumentURIIfNotForErrorPages();