Bug 1328964 - part 2 - WorkletThread r=baku

Initial version r=smaug. Rebased to c616a6fd5e4b by Jan-Ivar Bruaroey <[email protected]> r=karlt. Rebased to 83de58ddda20 by Karl Tomlinson <[email protected]> r=baku. MozReview-Commit-ID: Lo8TWtN8qyz
iaxat · Apr 12, 2018 · 98e6f93 · 98e6f93
1 parent cce2516
commit 98e6f93
Show file tree

Hide file tree

Showing 15 changed files with 867 additions and 83 deletions.
diff --git a/caps/nsJSPrincipals.cpp b/caps/nsJSPrincipals.cpp
@@ -17,6 +17,8 @@
 #include "mozilla/dom/StructuredCloneTags.h"
 // for mozilla::dom::workerinternals::kJSPrincipalsDebugToken
 #include "mozilla/dom/workerinternals/JSSettings.h"
+// for mozilla::dom::worklet::kJSPrincipalsDebugToken
+#include "mozilla/dom/WorkletPrincipal.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 
 using namespace mozilla;
@@ -92,6 +94,8 @@ JSPrincipals::dump()
               NS_SUCCEEDED(rv) ? str.get() : "(unknown)");
     } else if (debugToken == dom::workerinternals::kJSPrincipalsDebugToken) {
         fprintf(stderr, "Web Worker principal singleton (%p)\n", this);
+    } else if (debugToken == mozilla::dom::WorkletPrincipal::kJSPrincipalsDebugToken) {
+        fprintf(stderr, "Web Worklet principal singleton (%p)\n", this);
     } else {
         fprintf(stderr,
                 "!!! JSPrincipals (%p) is not nsJSPrincipals instance - bad token: "

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
@@ -64,6 +64,7 @@
 #include "mozilla/dom/ShadowRoot.h"
 #include "mozilla/dom/XULCommandEvent.h"
 #include "mozilla/dom/WorkerPrivate.h"
+#include "mozilla/dom/WorkletThread.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStateManager.h"
@@ -6083,6 +6084,11 @@ nsContentUtils::GetCurrentJSContextForThread()
   if (MOZ_LIKELY(NS_IsMainThread())) {
     return GetCurrentJSContext();
   }
+
+  if (WorkletThread::IsOnWorkletThread()) {
+    return WorkletThread::Get()->GetJSContext();
+  }
+
   return GetCurrentWorkerThreadJSContext();
 }
 

diff --git a/dom/console/Console.cpp b/dom/console/Console.cpp
@@ -22,6 +22,7 @@
 #include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/dom/WorkletGlobalScope.h"
+#include "mozilla/dom/WorkletThread.h"
 #include "mozilla/Maybe.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDocument.h"
@@ -2421,15 +2422,6 @@ Console::GetConsole(const GlobalObject& aGlobal)
 /* static */ already_AddRefed<Console>
 Console::GetConsoleInternal(const GlobalObject& aGlobal, ErrorResult& aRv)
 {
-  // Worklet
-  if (NS_IsMainThread()) {
-    nsCOMPtr<WorkletGlobalScope> workletScope =
-      do_QueryInterface(aGlobal.GetAsSupports());
-    if (workletScope) {
-      return workletScope->GetConsole(aGlobal.Context(), aRv);
-    }
-  }
-
   // Window
   if (NS_IsMainThread()) {
     nsCOMPtr<nsPIDOMWindowInner> innerWindow =
@@ -2450,6 +2442,14 @@ Console::GetConsoleInternal(const GlobalObject& aGlobal, ErrorResult& aRv)
     return window->GetConsole(aGlobal.Context(), aRv);
   }
 
+  // Worklet
+  nsCOMPtr<WorkletGlobalScope> workletScope =
+    do_QueryInterface(aGlobal.GetAsSupports());
+  if (workletScope) {
+    WorkletThread::AssertIsOnWorkletThread();
+    return workletScope->GetConsole(aGlobal.Context(), aRv);
+  }
+
   // Workers
   MOZ_ASSERT(!NS_IsMainThread());
 

diff --git a/dom/worklet/AudioWorkletGlobalScope.cpp b/dom/worklet/AudioWorkletGlobalScope.cpp
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AudioWorkletGlobalScope.h"
+#include "WorkletPrincipal.h"
 #include "mozilla/dom/AudioWorkletGlobalScopeBinding.h"
 #include "mozilla/dom/FunctionBinding.h"
 
@@ -17,13 +18,12 @@ AudioWorkletGlobalScope::AudioWorkletGlobalScope()
 
 bool
 AudioWorkletGlobalScope::WrapGlobalObject(JSContext* aCx,
-                                          nsIPrincipal* aPrincipal,
                                           JS::MutableHandle<JSObject*> aReflector)
 {
   JS::CompartmentOptions options;
   return AudioWorkletGlobalScopeBinding::Wrap(aCx, this, this,
                                               options,
-                                              nsJSPrincipals::get(aPrincipal),
+                                              WorkletPrincipal::GetWorkletPrincipal(),
                                               true, aReflector);
 }
 

diff --git a/dom/worklet/AudioWorkletGlobalScope.h b/dom/worklet/AudioWorkletGlobalScope.h
@@ -20,7 +20,7 @@ class AudioWorkletGlobalScope final : public WorkletGlobalScope
   AudioWorkletGlobalScope();
 
   bool
-  WrapGlobalObject(JSContext* aCx, nsIPrincipal* aPrincipal,
+  WrapGlobalObject(JSContext* aCx,
                    JS::MutableHandle<JSObject*> aReflector) override;
 
   void

diff --git a/dom/worklet/PaintWorkletGlobalScope.cpp b/dom/worklet/PaintWorkletGlobalScope.cpp
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "PaintWorkletGlobalScope.h"
+#include "WorkletPrincipal.h"
 #include "mozilla/dom/PaintWorkletGlobalScopeBinding.h"
 #include "mozilla/dom/FunctionBinding.h"
 
@@ -17,13 +18,12 @@ PaintWorkletGlobalScope::PaintWorkletGlobalScope()
 
 bool
 PaintWorkletGlobalScope::WrapGlobalObject(JSContext* aCx,
-                                          nsIPrincipal* aPrincipal,
                                           JS::MutableHandle<JSObject*> aReflector)
 {
   JS::CompartmentOptions options;
   return PaintWorkletGlobalScopeBinding::Wrap(aCx, this, this,
                                               options,
-                                              nsJSPrincipals::get(aPrincipal),
+                                              WorkletPrincipal::GetWorkletPrincipal(),
                                               true, aReflector);
 }
 

diff --git a/dom/worklet/PaintWorkletGlobalScope.h b/dom/worklet/PaintWorkletGlobalScope.h
@@ -20,7 +20,7 @@ class PaintWorkletGlobalScope final : public WorkletGlobalScope
   PaintWorkletGlobalScope();
 
   bool
-  WrapGlobalObject(JSContext* aCx, nsIPrincipal* aPrincipal,
+  WrapGlobalObject(JSContext* aCx,
                    JS::MutableHandle<JSObject*> aReflector) override;
 
   void