From d00311345023d24ef0ddf73be0942021264f815a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 19 Apr 2020 12:52:40 +0200 Subject: Issue #80 - De-unify dom/crypto --- dom/crypto/WebCryptoThreadPool.cpp | 2 ++ dom/crypto/WebCryptoThreadPool.h | 2 ++ dom/crypto/moz.build | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dom/crypto/WebCryptoThreadPool.cpp b/dom/crypto/WebCryptoThreadPool.cpp index 6a1e78608..000e42d42 100644 --- a/dom/crypto/WebCryptoThreadPool.cpp +++ b/dom/crypto/WebCryptoThreadPool.cpp @@ -9,6 +9,8 @@ #include "mozilla/Services.h" #include "mozilla/StaticPtr.h" #include "nsComponentManagerUtils.h" +#include "nsNSSComponent.h" +#include "nsString.h" #include "nsXPCOMCIDInternal.h" #include "nsXPCOMPrivate.h" #include "nsIObserverService.h" diff --git a/dom/crypto/WebCryptoThreadPool.h b/dom/crypto/WebCryptoThreadPool.h index 77c4afb24..76bf74708 100644 --- a/dom/crypto/WebCryptoThreadPool.h +++ b/dom/crypto/WebCryptoThreadPool.h @@ -7,6 +7,8 @@ #ifndef mozilla_dom_WebCryptoThreadPool_h #define mozilla_dom_WebCryptoThreadPool_h +#include "mozilla/Mutex.h" +#include "nsIObserver.h" #include "nsIObserverService.h" #include "nsIThreadPool.h" diff --git a/dom/crypto/moz.build b/dom/crypto/moz.build index ba0b5f2cd..eb15a5530 100644 --- a/dom/crypto/moz.build +++ b/dom/crypto/moz.build @@ -13,7 +13,7 @@ EXPORTS.mozilla.dom += [ 'WebCryptoThreadPool.h' ] -UNIFIED_SOURCES += [ +SOURCES += [ 'CryptoBuffer.cpp', 'CryptoKey.cpp', 'KeyAlgorithmProxy.cpp', -- cgit v1.2.3 From c3a868aa938acd2dd9db83dbe0b228f4226d725b Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 19 Apr 2020 14:38:07 +0200 Subject: Issue #80 - De-unify dom/events --- dom/events/DOMEventTargetHelper.cpp | 1 + dom/events/EventTarget.cpp | 1 + dom/events/IMEContentObserver.h | 1 + dom/events/IMEStateManager.cpp | 1 + dom/events/TextClause.h | 1 + dom/events/TouchEvent.cpp | 2 ++ dom/events/moz.build | 10 +++------- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dom/events/DOMEventTargetHelper.cpp b/dom/events/DOMEventTargetHelper.cpp index 90ee61059..f534f119c 100644 --- a/dom/events/DOMEventTargetHelper.cpp +++ b/dom/events/DOMEventTargetHelper.cpp @@ -13,6 +13,7 @@ #include "mozilla/EventDispatcher.h" #include "mozilla/EventListenerManager.h" #include "mozilla/Likely.h" +#include "mozilla/Unused.h" namespace mozilla { diff --git a/dom/events/EventTarget.cpp b/dom/events/EventTarget.cpp index 6c4cbf2d0..b111b9f9d 100644 --- a/dom/events/EventTarget.cpp +++ b/dom/events/EventTarget.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/EventListenerManager.h" +#include "mozilla/dom/Event.h" #include "mozilla/dom/EventTarget.h" #include "mozilla/dom/EventTargetBinding.h" #include "nsThreadUtils.h" diff --git a/dom/events/IMEContentObserver.h b/dom/events/IMEContentObserver.h index d2f65e186..e459096d9 100644 --- a/dom/events/IMEContentObserver.h +++ b/dom/events/IMEContentObserver.h @@ -7,6 +7,7 @@ #ifndef mozilla_IMEContentObserver_h_ #define mozilla_IMEContentObserver_h_ +#include "ContentEventHandler.h" #include "mozilla/Attributes.h" #include "nsCOMPtr.h" #include "nsCycleCollectionParticipant.h" diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp index 80abad3cc..fd628fb6f 100644 --- a/dom/events/IMEStateManager.cpp +++ b/dom/events/IMEStateManager.cpp @@ -18,6 +18,7 @@ #include "mozilla/TextComposition.h" #include "mozilla/TextEvents.h" #include "mozilla/Unused.h" +#include "mozilla/dom/Event.h" #include "mozilla/dom/HTMLFormElement.h" #include "mozilla/dom/TabParent.h" diff --git a/dom/events/TextClause.h b/dom/events/TextClause.h index 7f85333e8..b9f3c1519 100644 --- a/dom/events/TextClause.h +++ b/dom/events/TextClause.h @@ -12,6 +12,7 @@ #include "mozilla/ErrorResult.h" #include "mozilla/dom/BindingDeclarations.h" #include "nsCycleCollectionParticipant.h" +#include "nsPIDOMWindow.h" #include "nsWrapperCache.h" namespace mozilla { diff --git a/dom/events/TouchEvent.cpp b/dom/events/TouchEvent.cpp index 9b7a74ac2..0656021a0 100644 --- a/dom/events/TouchEvent.cpp +++ b/dom/events/TouchEvent.cpp @@ -16,6 +16,8 @@ namespace mozilla { +using namespace widget; + namespace dom { /****************************************************************************** diff --git a/dom/events/moz.build b/dom/events/moz.build index ec3813207..661f56c7e 100644 --- a/dom/events/moz.build +++ b/dom/events/moz.build @@ -76,7 +76,7 @@ EXPORTS.mozilla.dom += [ if CONFIG['MOZ_WEBSPEECH']: EXPORTS.mozilla.dom += ['SpeechRecognitionError.h'] -UNIFIED_SOURCES += [ +SOURCES += [ 'AnimationEvent.cpp', 'AsyncEventDispatcher.cpp', 'BeforeAfterKeyboardEvent.cpp', @@ -97,6 +97,7 @@ UNIFIED_SOURCES += [ 'EventDispatcher.cpp', 'EventListenerManager.cpp', 'EventListenerService.cpp', + 'EventStateManager.cpp', 'EventTarget.cpp', 'FocusEvent.cpp', 'ImageCaptureError.cpp', @@ -126,13 +127,8 @@ UNIFIED_SOURCES += [ 'XULCommandEvent.cpp', ] -# nsEventStateManager.cpp should be built separately because of Mac OS X headers. -SOURCES += [ - 'EventStateManager.cpp', -] - if CONFIG['MOZ_WEBSPEECH']: - UNIFIED_SOURCES += ['SpeechRecognitionError.cpp'] + SOURCES += ['SpeechRecognitionError.cpp'] include('/ipc/chromium/chromium-config.mozbuild') -- cgit v1.2.3 From 1169a05684be2c9975dcae72810daead396f36f6 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 19 Apr 2020 16:45:01 +0200 Subject: Issue #80 - De-unify dom/fetch Running into the same problem as with dom/canvas: derived template classes not being happy about being non-unified. Kept unified for now to prevent linking errors. --- dom/fetch/FetchConsumer.h | 2 ++ dom/fetch/FetchUtil.cpp | 1 + dom/fetch/InternalRequest.cpp | 1 + dom/fetch/InternalResponse.cpp | 1 + dom/fetch/InternalResponse.h | 1 + dom/fetch/Request.cpp | 13 +++++++++---- dom/fetch/Response.cpp | 1 + dom/fetch/moz.build | 5 ++++- 8 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dom/fetch/FetchConsumer.h b/dom/fetch/FetchConsumer.h index a7509a0ae..2b5725342 100644 --- a/dom/fetch/FetchConsumer.h +++ b/dom/fetch/FetchConsumer.h @@ -8,11 +8,13 @@ #define mozilla_dom_FetchConsumer_h #include "Fetch.h" +#include "nsIInputStream.h" #include "nsIObserver.h" #include "nsWeakReference.h" #include "mozilla/dom/MutableBlobStorage.h" class nsIThread; +class nsIInputStreamPump; namespace mozilla { namespace dom { diff --git a/dom/fetch/FetchUtil.cpp b/dom/fetch/FetchUtil.cpp index 601d99216..b384c4f81 100644 --- a/dom/fetch/FetchUtil.cpp +++ b/dom/fetch/FetchUtil.cpp @@ -2,6 +2,7 @@ #include "nsError.h" #include "nsIUnicodeDecoder.h" +#include "nsNetUtil.h" #include "nsString.h" #include "mozilla/dom/EncodingUtils.h" diff --git a/dom/fetch/InternalRequest.cpp b/dom/fetch/InternalRequest.cpp index b2631da6a..65f8095e2 100644 --- a/dom/fetch/InternalRequest.cpp +++ b/dom/fetch/InternalRequest.cpp @@ -8,6 +8,7 @@ #include "nsIContentPolicy.h" #include "nsIDocument.h" +#include "nsIHttpChannelInternal.h" #include "nsStreamUtils.h" #include "mozilla/ErrorResult.h" diff --git a/dom/fetch/InternalResponse.cpp b/dom/fetch/InternalResponse.cpp index cb7d74597..1b1ae13e3 100644 --- a/dom/fetch/InternalResponse.cpp +++ b/dom/fetch/InternalResponse.cpp @@ -7,6 +7,7 @@ #include "InternalResponse.h" #include "mozilla/Assertions.h" +#include "mozilla/dom/FetchTypes.h" #include "mozilla/dom/InternalHeaders.h" #include "mozilla/dom/cache/CacheTypes.h" #include "mozilla/ipc/PBackgroundSharedTypes.h" diff --git a/dom/fetch/InternalResponse.h b/dom/fetch/InternalResponse.h index 35467836a..0801e3250 100644 --- a/dom/fetch/InternalResponse.h +++ b/dom/fetch/InternalResponse.h @@ -12,6 +12,7 @@ #include "mozilla/dom/ResponseBinding.h" #include "mozilla/dom/ChannelInfo.h" +#include "mozilla/dom/InternalHeaders.h" #include "mozilla/UniquePtr.h" namespace mozilla { diff --git a/dom/fetch/Request.cpp b/dom/fetch/Request.cpp index 7ca5b43c4..6a7885b1a 100644 --- a/dom/fetch/Request.cpp +++ b/dom/fetch/Request.cpp @@ -7,6 +7,7 @@ #include "Request.h" #include "nsIURI.h" +#include "nsNetUtil.h" #include "nsPIDOMWindow.h" #include "mozilla/ErrorResult.h" @@ -15,14 +16,18 @@ #include "mozilla/dom/FetchUtil.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/URL.h" -#include "mozilla/dom/WorkerPrivate.h" #include "mozilla/Unused.h" #include "WorkerPrivate.h" +#include "WorkerRunnable.h" +#include "WorkerScope.h" +#include "Workers.h" namespace mozilla { namespace dom { +using namespace workers; + NS_IMPL_CYCLE_COLLECTING_ADDREF(Request) NS_IMPL_CYCLE_COLLECTING_RELEASE(Request) NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Request, mOwner, mHeaders) @@ -237,14 +242,14 @@ GetRequestURLFromWorker(const GlobalObject& aGlobal, const nsAString& aInput, } } -class ReferrerSameOriginChecker final : public workers::WorkerMainThreadRunnable +class ReferrerSameOriginChecker final : public WorkerMainThreadRunnable { public: ReferrerSameOriginChecker(workers::WorkerPrivate* aWorkerPrivate, const nsAString& aReferrerURL, nsresult& aResult) - : workers::WorkerMainThreadRunnable(aWorkerPrivate, - NS_LITERAL_CSTRING("Fetch :: Referrer same origin check")), + : WorkerMainThreadRunnable(aWorkerPrivate, + NS_LITERAL_CSTRING("Fetch :: Referrer same origin check")), mReferrerURL(aReferrerURL), mResult(aResult) { diff --git a/dom/fetch/Response.cpp b/dom/fetch/Response.cpp index 3b3ada6d3..e35de0e12 100644 --- a/dom/fetch/Response.cpp +++ b/dom/fetch/Response.cpp @@ -8,6 +8,7 @@ #include "nsISupportsImpl.h" #include "nsIURI.h" +#include "nsNetUtil.h" #include "nsPIDOMWindow.h" #include "mozilla/ErrorResult.h" diff --git a/dom/fetch/moz.build b/dom/fetch/moz.build index fb2279fe7..f93487e09 100644 --- a/dom/fetch/moz.build +++ b/dom/fetch/moz.build @@ -19,9 +19,12 @@ EXPORTS.mozilla.dom += [ ] UNIFIED_SOURCES += [ - 'ChannelInfo.cpp', 'Fetch.cpp', 'FetchConsumer.cpp', +] + +SOURCES += [ + 'ChannelInfo.cpp', 'FetchDriver.cpp', 'FetchUtil.cpp', 'Headers.cpp', -- cgit v1.2.3