Backed out 2 changesets (bug 1626555) as per Andi's request. CLOSED TREE

Backed out changeset 22e23d9340a2 (bug 1626555)
Backed out changeset 02ea10ade875 (bug 1626555)

build/non-unified-compat

@@ -64,8 +64,6 @@ dom/url/
 dom/vr/
 dom/webauthn/
 dom/webbrowserpersist/
-dom/webgpu/
 dom/webidl/
 dom/webshare/
-dom/websocket/
-dom/workers/
+dom/websocket/

dom/webgpu/Adapter.h

@@ -12,7 +12,6 @@
 #include "ObjectModel.h"
 
 namespace mozilla {
-class ErrorResult;
 namespace dom {
 class Promise;
 struct GPUDeviceDescriptor;

dom/webgpu/BindGroup.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "BindGroup.h"
-#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 

dom/webgpu/BindGroupLayout.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "BindGroupLayout.h"
-#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 

dom/webgpu/Buffer.cpp

@@ -6,10 +6,8 @@
 #include "mozilla/dom/WebGPUBinding.h"
 #include "Buffer.h"
 
-#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/ipc/Shmem.h"
-#include "ipc/WebGPUChild.h"
 #include "js/RootingAPI.h"
 #include "nsContentUtils.h"
 #include "nsWrapperCache.h"

dom/webgpu/CanvasContext.cpp

@@ -12,7 +12,6 @@
 #include "mozilla/layers/CompositorManagerChild.h"
 #include "mozilla/layers/RenderRootStateManager.h"
 #include "mozilla/layers/WebRenderBridgeChild.h"
-#include "ipc/WebGPUChild.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/CommandBuffer.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "CommandBuffer.h"
-#include "ipc/WebGPUChild.h"
 
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "Device.h"

dom/webgpu/CommandEncoder.cpp

@@ -11,9 +11,6 @@
 #include "ComputePassEncoder.h"
 #include "Device.h"
 #include "RenderPassEncoder.h"
-#include "mozilla/dom/HTMLCanvasElement.h"
-#include "mozilla/webgpu/ffi/wgpu.h"
-#include "ipc/WebGPUChild.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/CommandEncoder.h

@@ -13,9 +13,6 @@
 
 namespace mozilla {
 namespace dom {
-struct GPUComputePassDescriptor;
-struct GPUTextureDataLayout;
-class HTMLCanvasElement;
 template <typename T>
 class Sequence;
 class GPUComputePipelineOrGPURenderPipeline;

dom/webgpu/ComputePassEncoder.cpp

@@ -7,7 +7,6 @@
 #include "ComputePassEncoder.h"
 #include "BindGroup.h"
 #include "ComputePipeline.h"
-#include "CommandEncoder.h"
 
 #include "mozilla/webgpu/ffi/wgpu.h"
 

dom/webgpu/ComputePipeline.cpp

@@ -6,8 +6,6 @@
 #include "ComputePipeline.h"
 
 #include "Device.h"
-#include "ipc/WebGPUChild.h"
-#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/ComputePipeline.h

@@ -8,8 +8,6 @@
 
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
-#include "ipc/WebGPUTypes.h"
-#include "nsTArray.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/Device.cpp

@@ -9,8 +9,6 @@
 #include "mozilla/ipc/Shmem.h"
 #include "mozilla/dom/WebGPUBinding.h"
 #include "Device.h"
-#include "CommandEncoder.h"
-#include "BindGroup.h"
 
 #include "Adapter.h"
 #include "Buffer.h"

dom/webgpu/DeviceLostInfo.cpp

@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DeviceLostInfo.h"
-#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/Instance.h

@@ -12,7 +12,6 @@
 #include "ObjectModel.h"
 
 namespace mozilla {
-class ErrorResult;
 namespace dom {
 class Promise;
 struct GPURequestAdapterOptions;

dom/webgpu/ObjectModel.cpp

@@ -9,7 +9,6 @@
 #include "Device.h"
 #include "CommandEncoder.h"
 #include "Instance.h"
-#include "Texture.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/OutOfMemoryError.cpp

@@ -5,7 +5,6 @@
 
 #include "OutOfMemoryError.h"
 #include "Device.h"
-#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/PipelineLayout.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "PipelineLayout.h"
-#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 

dom/webgpu/RenderPassEncoder.cpp

@@ -8,7 +8,6 @@
 #include "BindGroup.h"
 #include "CommandEncoder.h"
 #include "RenderPipeline.h"
-#include "mozilla/webgpu/ffi/wgpu.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/RenderPipeline.cpp

@@ -6,8 +6,6 @@
 #include "RenderPipeline.h"
 
 #include "Device.h"
-#include "ipc/WebGPUChild.h"
-#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/RenderPipeline.h

@@ -8,13 +8,10 @@
 
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
-#include "ipc/WebGPUTypes.h"
-#include "nsTArray.h"
 
 namespace mozilla {
 namespace webgpu {
 
-class BindGroupLayout;
 class Device;
 
 class RenderPipeline final : public ObjectBase, public ChildOf<Device> {

dom/webgpu/Sampler.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "Sampler.h"
-#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 

dom/webgpu/ShaderModule.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "ShaderModule.h"
-#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 

dom/webgpu/SwapChain.cpp

@@ -5,8 +5,6 @@
 
 #include "SwapChain.h"
 #include "Texture.h"
-#include "mozilla/dom/WebGPUBinding.h"
-#include "ipc/WebGPUChild.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/Texture.cpp

@@ -5,10 +5,8 @@
 
 #include "Texture.h"
 
-#include "ipc/WebGPUChild.h"
 #include "mozilla/webgpu/ffi/wgpu.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
-#include "mozilla/dom/WebGPUBinding.h"
 #include "TextureView.h"
 
 namespace mozilla {

dom/webgpu/Texture.h

@@ -8,8 +8,6 @@
 
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
-#include "ipc/WebGPUTypes.h"
-#include "mozilla/WeakPtr.h"
 
 namespace mozilla {
 namespace dom {

dom/webgpu/TextureView.cpp

@@ -6,9 +6,6 @@
 #include "TextureView.h"
 
 #include "Device.h"
-#include "mozilla/dom/HTMLCanvasElement.h"
-#include "mozilla/dom/WebGPUBinding.h"
-#include "ipc/WebGPUChild.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/TextureView.h

@@ -8,7 +8,6 @@
 
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
-#include "ipc/WebGPUTypes.h"
 
 namespace mozilla {
 namespace dom {

dom/webgpu/ValidationError.cpp

@@ -5,7 +5,6 @@
 
 #include "ValidationError.h"
 #include "Device.h"
-#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {

dom/webgpu/ipc/WebGPUChild.cpp

@@ -6,7 +6,6 @@
 #include "WebGPUChild.h"
 #include "mozilla/dom/WebGPUBinding.h"
 #include "mozilla/webgpu/ffi/wgpu.h"
-#include "Sampler.h"
 
 namespace mozilla {
 namespace webgpu {

dom/workers/Principal.cpp

@@ -9,7 +9,6 @@
 #include "jsapi.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/dom/StructuredCloneTags.h"
-#include "mozilla/dom/workerinternals/JSSettings.h"
 
 namespace mozilla {
 namespace dom {

dom/workers/ScriptLoader.cpp

@@ -72,7 +72,6 @@
 #include "mozilla/dom/Response.h"
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/dom/SerializedStackHolder.h"
 #include "mozilla/dom/SRILogHelper.h"
 #include "mozilla/dom/ServiceWorkerBinding.h"
 #include "mozilla/dom/ServiceWorkerManager.h"

dom/workers/WorkerCSPEventListener.cpp

@@ -9,7 +9,6 @@
 #include "WorkerRef.h"
 #include "mozilla/dom/SecurityPolicyViolationEvent.h"
 #include "mozilla/dom/SecurityPolicyViolationEventBinding.h"
-#include "mozilla/dom/WorkerRunnable.h"
 
 using namespace mozilla::dom;
 

dom/workers/WorkerCSPEventListener.h

@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_WorkerCSPEventListener_h
 #define mozilla_dom_WorkerCSPEventListener_h
 
-#include "mozilla/dom/WorkerRef.h"
 #include "mozilla/Mutex.h"
 #include "nsIContentSecurityPolicy.h"
 

dom/workers/WorkerEventTarget.cpp

@@ -5,8 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WorkerEventTarget.h"
-#include "WorkerPrivate.h"
-#include "WorkerRunnable.h"
 
 namespace mozilla {
 namespace dom {

dom/workers/WorkerScope.cpp

@@ -12,7 +12,6 @@
 #include "Principal.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
-#include "js/CompilationAndEvaluation.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/StorageAccess.h"
@@ -26,19 +25,16 @@
 #include "mozilla/dom/Fetch.h"
 #include "mozilla/dom/IDBFactory.h"
 #include "mozilla/dom/ImageBitmap.h"
-#include "mozilla/dom/MessagePortBinding.h"
 #include "mozilla/dom/Performance.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/PromiseWorkerProxy.h"
 #include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/dom/SerializedStackHolder.h"
 #include "mozilla/dom/ServiceWorkerGlobalScopeBinding.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/dom/ServiceWorkerRegistration.h"
 #include "mozilla/dom/ServiceWorkerUtils.h"
 #include "mozilla/dom/SharedWorkerGlobalScopeBinding.h"
 #include "mozilla/dom/SimpleGlobalObject.h"
-#include "mozilla/dom/TimeoutHandler.h"
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerDebuggerGlobalScopeBinding.h"
 #include "mozilla/dom/WorkerGlobalScopeBinding.h"
@@ -50,8 +46,6 @@
 #include "nsDebug.h"
 #include "nsISerialEventTarget.h"
 #include "nsJSUtils.h"
-#include "nsQueryObject.h"
-#include "ScriptLoader.h"
 #include "xpcpublic.h"
 
 #ifdef ANDROID

dom/workers/remoteworkers/RemoteWorkerController.cpp

@@ -16,7 +16,6 @@
 #include "mozilla/RemoteLazyInputStreamUtils.h"
 #include "mozilla/RemoteLazyInputStreamStorage.h"
 #include "mozilla/ScopeExit.h"
-#include "mozilla/dom/FetchEventOpParent.h"
 #include "mozilla/dom/FetchEventOpProxyParent.h"
 #include "mozilla/dom/MessagePortParent.h"
 #include "mozilla/dom/RemoteWorkerTypes.h"

dom/workers/remoteworkers/RemoteWorkerControllerParent.cpp

@@ -16,7 +16,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/FetchEventOpParent.h"
-#include "mozilla/dom/RemoteWorkerParent.h"
 #include "mozilla/dom/ServiceWorkerOpPromise.h"
 #include "mozilla/ipc/BackgroundParent.h"
 

dom/workers/remoteworkers/RemoteWorkerManager.cpp

@@ -11,7 +11,6 @@
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/dom/ContentChild.h"  // ContentChild::GetSingleton
-#include "mozilla/dom/RemoteWorkerController.h"
 #include "mozilla/dom/RemoteWorkerParent.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/BackgroundUtils.h"

dom/workers/remoteworkers/RemoteWorkerParent.cpp

@@ -9,7 +9,6 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/PFetchEventOpProxyParent.h"
 #include "mozilla/ipc/BackgroundParent.h"
-#include "mozilla/SchedulerGroup.h"
 #include "mozilla/Unused.h"
 #include "nsProxyRelease.h"
 

dom/workers/remoteworkers/RemoteWorkerService.cpp

@@ -11,7 +11,6 @@
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "mozilla/ipc/PBackgroundParent.h"
-#include "mozilla/SchedulerGroup.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"

dom/workers/remoteworkers/RemoteWorkerServiceParent.cpp

@@ -6,7 +6,6 @@
 
 #include "RemoteWorkerServiceParent.h"
 #include "RemoteWorkerManager.h"
-#include "mozilla/ipc/BackgroundParent.h"
 
 namespace mozilla {
 

dom/workers/sharedworkers/SharedWorkerChild.cpp

@@ -8,7 +8,6 @@
 #include "mozilla/dom/ErrorEvent.h"
 #include "mozilla/dom/ErrorEventBinding.h"
 #include "mozilla/dom/Exceptions.h"
-#include "mozilla/dom/SharedWorker.h"
 #include "mozilla/dom/WorkerError.h"
 
 namespace mozilla {

dom/workers/sharedworkers/SharedWorkerManager.cpp

@@ -7,7 +7,6 @@
 #include "SharedWorkerManager.h"
 #include "SharedWorkerParent.h"
 #include "SharedWorkerService.h"
-#include "mozilla/dom/MessagePort.h"
 #include "mozilla/dom/PSharedWorker.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/URIUtils.h"
@@ -62,7 +61,7 @@ SharedWorkerManager::~SharedWorkerManager() {
 bool SharedWorkerManager::MaybeCreateRemoteWorker(
     const RemoteWorkerData& aData, uint64_t aWindowID,
     UniqueMessagePortId& aPortIdentifier, base::ProcessId aProcessId) {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
 
   if (!mRemoteWorkerController) {
     mRemoteWorkerController =
@@ -109,7 +108,7 @@ SharedWorkerManager::MatchOnMainThread(
 }
 
 void SharedWorkerManager::AddActor(SharedWorkerParent* aParent) {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
   MOZ_ASSERT(aParent);
   MOZ_ASSERT(!mActors.Contains(aParent));
 
@@ -122,7 +121,7 @@ void SharedWorkerManager::AddActor(SharedWorkerParent* aParent) {
 }
 
 void SharedWorkerManager::RemoveActor(SharedWorkerParent* aParent) {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
   MOZ_ASSERT(aParent);
   MOZ_ASSERT(mActors.Contains(aParent));
 
@@ -142,7 +141,7 @@ void SharedWorkerManager::RemoveActor(SharedWorkerParent* aParent) {
 }
 
 void SharedWorkerManager::Terminate() {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
   MOZ_ASSERT(mActors.IsEmpty());
   MOZ_ASSERT(mHolders.IsEmpty());
 
@@ -151,7 +150,7 @@ void SharedWorkerManager::Terminate() {
 }
 
 void SharedWorkerManager::UpdateSuspend() {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
   MOZ_ASSERT(mRemoteWorkerController);
 
   uint32_t suspended = 0;
@@ -179,7 +178,7 @@ void SharedWorkerManager::UpdateSuspend() {
 }
 
 void SharedWorkerManager::UpdateFrozen() {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
   MOZ_ASSERT(mRemoteWorkerController);
 
   uint32_t frozen = 0;
@@ -209,7 +208,7 @@ void SharedWorkerManager::UpdateFrozen() {
 bool SharedWorkerManager::IsSecureContext() const { return mIsSecureContext; }
 
 void SharedWorkerManager::CreationFailed() {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
 
   for (SharedWorkerParent* actor : mActors) {
     Unused << actor->SendError(NS_ERROR_FAILURE);
@@ -217,12 +216,12 @@ void SharedWorkerManager::CreationFailed() {
 }
 
 void SharedWorkerManager::CreationSucceeded() {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
   // Nothing to do here.
 }
 
 void SharedWorkerManager::ErrorReceived(const ErrorValue& aValue) {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
 
   for (SharedWorkerParent* actor : mActors) {
     Unused << actor->SendError(aValue);
@@ -230,7 +229,7 @@ void SharedWorkerManager::ErrorReceived(const ErrorValue& aValue) {
 }
 
 void SharedWorkerManager::Terminated() {
-  ::mozilla::ipc::AssertIsOnBackgroundThread();
+  AssertIsOnBackgroundThread();
 
   for (SharedWorkerParent* actor : mActors) {
     Unused << actor->SendTerminate();

dom/workers/sharedworkers/SharedWorkerService.cpp

@@ -5,9 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "SharedWorkerService.h"
-#include "mozilla/dom/MessagePort.h"
 #include "mozilla/dom/RemoteWorkerTypes.h"
-#include "mozilla/dom/SharedWorkerManager.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/SchedulerGroup.h"

dom/workers/sharedworkers/SharedWorkerService.h

@@ -11,8 +11,6 @@
 #include "nsISupportsImpl.h"
 #include "nsTArray.h"
 
-class nsIEventTarget;
-
 namespace mozilla {
 
 namespace ipc {