diff --git a/application/basilisk/installer/windows/nsis/uninstaller.nsi b/application/basilisk/installer/windows/nsis/uninstaller.nsi index c556b0a900..7f577d27f3 100644 --- a/application/basilisk/installer/windows/nsis/uninstaller.nsi +++ b/application/basilisk/installer/windows/nsis/uninstaller.nsi @@ -40,7 +40,6 @@ RequestExecutionLevel user "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService" Var TmpVal -Var MaintCertKey ; Other included files may depend upon these includes! ; The following includes are provided by NSIS. diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt index 80701602f5..1a7d407756 100644 --- a/application/palemoon/config/version.txt +++ b/application/palemoon/config/version.txt @@ -1 +1 @@ -28.10.2a1 \ No newline at end of file +28.10.3a1 \ No newline at end of file diff --git a/application/palemoon/installer/windows/nsis/uninstaller.nsi b/application/palemoon/installer/windows/nsis/uninstaller.nsi index 44b7c060b9..bee091d6fb 100644 --- a/application/palemoon/installer/windows/nsis/uninstaller.nsi +++ b/application/palemoon/installer/windows/nsis/uninstaller.nsi @@ -40,7 +40,6 @@ RequestExecutionLevel user "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService" Var TmpVal -Var MaintCertKey ; Other included files may depend upon these includes! ; The following includes are provided by NSIS. diff --git a/dom/html/HTMLMenuItemElement.cpp b/dom/html/HTMLMenuItemElement.cpp index 6cf4eb40c2..42cee132e6 100644 --- a/dom/html/HTMLMenuItemElement.cpp +++ b/dom/html/HTMLMenuItemElement.cpp @@ -16,11 +16,10 @@ nsGenericHTMLElement* NS_NewHTMLMenuItemElement(already_AddRefed&& aNodeInfo, mozilla::dom::FromParser aFromParser) { - RefPtr nodeInfo(aNodeInfo); if (mozilla::Preferences::GetBool("dom.menuitem.enabled")) { - return new mozilla::dom::HTMLMenuItemElement(nodeInfo.forget(), aFromParser); + return new mozilla::dom::HTMLMenuItemElement(aNodeInfo, aFromParser); } else { - return new mozilla::dom::HTMLUnknownElement(nodeInfo.forget()); + return new mozilla::dom::HTMLUnknownElement(aNodeInfo); } } diff --git a/dom/plugins/base/npapi.h b/dom/plugins/base/npapi.h index 38b296c63d..aa6a66b2bd 100644 --- a/dom/plugins/base/npapi.h +++ b/dom/plugins/base/npapi.h @@ -46,7 +46,6 @@ #if defined(MOZ_X11) #include #include -#include "X11UndefineNone.h" #endif #endif diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp index df326a69e7..9c20bbe9df 100644 --- a/js/src/vm/SelfHosting.cpp +++ b/js/src/vm/SelfHosting.cpp @@ -2156,105 +2156,6 @@ intrinsic_PromiseResolve(JSContext* cx, unsigned argc, Value* vp) return true; } -static bool -intrinsic_CreatePendingPromise(JSContext* cx, unsigned argc, Value* vp) -{ - CallArgs args = CallArgsFromVp(argc, vp); - MOZ_ASSERT(args.length() == 0); - RootedObject promise(cx, PromiseObject::createSkippingExecutor(cx)); - if (!promise) - return false; - args.rval().setObject(*promise); - return true; -} - -static bool -intrinsic_CreatePromiseResolvedWith(JSContext* cx, unsigned argc, Value* vp) -{ - CallArgs args = CallArgsFromVp(argc, vp); - MOZ_ASSERT(args.length() == 1); - RootedObject promise(cx, PromiseObject::unforgeableResolve(cx, args[0])); - if (!promise) - return false; - args.rval().setObject(*promise); - return true; -} - -static bool -intrinsic_CreatePromiseRejectedWith(JSContext* cx, unsigned argc, Value* vp) -{ - CallArgs args = CallArgsFromVp(argc, vp); - MOZ_ASSERT(args.length() == 1); - RootedObject promise(cx, PromiseObject::unforgeableReject(cx, args[0])); - if (!promise) - return false; - args.rval().setObject(*promise); - return true; -} - -static bool -intrinsic_ResolvePromise(JSContext* cx, unsigned argc, Value* vp) -{ - CallArgs args = CallArgsFromVp(argc, vp); - MOZ_ASSERT(args.length() == 2); - Rooted promise(cx, &args[0].toObject().as()); - if (!PromiseObject::resolve(cx, promise, args[1])) - return false; - args.rval().setUndefined(); - return true; -} - -static bool -intrinsic_RejectPromise(JSContext* cx, unsigned argc, Value* vp) -{ - CallArgs args = CallArgsFromVp(argc, vp); - MOZ_ASSERT(args.length() == 2); - Rooted promise(cx, &args[0].toObject().as()); - if (!PromiseObject::reject(cx, promise, args[1])) - return false; - args.rval().setUndefined(); - return true; -} - -static bool -intrinsic_CallOriginalPromiseThen(JSContext* cx, unsigned argc, Value* vp) -{ - CallArgs args = CallArgsFromVp(argc, vp); - MOZ_ASSERT(args.length() >= 2); - - RootedObject promise(cx, &args[0].toObject()); - Value val = args[1]; - RootedObject onResolvedObj(cx, val.isUndefined() ? nullptr : val.toObjectOrNull()); - val = args.get(2); - RootedObject onRejectedObj(cx, val.isUndefined() ? nullptr : val.toObjectOrNull()); - - RootedObject resultPromise(cx, JS::CallOriginalPromiseThen(cx, promise, onResolvedObj, - onRejectedObj)); - if (!resultPromise) - return false; - args.rval().setObject(*resultPromise); - return true; -} - -static bool -intrinsic_AddPromiseReactions(JSContext* cx, unsigned argc, Value* vp) -{ - CallArgs args = CallArgsFromVp(argc, vp); - MOZ_ASSERT(args.length() >= 2); - - RootedObject promise(cx, &args[0].toObject()); - Value val = args[1]; - RootedObject onResolvedObj(cx, val.isUndefined() ? nullptr : val.toObjectOrNull()); - val = args.get(2); - RootedObject onRejectedObj(cx, val.isUndefined() ? nullptr : val.toObjectOrNull()); - - bool result = JS::AddPromiseReactions(cx, promise, onResolvedObj, onRejectedObj); - if (!result) - return false; - args.rval().setUndefined(); - return true; -} - // The self-hosting global isn't initialized with the normal set of builtins. // Instead, individual C++-implemented functions that're required by // self-hosted code are defined as global functions. Accessing these @@ -2659,14 +2560,6 @@ static const JSFunctionSpec intrinsic_functions[] = { JS_FN("AddModuleNamespaceBinding", intrinsic_AddModuleNamespaceBinding, 4, 0), JS_FN("ModuleNamespaceExports", intrinsic_ModuleNamespaceExports, 1, 0), - JS_FN("CreatePendingPromise", intrinsic_CreatePendingPromise, 0, 0), - JS_FN("CreatePromiseResolvedWith", intrinsic_CreatePromiseResolvedWith, 1, 0), - JS_FN("CreatePromiseRejectedWith", intrinsic_CreatePromiseRejectedWith, 1, 0), - JS_FN("ResolvePromise", intrinsic_ResolvePromise, 2, 0), - JS_FN("RejectPromise", intrinsic_RejectPromise, 2, 0), - JS_FN("AddPromiseReactions", intrinsic_AddPromiseReactions, 3, 0), - JS_FN("CallOriginalPromiseThen", intrinsic_CallOriginalPromiseThen, 3, 0), - JS_FN("IsPromiseObject", intrinsic_IsInstanceOfBuiltin, 1, 0), JS_FN("CallPromiseMethodIfWrapped", CallNonGenericSelfhostedMethod>, 2, 0), JS_FN("PromiseResolve", intrinsic_PromiseResolve, 2, 0),