[WM]: replace Navigator.monetization with Window.monetization

browser/actors/MonetizationChild.jsm

@@ -106,7 +106,7 @@ class MonetizationChild extends JSWindowActorChild {
           assetScale: details.amount.assetScale,
           receipt: details.receipt,
         };
-        this.contentWindow.navigator.monetization.dispatchEvent(
+        this.contentWindow.monetization.dispatchEvent(
           new this.contentWindow.MonetizationProgressEvent(
             "progress",
             eventInit

browser/components/webmonetization/NavigatorMonetization.js → browser/components/webmonetization/MonetizationGlobal.js

@@ -6,7 +6,7 @@
 var EXPORTED_SYMBOLS = ["Monetization"];
 
 /**
- * `window.navigator.monetization` interface.
+ * `window.monetization` interface.
  * See {@link dom/webidl/Monetization.webidl} for interface definition.
  */
 class Monetization {

browser/components/webmonetization/components.conf

@@ -8,7 +8,7 @@ Classes = [
     {
         'cid': '{880e8397-2353-4a76-b196-5544ec8cbe00}',
         'contract_ids': ['@mozilla.org/webmonetization/Monetization;1'],
-        'jsm': 'resource:///modules/NavigatorMonetization.js',
+        'jsm': 'resource:///modules/MonetizationGlobal.js',
         'constructor': 'Monetization',
     },
 ]

browser/components/webmonetization/moz.build

@@ -6,7 +6,7 @@
 
 EXTRA_JS_MODULES += [
     "MonetizationFetcher.jsm",
-    "NavigatorMonetization.js",
+    "MonetizationGlobal.js",
 ]
 
 XPCOM_MANIFESTS += [

dom/base/Navigator.cpp

@@ -153,7 +153,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaSession)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAddonManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWebGpu)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMonetization)
 
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaKeySystemAccessManager)
@@ -242,8 +241,6 @@ void Navigator::Invalidate() {
   mWebGpu = nullptr;
 
   mSharePromise = nullptr;
-
-  mMonetization = nullptr;
 }
 
 void Navigator::GetUserAgent(nsAString& aUserAgent, CallerType aCallerType,
@@ -2128,21 +2125,6 @@ bool Navigator::HasCreatedMediaSession() const {
   return mMediaSession != nullptr;
 }
 
-dom::Monetization* Navigator::Monetization() {
-  if (!mMonetization) {
-    ErrorResult rv;
-    mMonetization = ConstructJSImplementation<dom::Monetization>(
-        "@mozilla.org/webmonetization/Monetization;1", GetWindow()->AsGlobal(),
-        rv);
-    if (rv.Failed()) {
-      rv.SuppressException();
-      return nullptr;
-    }
-  }
-
-  return mMonetization;
-}
-
 Clipboard* Navigator::Clipboard() {
   if (!mClipboard) {
     mClipboard = new dom::Clipboard(GetWindow());

dom/base/Navigator.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/AddonManagerBinding.h"
-#include "mozilla/dom/MonetizationBinding.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Fetch.h"
 #include "mozilla/dom/Nullable.h"
@@ -34,7 +33,6 @@ namespace dom {
 class AddonManager;
 class BodyExtractorBase;
 class Geolocation;
-class Monetization;
 class systemMessageCallback;
 class MediaDevices;
 struct MediaStreamConstraints;
@@ -227,7 +225,6 @@ class Navigator final : public nsISupports, public nsWrapperCache {
 
   dom::MediaCapabilities* MediaCapabilities();
   dom::MediaSession* MediaSession();
-  dom::Monetization* Monetization();
 
   AddonManager* GetMozAddonManager(ErrorResult& aRv);
 
@@ -295,7 +292,6 @@ class Navigator final : public nsISupports, public nsWrapperCache {
   RefPtr<dom::MediaCapabilities> mMediaCapabilities;
   RefPtr<dom::MediaSession> mMediaSession;
   RefPtr<AddonManager> mAddonManager;
-  RefPtr<dom::Monetization> mMonetization;
   RefPtr<webgpu::Instance> mWebGpu;
   RefPtr<Promise> mSharePromise;  // Web Share API related
   // Gamepad moving to secure contexts

dom/base/nsGlobalWindowInner.cpp

@@ -133,6 +133,7 @@
 #include "mozilla/dom/LocalStorageCommon.h"
 #include "mozilla/dom/Location.h"
 #include "mozilla/dom/MediaKeys.h"
+#include "mozilla/dom/MonetizationBinding.h"
 #include "mozilla/dom/NavigatorBinding.h"
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/PartitionedLocalStorage.h"
@@ -1302,6 +1303,7 @@ void nsGlobalWindowInner::FreeInnerObjects() {
   mLocalStorage = nullptr;
   mSessionStorage = nullptr;
   mPerformance = nullptr;
+  mMonetization = nullptr;
 
   mContentMediaController = nullptr;
 
@@ -1399,7 +1401,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsGlobalWindowInner)
   }
 
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNavigator)
-
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMonetization)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPerformance)
 
 #ifdef MOZ_WEBSPEECH
@@ -1498,6 +1500,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindowInner)
 
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mNavigator)
 
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mMonetization)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mPerformance)
 
 #ifdef MOZ_WEBSPEECH
