corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1430139 P2 Make the tree compile again after moving the code to dom/serviceworkers. r=asuth

Browse Source
This commit is contained in:
Ben Kelly
2018-01-26 13:08:58 -08:00
parent 96d040ae04
commit bcf3407d3d
15 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dom/notification/Notification.cpp
View File

@@ -53,7 +53,7 @@
#include "nsThreadUtils.h"
#include "nsToolkitCompsCID.h"
#include "nsXULAppAPI.h"
#include "ServiceWorkerManager.h"
#include "mozilla/dom/workers/ServiceWorkerManager.h"
#include "WorkerPrivate.h"
#include "WorkerRunnable.h"
#include "WorkerScope.h"

2
dom/push/PushNotifier.cpp
View File

@@ -12,7 +12,7 @@
#include "nsIXULRuntime.h"
#include "nsNetUtil.h"
#include "nsXPCOM.h"
#include "ServiceWorkerManager.h"
#include "mozilla/dom/workers/ServiceWorkerManager.h"
#include "mozilla/Services.h"
#include "mozilla/Unused.h"

4
dom/serviceworkers/ServiceWorkerContainer.cpp
View File

@@ -28,6 +28,10 @@
namespace mozilla {
namespace dom {
using mozilla::dom::workers::ServiceWorkerInfo;
using mozilla::dom::workers::ServiceWorkerManager;
using mozilla::dom::workers::ServiceWorkerRegistrationInfo;
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServiceWorkerContainer)
NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)

2
dom/serviceworkers/ServiceWorkerEvents.cpp
View File

@@ -28,6 +28,7 @@
#include "mozilla/ErrorResult.h"
#include "mozilla/LoadInfo.h"
#include "mozilla/Move.h"
#include "mozilla/Preferences.h"
#include "mozilla/dom/BodyUtil.h"
#include "mozilla/dom/Client.h"
@@ -48,6 +49,7 @@
#include "WorkerPrivate.h"
#include "xpcpublic.h"
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::dom::workers;

2
dom/serviceworkers/ServiceWorkerInfo.cpp
View File

@@ -10,6 +10,8 @@
BEGIN_WORKERS_NAMESPACE
using mozilla::ipc::PrincipalInfo;
static_assert(nsIServiceWorkerInfo::STATE_PARSED == static_cast<uint16_t>(ServiceWorkerState::Parsed),
"ServiceWorkerState enumeration value should match state values from nsIServiceWorkerInfo.");
static_assert(nsIServiceWorkerInfo::STATE_INSTALLING == static_cast<uint16_t>(ServiceWorkerState::Installing),

1
dom/serviceworkers/ServiceWorkerManager.cpp
View File

@@ -62,7 +62,6 @@
#include "nsContentPolicyUtils.h"
#include "nsContentSecurityManager.h"
#include "nsContentUtils.h"
#include "nsGlobalWindow.h"
#include "nsNetUtil.h"
#include "nsProxyRelease.h"
#include "nsQueryObject.h"

1
dom/serviceworkers/ServiceWorkerPrivate.h
View File

@@ -8,7 +8,6 @@
#define mozilla_dom_workers_serviceworkerprivate_h
#include "nsCOMPtr.h"
#include "WorkerPrivate.h"
#define NOTIFICATION_CLICK_EVENT_NAME "notificationclick"

3
dom/serviceworkers/ServiceWorkerRegistrationInfo.cpp
View File

@@ -6,6 +6,9 @@
#include "ServiceWorkerRegistrationInfo.h"
#include "ServiceWorkerManager.h"
#include "ServiceWorkerPrivate.h"
BEGIN_WORKERS_NAMESPACE
namespace {

2
dom/serviceworkers/ServiceWorkerRegistrationInfo.h
View File

@@ -8,7 +8,9 @@
#define mozilla_dom_workers_serviceworkerregistrationinfo_h
#include "mozilla/dom/workers/ServiceWorkerInfo.h"
#include "mozilla/dom/ServiceWorkerCommon.h"
#include "mozilla/dom/ServiceWorkerRegistrationBinding.h"
#include "nsProxyRelease.h"
namespace mozilla {
namespace dom {

2
dom/workers/RuntimeService.cpp
View File

@@ -25,7 +25,7 @@
#include "nsPIDOMWindow.h"
#include <algorithm>
#include "BackgroundChild.h"
#include "mozilla/ipc/BackgroundChild.h"
#include "GeckoProfiler.h"
#include "jsfriendapi.h"
#include "mozilla/AbstractThread.h"

4
dom/workers/WorkerPrivate.cpp
View File

@@ -111,8 +111,8 @@
#include "Principal.h"
#include "RuntimeService.h"
#include "ScriptLoader.h"
#include "ServiceWorkerEvents.h"
#include "ServiceWorkerManager.h"
#include "mozilla/dom/ServiceWorkerEvents.h"
#include "mozilla/dom/workers/ServiceWorkerManager.h"
#include "SharedWorker.h"
#include "WorkerDebuggerManager.h"
#include "WorkerHolder.h"

4
dom/workers/WorkerScope.cpp
View File

@@ -46,8 +46,8 @@
#include "ScriptLoader.h"
#include "WorkerPrivate.h"
#include "WorkerRunnable.h"
#include "ServiceWorkerManager.h"
#include "ServiceWorkerRegistration.h"
#include "mozilla/dom/ServiceWorkerRegistration.h"
#include "mozilla/dom/workers/ServiceWorkerManager.h"
#ifdef XP_WIN
#undef PostMessage

2
dom/workers/moz.build
View File

@@ -65,6 +65,8 @@ LOCAL_INCLUDES += [
'/xpcom/threads',
]
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
TEST_DIRS += [

2
ipc/glue/BackgroundChildImpl.cpp
View File

@@ -8,7 +8,6 @@
#include "ActorsChild.h" // IndexedDB
#include "BroadcastChannelChild.h"
#include "ServiceWorkerManagerChild.h"
#include "FileDescriptorSetChild.h"
#ifdef MOZ_WEBRTC
#include "CamerasChild.h"
@@ -34,6 +33,7 @@
#include "mozilla/dom/MessagePortChild.h"
#include "mozilla/dom/TabChild.h"
#include "mozilla/dom/TabGroup.h"
#include "mozilla/dom/workers/ServiceWorkerManagerChild.h"
#include "mozilla/ipc/IPCStreamAlloc.h"
#include "mozilla/ipc/PBackgroundTestChild.h"
#include "mozilla/ipc/PChildToParentStreamChild.h"

2
ipc/glue/BackgroundParentImpl.cpp
View File

@@ -32,6 +32,7 @@
#include "mozilla/dom/ipc/TemporaryIPCBlobParent.h"
#include "mozilla/dom/quota/ActorsParent.h"
#include "mozilla/dom/StorageIPC.h"
#include "mozilla/dom/workers/ServiceWorkerManagerParent.h"
#include "mozilla/ipc/BackgroundParent.h"
#include "mozilla/ipc/BackgroundUtils.h"
#include "mozilla/ipc/IPCStreamAlloc.h"
@@ -51,7 +52,6 @@
#include "nsThreadUtils.h"
#include "nsTraceRefcnt.h"
#include "nsXULAppAPI.h"
#include "ServiceWorkerManagerParent.h"
#ifdef DISABLE_ASSERTS_FOR_FUZZING
#define ASSERT_UNLESS_FUZZING(...) do { } while (0)