Foxhound: post merge build fixes

SAP · Jan 17, 2024 · 8360a69 · 8360a69
1 parent 36d5692
commit 8360a69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/dom/html/HTMLScriptElement.h b/dom/html/HTMLScriptElement.h
@@ -149,9 +149,6 @@ class HTMLScriptElement final : public nsGenericHTMLElement,
   [[nodiscard]] static bool Supports(const GlobalObject& aGlobal,
                                      const nsAString& aType);
 
-  virtual void SetTextContentInternal(const nsAString& aTextContent,
-                                      nsIPrincipal* aSubjectPrincipal,
-                                      mozilla::ErrorResult& aError) override;
  protected:
   virtual ~HTMLScriptElement();
 

diff --git a/js/src/builtin/JSON.cpp b/js/src/builtin/JSON.cpp
@@ -1877,9 +1877,9 @@ static bool Revive(JSContext* cx, HandleValue reviver, MutableHandleValue vp) {
 }
 
 template <typename CharT>
-bool ParseJSON(JSContext* cx, const mozilla::Range<const CharT> chars,
+bool ParseJSON(JSContext* cx, const mozilla::Range<const CharT> chars, const StringTaint& aTaint,
                MutableHandleValue vp) {
-  Rooted<JSONParser<CharT>> parser(cx, cx, chars, aTaint
+  Rooted<JSONParser<CharT>> parser(cx, cx, chars, aTaint,
                                    JSONParser<CharT>::ParseType::JSONParse);
   return parser.parse(vp);
 }