@@ -1743,6 +1746,7 @@ void nsGlobalWindowInner::InitDocumentDependentState(JSContext* aCx) {
   mLocalStorage = nullptr;
   mSessionStorage = nullptr;
   mPerformance = nullptr;
+  mMonetization = nullptr;
 
   // This must be called after nullifying the internal objects because here we
   // could recreate them, calling the getter methods, and store them into the JS
@@ -2387,6 +2391,20 @@ CustomElementRegistry* nsGlobalWindowInner::GetExistingCustomElements() {
   return mCustomElements;
 }
 
+Monetization* nsPIDOMWindowInner::Monetization() {
+  if (!mMonetization) {
+    ErrorResult rv;
+    mMonetization = ConstructJSImplementation<dom::Monetization>(
+        "@mozilla.org/webmonetization/Monetization;1", AsGlobal(), rv);
+    if (rv.Failed()) {
+      rv.SuppressException();
+      return nullptr;
+    }
+  }
+
+  return mMonetization;
+}
+
 Performance* nsPIDOMWindowInner::GetPerformance() {
   CreatePerformanceObjectIfNeeded();
   return mPerformance;

dom/base/nsPIDOMWindow.h

@@ -62,6 +62,7 @@ class Document;
 class Element;
 class Location;
 class MediaKeys;
+class Monetization;
 class Navigator;
 class Performance;
 class Selection;
@@ -184,6 +185,8 @@ class nsPIDOMWindowInner : public mozIDOMWindow {
    */
   bool HasActiveMediaKeysInstance();
 
+  mozilla::dom::Monetization* Monetization();
+
   mozilla::dom::Performance* GetPerformance();
 
   void QueuePerformanceNavigationTiming();
@@ -625,6 +628,7 @@ class nsPIDOMWindowInner : public mozIDOMWindow {
 
   nsCOMPtr<mozilla::dom::EventTarget> mParentTarget;  // strong
 
+  RefPtr<mozilla::dom::Monetization> mMonetization;
   RefPtr<mozilla::dom::Performance> mPerformance;
   mozilla::UniquePtr<mozilla::dom::TimeoutManager> mTimeoutManager;
 

dom/webidl/Navigator.webidl

@@ -198,11 +198,6 @@ partial interface Navigator {
   readonly attribute NetworkInformation connection;
 };
 
-// Monetization
-partial interface Navigator {
-  readonly attribute Monetization monetization;
-};
-
 // https://dvcs.w3.org/hg/gamepad/raw-file/default/gamepad.html#navigator-interface-extension
 partial interface Navigator {
   [Throws, Pref="dom.gamepad.enabled"]

dom/webidl/Window.webidl

@@ -397,6 +397,11 @@ partial interface Window {
   [Replaceable, Pure, StoreInSlot] readonly attribute Performance? performance;
 };
 
+// Monetization
+partial interface Window {
+  readonly attribute Monetization monetization;
+};
+
 // https://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html
 Window includes GlobalCrypto;