|
@@ -2,7 +2,7 @@
|
|
# User Emilio Cobos Alvarez <emilio@crisal.io>
|
|
# User Emilio Cobos Alvarez <emilio@crisal.io>
|
|
# Date 1527707735 -7200
|
|
# Date 1527707735 -7200
|
|
# Node ID b54db66223586b4e04f5cb926fccdacf8a176b91
|
|
# Node ID b54db66223586b4e04f5cb926fccdacf8a176b91
|
|
-# Parent fe58351be8426819a9f5bdb0c4ba2390857d47c7
|
|
|
|
|
|
+# Parent 990a5c5f9fce762785790a323c9f4c9215e7be5e
|
|
Bug 1465585: Switch from mozilla::Move to std::move. r=froydnj
|
|
Bug 1465585: Switch from mozilla::Move to std::move. r=froydnj
|
|
|
|
|
|
This was done automatically replacing:
|
|
This was done automatically replacing:
|
|
@@ -2945,7 +2945,7 @@ diff --git a/dom/base/nsContentPermissionHelper.cpp b/dom/base/nsContentPermissi
|
|
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
|
|
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
|
|
--- a/dom/base/nsContentUtils.cpp
|
|
--- a/dom/base/nsContentUtils.cpp
|
|
+++ b/dom/base/nsContentUtils.cpp
|
|
+++ b/dom/base/nsContentUtils.cpp
|
|
-@@ -554,17 +554,17 @@ StableStateEventTarget::IsOnCurrentThrea
|
|
|
|
|
|
+@@ -548,17 +548,17 @@ StableStateEventTarget::IsOnCurrentThrea
|
|
}
|
|
}
|
|
|
|
|
|
NS_IMETHODIMP
|
|
NS_IMETHODIMP
|
|
@@ -2964,7 +2964,7 @@ diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
|
|
{
|
|
{
|
|
return Dispatch(nsCOMPtr<nsIRunnable>(aEvent).forget(), aFlags);
|
|
return Dispatch(nsCOMPtr<nsIRunnable>(aEvent).forget(), aFlags);
|
|
}
|
|
}
|
|
-@@ -5910,25 +5910,25 @@ nsContentUtils::AddScriptRunner(nsIRunna
|
|
|
|
|
|
+@@ -5883,25 +5883,25 @@ nsContentUtils::AddScriptRunner(nsIRunna
|
|
AddScriptRunner(runnable.forget());
|
|
AddScriptRunner(runnable.forget());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -3448,7 +3448,7 @@ diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
|
|
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
|
|
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
|
|
--- a/dom/base/nsGlobalWindow.cpp
|
|
--- a/dom/base/nsGlobalWindow.cpp
|
|
+++ b/dom/base/nsGlobalWindow.cpp
|
|
+++ b/dom/base/nsGlobalWindow.cpp
|
|
-@@ -3450,29 +3450,29 @@ nsGlobalWindow::EnsureClientSource()
|
|
|
|
|
|
+@@ -3451,29 +3451,29 @@ nsGlobalWindow::EnsureClientSource()
|
|
// Try to get the reserved client from the LoadInfo. A Client is
|
|
// Try to get the reserved client from the LoadInfo. A Client is
|
|
// reserved at the start of the channel load if there is not an
|
|
// reserved at the start of the channel load if there is not an
|
|
// initial about:blank document that will be reused. It is also
|
|
// initial about:blank document that will be reused. It is also
|
|
@@ -3480,7 +3480,7 @@ diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
|
|
// Verify the final ClientSource principal matches the final document
|
|
// Verify the final ClientSource principal matches the final document
|
|
// principal. The ClientChannelHelper handles things like network
|
|
// principal. The ClientChannelHelper handles things like network
|
|
// redirects, but there are other ways the document principal can change.
|
|
// redirects, but there are other ways the document principal can change.
|
|
-@@ -4439,29 +4439,29 @@ void
|
|
|
|
|
|
+@@ -4440,29 +4440,29 @@ void
|
|
nsPIDOMWindowInner::SyncStateFromParentWindow()
|
|
nsPIDOMWindowInner::SyncStateFromParentWindow()
|
|
{
|
|
{
|
|
nsGlobalWindow::Cast(this)->SyncStateFromParentWindow();
|
|
nsGlobalWindow::Cast(this)->SyncStateFromParentWindow();
|
|
@@ -3513,7 +3513,7 @@ diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
|
|
nsGlobalWindow::Cast(this)->NoteCalledRegisterForServiceWorkerScope(aScope);
|
|
nsGlobalWindow::Cast(this)->NoteCalledRegisterForServiceWorkerScope(aScope);
|
|
}
|
|
}
|
|
|
|
|
|
-@@ -11909,17 +11909,17 @@ nsGlobalWindow::ShowSlowScriptDialog(con
|
|
|
|
|
|
+@@ -11910,17 +11910,17 @@ nsGlobalWindow::ShowSlowScriptDialog(con
|
|
auto getString = [&] (const char* name,
|
|
auto getString = [&] (const char* name,
|
|
nsContentUtils::PropertiesFile propFile = nsContentUtils::eDOM_PROPERTIES) {
|
|
nsContentUtils::PropertiesFile propFile = nsContentUtils::eDOM_PROPERTIES) {
|
|
nsAutoString result;
|
|
nsAutoString result;
|
|
@@ -3532,7 +3532,7 @@ diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
|
|
// Get localizable strings
|
|
// Get localizable strings
|
|
|
|
|
|
nsAutoString title, checkboxMsg, debugButton, msg;
|
|
nsAutoString title, checkboxMsg, debugButton, msg;
|
|
-@@ -12763,43 +12763,43 @@ nsGlobalWindow::CallOnChildren(Method aM
|
|
|
|
|
|
+@@ -12764,43 +12764,43 @@ nsGlobalWindow::CallOnChildren(Method aM
|
|
Maybe<ClientInfo>
|
|
Maybe<ClientInfo>
|
|
nsGlobalWindow::GetClientInfo() const
|
|
nsGlobalWindow::GetClientInfo() const
|
|
{
|
|
{
|
|
@@ -3579,7 +3579,7 @@ diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
|
|
FORWARD_TO_INNER(FireDelayedDOMEvents, (), NS_ERROR_UNEXPECTED);
|
|
FORWARD_TO_INNER(FireDelayedDOMEvents, (), NS_ERROR_UNEXPECTED);
|
|
|
|
|
|
if (mApplicationCache) {
|
|
if (mApplicationCache) {
|
|
-@@ -15136,19 +15136,19 @@ nsPIDOMWindow<T>::GetDocGroup() const
|
|
|
|
|
|
+@@ -15137,19 +15137,19 @@ nsPIDOMWindow<T>::GetDocGroup() const
|
|
}
|
|
}
|
|
|
|
|
|
nsresult
|
|
nsresult
|
|
@@ -4163,7 +4163,7 @@ diff --git a/dom/bindings/TypedArray.h b/dom/bindings/TypedArray.h
|
|
diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp
|
|
diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp
|
|
--- a/dom/cache/Cache.cpp
|
|
--- a/dom/cache/Cache.cpp
|
|
+++ b/dom/cache/Cache.cpp
|
|
+++ b/dom/cache/Cache.cpp
|
|
-@@ -113,17 +113,17 @@ IsValidPutResponseStatus(Response& aResp
|
|
|
|
|
|
+@@ -114,17 +114,17 @@ IsValidPutResponseStatus(Response& aResp
|
|
// actor.
|
|
// actor.
|
|
class Cache::FetchHandler final : public PromiseNativeHandler
|
|
class Cache::FetchHandler final : public PromiseNativeHandler
|
|
{
|
|
{
|
|
@@ -4182,7 +4182,7 @@ diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp
|
|
}
|
|
}
|
|
|
|
|
|
virtual void
|
|
virtual void
|
|
-@@ -190,17 +190,17 @@ public:
|
|
|
|
|
|
+@@ -191,17 +191,17 @@ public:
|
|
ErrorResult errorResult;
|
|
ErrorResult errorResult;
|
|
if (!IsValidPutResponseStatus(*response, PutStatusPolicy::RequireOK,
|
|
if (!IsValidPutResponseStatus(*response, PutStatusPolicy::RequireOK,
|
|
errorResult)) {
|
|
errorResult)) {
|
|
@@ -4201,7 +4201,7 @@ diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp
|
|
ErrorResult result;
|
|
ErrorResult result;
|
|
// TODO: Here we use the JSContext as received by the ResolvedCallback, and
|
|
// TODO: Here we use the JSContext as received by the ResolvedCallback, and
|
|
// its state could be the wrong one. The spec doesn't say anything
|
|
// its state could be the wrong one. The spec doesn't say anything
|
|
-@@ -359,18 +359,18 @@ Cache::Add(JSContext* aContext, const Re
|
|
|
|
|
|
+@@ -360,18 +360,18 @@ Cache::Add(JSContext* aContext, const Re
|
|
}
|
|
}
|
|
|
|
|
|
nsAutoString url;
|
|
nsAutoString url;
|
|
@@ -4222,7 +4222,7 @@ diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp
|
|
CallerType aCallerType,
|
|
CallerType aCallerType,
|
|
ErrorResult& aRv)
|
|
ErrorResult& aRv)
|
|
{
|
|
{
|
|
-@@ -407,20 +407,20 @@ Cache::AddAll(JSContext* aContext,
|
|
|
|
|
|
+@@ -408,20 +408,20 @@ Cache::AddAll(JSContext* aContext,
|
|
}
|
|
}
|
|
|
|
|
|
nsAutoString url;
|
|
nsAutoString url;
|
|
@@ -4245,7 +4245,7 @@ diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp
|
|
{
|
|
{
|
|
if (NS_WARN_IF(!mActor)) {
|
|
if (NS_WARN_IF(!mActor)) {
|
|
aRv.Throw(NS_ERROR_UNEXPECTED);
|
|
aRv.Throw(NS_ERROR_UNEXPECTED);
|
|
-@@ -637,27 +637,27 @@ Cache::AddAll(const GlobalObject& aGloba
|
|
|
|
|
|
+@@ -615,27 +615,27 @@ Cache::AddAll(const GlobalObject& aGloba
|
|
RequestOrUSVString requestOrString;
|
|
RequestOrUSVString requestOrString;
|
|
requestOrString.SetAsRequest() = aRequestList[i];
|
|
requestOrString.SetAsRequest() = aRequestList[i];
|
|
RefPtr<Promise> fetch = FetchRequest(mGlobal, requestOrString,
|
|
RefPtr<Promise> fetch = FetchRequest(mGlobal, requestOrString,
|
|
@@ -4278,7 +4278,7 @@ diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp
|
|
diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp
|
|
diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp
|
|
--- a/dom/cache/CacheStorage.cpp
|
|
--- a/dom/cache/CacheStorage.cpp
|
|
+++ b/dom/cache/CacheStorage.cpp
|
|
+++ b/dom/cache/CacheStorage.cpp
|
|
-@@ -338,17 +338,17 @@ CacheStorage::Match(JSContext* aCx, cons
|
|
|
|
|
|
+@@ -339,17 +339,17 @@ CacheStorage::Match(JSContext* aCx, cons
|
|
CacheQueryParams params;
|
|
CacheQueryParams params;
|
|
ToCacheQueryParams(params, aOptions);
|
|
ToCacheQueryParams(params, aOptions);
|
|
|
|
|
|
@@ -4297,7 +4297,7 @@ diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp
|
|
CacheStorage::Has(const nsAString& aKey, ErrorResult& aRv)
|
|
CacheStorage::Has(const nsAString& aKey, ErrorResult& aRv)
|
|
{
|
|
{
|
|
NS_ASSERT_OWNINGTHREAD(CacheStorage);
|
|
NS_ASSERT_OWNINGTHREAD(CacheStorage);
|
|
-@@ -362,17 +362,17 @@ CacheStorage::Has(const nsAString& aKey,
|
|
|
|
|
|
+@@ -363,17 +363,17 @@ CacheStorage::Has(const nsAString& aKey,
|
|
if (NS_WARN_IF(!promise)) {
|
|
if (NS_WARN_IF(!promise)) {
|
|
return nullptr;
|
|
return nullptr;
|
|
}
|
|
}
|
|
@@ -4316,7 +4316,7 @@ diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp
|
|
CacheStorage::Open(const nsAString& aKey, ErrorResult& aRv)
|
|
CacheStorage::Open(const nsAString& aKey, ErrorResult& aRv)
|
|
{
|
|
{
|
|
NS_ASSERT_OWNINGTHREAD(CacheStorage);
|
|
NS_ASSERT_OWNINGTHREAD(CacheStorage);
|
|
-@@ -386,17 +386,17 @@ CacheStorage::Open(const nsAString& aKey
|
|
|
|
|
|
+@@ -387,17 +387,17 @@ CacheStorage::Open(const nsAString& aKey
|
|
if (NS_WARN_IF(!promise)) {
|
|
if (NS_WARN_IF(!promise)) {
|
|
return nullptr;
|
|
return nullptr;
|
|
}
|
|
}
|
|
@@ -4335,7 +4335,7 @@ diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp
|
|
CacheStorage::Delete(const nsAString& aKey, ErrorResult& aRv)
|
|
CacheStorage::Delete(const nsAString& aKey, ErrorResult& aRv)
|
|
{
|
|
{
|
|
NS_ASSERT_OWNINGTHREAD(CacheStorage);
|
|
NS_ASSERT_OWNINGTHREAD(CacheStorage);
|
|
-@@ -410,17 +410,17 @@ CacheStorage::Delete(const nsAString& aK
|
|
|
|
|
|
+@@ -411,17 +411,17 @@ CacheStorage::Delete(const nsAString& aK
|
|
if (NS_WARN_IF(!promise)) {
|
|
if (NS_WARN_IF(!promise)) {
|
|
return nullptr;
|
|
return nullptr;
|
|
}
|
|
}
|
|
@@ -4354,7 +4354,7 @@ diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp
|
|
CacheStorage::Keys(ErrorResult& aRv)
|
|
CacheStorage::Keys(ErrorResult& aRv)
|
|
{
|
|
{
|
|
NS_ASSERT_OWNINGTHREAD(CacheStorage);
|
|
NS_ASSERT_OWNINGTHREAD(CacheStorage);
|
|
-@@ -434,17 +434,17 @@ CacheStorage::Keys(ErrorResult& aRv)
|
|
|
|
|
|
+@@ -435,17 +435,17 @@ CacheStorage::Keys(ErrorResult& aRv)
|
|
if (NS_WARN_IF(!promise)) {
|
|
if (NS_WARN_IF(!promise)) {
|
|
return nullptr;
|
|
return nullptr;
|
|
}
|
|
}
|
|
@@ -4370,10 +4370,10 @@ diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp
|
|
}
|
|
}
|
|
|
|
|
|
// static
|
|
// static
|
|
- bool
|
|
|
|
- CacheStorage::PrefEnabled(JSContext* aCx, JSObject* aObj)
|
|
|
|
- {
|
|
|
|
-@@ -549,17 +549,17 @@ CacheStorage::~CacheStorage()
|
|
|
|
|
|
+ already_AddRefed<CacheStorage>
|
|
|
|
+ CacheStorage::Constructor(const GlobalObject& aGlobal,
|
|
|
|
+ CacheStorageNamespace aNamespace,
|
|
|
|
+@@ -543,17 +543,17 @@ CacheStorage::~CacheStorage()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -5063,7 +5063,7 @@ diff --git a/dom/canvas/CanvasRenderingContextHelper.cpp b/dom/canvas/CanvasRend
|
|
diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp
|
|
diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp
|
|
--- a/dom/canvas/ImageBitmap.cpp
|
|
--- a/dom/canvas/ImageBitmap.cpp
|
|
+++ b/dom/canvas/ImageBitmap.cpp
|
|
+++ b/dom/canvas/ImageBitmap.cpp
|
|
-@@ -791,17 +791,17 @@ ImageBitmap::ToCloneData() const
|
|
|
|
|
|
+@@ -792,17 +792,17 @@ ImageBitmap::ToCloneData() const
|
|
UniquePtr<ImageBitmapCloneData> result(new ImageBitmapCloneData());
|
|
UniquePtr<ImageBitmapCloneData> result(new ImageBitmapCloneData());
|
|
result->mPictureRect = mPictureRect;
|
|
result->mPictureRect = mPictureRect;
|
|
result->mAlphaType = mAlphaType;
|
|
result->mAlphaType = mAlphaType;
|
|
@@ -5082,7 +5082,7 @@ diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp
|
|
{
|
|
{
|
|
RefPtr<layers::Image> data = CreateImageFromSurface(aData->mSurface);
|
|
RefPtr<layers::Image> data = CreateImageFromSurface(aData->mSurface);
|
|
|
|
|
|
-@@ -1250,17 +1250,17 @@ private:
|
|
|
|
|
|
+@@ -1251,17 +1251,17 @@ private:
|
|
already_AddRefed<nsIInputStream> aInputStream,
|
|
already_AddRefed<nsIInputStream> aInputStream,
|
|
const nsACString& aMimeType,
|
|
const nsACString& aMimeType,
|
|
const Maybe<IntRect>& aCropRect,
|
|
const Maybe<IntRect>& aCropRect,
|
|
@@ -5101,7 +5101,7 @@ diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp
|
|
{
|
|
{
|
|
}
|
|
}
|
|
|
|
|
|
-@@ -2209,17 +2209,17 @@ CreateImageBitmapFromBlob::Create(Promis
|
|
|
|
|
|
+@@ -2198,17 +2198,17 @@ CreateImageBitmapFromBlob::Create(Promis
|
|
|
|
|
|
UniquePtr<CreateImageBitmapFromBlobHolder> holder(
|
|
UniquePtr<CreateImageBitmapFromBlobHolder> holder(
|
|
new CreateImageBitmapFromBlobHolder(workerPrivate, task));
|
|
new CreateImageBitmapFromBlobHolder(workerPrivate, task));
|
|
@@ -5123,7 +5123,7 @@ diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp
|
|
diff --git a/dom/canvas/OffscreenCanvas.cpp b/dom/canvas/OffscreenCanvas.cpp
|
|
diff --git a/dom/canvas/OffscreenCanvas.cpp b/dom/canvas/OffscreenCanvas.cpp
|
|
--- a/dom/canvas/OffscreenCanvas.cpp
|
|
--- a/dom/canvas/OffscreenCanvas.cpp
|
|
+++ b/dom/canvas/OffscreenCanvas.cpp
|
|
+++ b/dom/canvas/OffscreenCanvas.cpp
|
|
-@@ -155,17 +155,17 @@ OffscreenCanvas::GetContext(JSContext* a
|
|
|
|
|
|
+@@ -156,17 +156,17 @@ OffscreenCanvas::GetContext(JSContext* a
|
|
gl::GLScreenBuffer* screen = gl->Screen();
|
|
gl::GLScreenBuffer* screen = gl->Screen();
|
|
gl::SurfaceCaps caps = screen->mCaps;
|
|
gl::SurfaceCaps caps = screen->mCaps;
|
|
auto forwarder = mCanvasClient->GetForwarder();
|
|
auto forwarder = mCanvasClient->GetForwarder();
|
|
@@ -8252,7 +8252,7 @@ diff --git a/dom/ipc/ContentBridgeParent.cpp b/dom/ipc/ContentBridgeParent.cpp
|
|
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
|
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
|
--- a/dom/ipc/ContentChild.cpp
|
|
--- a/dom/ipc/ContentChild.cpp
|
|
+++ b/dom/ipc/ContentChild.cpp
|
|
+++ b/dom/ipc/ContentChild.cpp
|
|
-@@ -551,18 +551,18 @@ ContentChild::RecvSetXPCOMProcessAttribu
|
|
|
|
|
|
+@@ -552,18 +552,18 @@ ContentChild::RecvSetXPCOMProcessAttribu
|
|
const StructuredCloneData& aInitialData,
|
|
const StructuredCloneData& aInitialData,
|
|
nsTArray<LookAndFeelInt>&& aLookAndFeelIntCache,
|
|
nsTArray<LookAndFeelInt>&& aLookAndFeelIntCache,
|
|
nsTArray<SystemFontListEntry>&& aFontList)
|
|
nsTArray<SystemFontListEntry>&& aFontList)
|
|
@@ -8273,7 +8273,7 @@ diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
|
}
|
|
}
|
|
|
|
|
|
bool
|
|
bool
|
|
-@@ -1019,34 +1019,34 @@ ContentChild::ProvideWindowCommon(TabChi
|
|
|
|
|
|
+@@ -1020,34 +1020,34 @@ ContentChild::ProvideWindowCommon(TabChi
|
|
url.SetIsVoid(true);
|
|
url.SetIsVoid(true);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -8310,7 +8310,7 @@ diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
|
|
|
|
|
// We have to wait for a response from either SendCreateWindow or
|
|
// We have to wait for a response from either SendCreateWindow or
|
|
// SendBrowserFrameOpenWindow with information we're going to need to return
|
|
// SendBrowserFrameOpenWindow with information we're going to need to return
|
|
-@@ -1264,49 +1264,49 @@ ContentChild::DeallocPCycleCollectWithLo
|
|
|
|
|
|
+@@ -1267,49 +1267,49 @@ ContentChild::DeallocPCycleCollectWithLo
|
|
// Also, we're already in ~CycleCollectWithLogsChild (q.v.) at
|
|
// Also, we're already in ~CycleCollectWithLogsChild (q.v.) at
|
|
// this point, so we shouldn't touch the actor in any case.
|
|
// this point, so we shouldn't touch the actor in any case.
|
|
return true;
|
|
return true;
|
|
@@ -8365,7 +8365,7 @@ diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
|
{
|
|
{
|
|
if (aOtherPid == base::GetCurrentProcId() || aOtherPid == OtherPid()) {
|
|
if (aOtherPid == base::GetCurrentProcId() || aOtherPid == OtherPid()) {
|
|
// If we are talking to ourselves, or the UI process, then that is a fatal
|
|
// If we are talking to ourselves, or the UI process, then that is a fatal
|
|
-@@ -1331,29 +1331,29 @@ ContentChild::RecvInitRendering(Endpoint
|
|
|
|
|
|
+@@ -1334,29 +1334,29 @@ ContentChild::RecvInitRendering(Endpoint
|
|
|
|
|
|
// Note that for all of the methods below, if it can fail, it should only
|
|
// Note that for all of the methods below, if it can fail, it should only
|
|
// return false if the failure is an IPDL error. In such situations,
|
|
// return false if the failure is an IPDL error. In such situations,
|
|
@@ -8399,7 +8399,7 @@ diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
|
Endpoint<PImageBridgeChild>&& aImageBridge,
|
|
Endpoint<PImageBridgeChild>&& aImageBridge,
|
|
Endpoint<PVRManagerChild>&& aVRBridge,
|
|
Endpoint<PVRManagerChild>&& aVRBridge,
|
|
Endpoint<PVideoDecoderManagerChild>&& aVideoManager,
|
|
Endpoint<PVideoDecoderManagerChild>&& aVideoManager,
|
|
-@@ -1365,38 +1365,38 @@ ContentChild::RecvReinitRendering(Endpoi
|
|
|
|
|
|
+@@ -1368,38 +1368,38 @@ ContentChild::RecvReinitRendering(Endpoi
|
|
// Zap all the old layer managers we have lying around.
|
|
// Zap all the old layer managers we have lying around.
|
|
for (const auto& tabChild : tabs) {
|
|
for (const auto& tabChild : tabs) {
|
|
if (tabChild->GetLayersId().IsValid()) {
|
|
if (tabChild->GetLayersId().IsValid()) {
|
|
@@ -8442,7 +8442,7 @@ diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
|
{
|
|
{
|
|
#ifdef XP_WIN
|
|
#ifdef XP_WIN
|
|
audio::AudioNotificationReceiver::NotifyDefaultDeviceChanged();
|
|
audio::AudioNotificationReceiver::NotifyDefaultDeviceChanged();
|
|
-@@ -2442,17 +2442,17 @@ ContentChild::RecvUpdateDictionaryList(I
|
|
|
|
|
|
+@@ -2445,17 +2445,17 @@ ContentChild::RecvUpdateDictionaryList(I
|
|
mAvailableDictionaries = aDictionaries;
|
|
mAvailableDictionaries = aDictionaries;
|
|
mozInlineSpellChecker::UpdateCanEnableInlineSpellChecking();
|
|
mozInlineSpellChecker::UpdateCanEnableInlineSpellChecking();
|
|
return IPC_OK();
|
|
return IPC_OK();
|
|
@@ -8461,7 +8461,7 @@ diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
|
ContentChild::RecvUpdateAppLocales(nsTArray<nsCString>&& aAppLocales)
|
|
ContentChild::RecvUpdateAppLocales(nsTArray<nsCString>&& aAppLocales)
|
|
{
|
|
{
|
|
LocaleService::GetInstance()->AssignAppLocales(aAppLocales);
|
|
LocaleService::GetInstance()->AssignAppLocales(aAppLocales);
|
|
-@@ -3451,17 +3451,17 @@ ContentChild::RecvSetPermissionsWithKey(
|
|
|
|
|
|
+@@ -3454,17 +3454,17 @@ ContentChild::RecvSetPermissionsWithKey(
|
|
permissionManager->SetPermissionsWithKey(aPermissionKey, aPerms);
|
|
permissionManager->SetPermissionsWithKey(aPermissionKey, aPerms);
|
|
return IPC_OK();
|
|
return IPC_OK();
|
|
}
|
|
}
|
|
@@ -16392,7 +16392,7 @@ diff --git a/dom/messagechannel/MessagePortService.cpp b/dom/messagechannel/Mess
|
|
diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
|
|
diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
|
|
--- a/dom/notification/Notification.cpp
|
|
--- a/dom/notification/Notification.cpp
|
|
+++ b/dom/notification/Notification.cpp
|
|
+++ b/dom/notification/Notification.cpp
|
|
-@@ -109,17 +109,17 @@ public:
|
|
|
|
|
|
+@@ -110,17 +110,17 @@ public:
|
|
nsString(aBody),
|
|
nsString(aBody),
|
|
nsString(aTag),
|
|
nsString(aTag),
|
|
nsString(aIcon),
|
|
nsString(aIcon),
|
|
@@ -16411,7 +16411,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
|
|
protected:
|
|
protected:
|
|
virtual ~ScopeCheckingGetCallback()
|
|
virtual ~ScopeCheckingGetCallback()
|
|
{}
|
|
{}
|
|
-@@ -509,17 +509,17 @@ public:
|
|
|
|
|
|
+@@ -510,17 +510,17 @@ public:
|
|
enum NotificationAction {
|
|
enum NotificationAction {
|
|
eShow,
|
|
eShow,
|
|
eClose
|
|
eClose
|
|
@@ -16430,7 +16430,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
|
|
virtual ~NotificationTask() {}
|
|
virtual ~NotificationTask() {}
|
|
|
|
|
|
UniquePtr<NotificationRef> mNotificationRef;
|
|
UniquePtr<NotificationRef> mNotificationRef;
|
|
-@@ -702,17 +702,17 @@ NS_IMPL_ISUPPORTS(NotificationObserver,
|
|
|
|
|
|
+@@ -703,17 +703,17 @@ NS_IMPL_ISUPPORTS(NotificationObserver,
|
|
class MainThreadNotificationObserver : public nsIObserver
|
|
class MainThreadNotificationObserver : public nsIObserver
|
|
{
|
|
{
|
|
public:
|
|
public:
|
|
@@ -16449,7 +16449,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
|
|
virtual ~MainThreadNotificationObserver()
|
|
virtual ~MainThreadNotificationObserver()
|
|
{
|
|
{
|
|
AssertIsOnMainThread();
|
|
AssertIsOnMainThread();
|
|
-@@ -1069,17 +1069,17 @@ Notification::GetPrincipal()
|
|
|
|
|
|
+@@ -1053,17 +1053,17 @@ Notification::GetPrincipal()
|
|
|
|
|
|
class WorkerNotificationObserver final : public MainThreadNotificationObserver
|
|
class WorkerNotificationObserver final : public MainThreadNotificationObserver
|
|
{
|
|
{
|
|
@@ -16468,7 +16468,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
|
|
void
|
|
void
|
|
ForgetNotification()
|
|
ForgetNotification()
|
|
{
|
|
{
|
|
-@@ -1529,20 +1529,20 @@ Notification::ShowInternal()
|
|
|
|
|
|
+@@ -1513,20 +1513,20 @@ Notification::ShowInternal()
|
|
nsCOMPtr<nsIObserver> observer;
|
|
nsCOMPtr<nsIObserver> observer;
|
|
if (mScope.IsEmpty()) {
|
|
if (mScope.IsEmpty()) {
|
|
// Ownership passed to observer.
|
|
// Ownership passed to observer.
|
|
@@ -16491,7 +16491,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
|
|
//
|
|
//
|
|
// The observer is wholly owned by the NotificationObserver passed to the alert service.
|
|
// The observer is wholly owned by the NotificationObserver passed to the alert service.
|
|
nsAutoString behavior;
|
|
nsAutoString behavior;
|
|
-@@ -1882,17 +1882,17 @@ class WorkerGetResultRunnable final : pu
|
|
|
|
|
|
+@@ -1866,17 +1866,17 @@ class WorkerGetResultRunnable final : pu
|
|
RefPtr<PromiseWorkerProxy> mPromiseProxy;
|
|
RefPtr<PromiseWorkerProxy> mPromiseProxy;
|
|
const nsTArray<NotificationStrings> mStrings;
|
|
const nsTArray<NotificationStrings> mStrings;
|
|
public:
|
|
public:
|
|
@@ -16510,7 +16510,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
|
|
{
|
|
{
|
|
RefPtr<Promise> workerPromise = mPromiseProxy->WorkerPromise();
|
|
RefPtr<Promise> workerPromise = mPromiseProxy->WorkerPromise();
|
|
|
|
|
|
-@@ -1948,17 +1948,17 @@ public:
|
|
|
|
|
|
+@@ -1932,17 +1932,17 @@ public:
|
|
MutexAutoLock lock(proxy->Lock());
|
|
MutexAutoLock lock(proxy->Lock());
|
|
if (proxy->CleanedUp()) {
|
|
if (proxy->CleanedUp()) {
|
|
return NS_OK;
|
|
return NS_OK;
|
|
@@ -16529,7 +16529,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
|
|
private:
|
|
private:
|
|
~WorkerGetCallback()
|
|
~WorkerGetCallback()
|
|
{}
|
|
{}
|
|
-@@ -2063,17 +2063,17 @@ Notification::Close()
|
|
|
|
|
|
+@@ -2047,17 +2047,17 @@ Notification::Close()
|
|
{
|
|
{
|
|
AssertIsOnTargetThread();
|
|
AssertIsOnTargetThread();
|
|
auto ref = MakeUnique<NotificationRef>(this);
|
|
auto ref = MakeUnique<NotificationRef>(this);
|
|
@@ -16548,7 +16548,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
|
|
// If dispatch fails, NotificationTask will release the ref when it goes
|
|
// If dispatch fails, NotificationTask will release the ref when it goes
|
|
// out of scope at the end of this function.
|
|
// out of scope at the end of this function.
|
|
}
|
|
}
|
|
-@@ -2511,17 +2511,17 @@ Notification::CreateAndShow(JSContext* a
|
|
|
|
|
|
+@@ -2495,17 +2495,17 @@ Notification::CreateAndShow(JSContext* a
|
|
auto ref = MakeUnique<NotificationRef>(notification);
|
|
auto ref = MakeUnique<NotificationRef>(notification);
|
|
if (NS_WARN_IF(!ref->Initialized())) {
|
|
if (NS_WARN_IF(!ref->Initialized())) {
|
|
aRv.Throw(NS_ERROR_DOM_ABORT_ERR);
|
|
aRv.Throw(NS_ERROR_DOM_ABORT_ERR);
|
|
@@ -16567,7 +16567,7 @@ diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.c
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
notification->DispatchTrustedEvent(NS_LITERAL_STRING("error"));
|
|
notification->DispatchTrustedEvent(NS_LITERAL_STRING("error"));
|
|
}
|
|
}
|
|
-@@ -2579,23 +2579,23 @@ Notification::Observe(nsISupports* aSubj
|
|
|
|
|
|
+@@ -2563,23 +2563,23 @@ Notification::Observe(nsISupports* aSubj
|
|
|
|
|
|
return NS_OK;
|
|
return NS_OK;
|
|
}
|
|
}
|
|
@@ -17811,7 +17811,7 @@ diff --git a/dom/workers/FileReaderSync.cpp b/dom/workers/FileReaderSync.cpp
|
|
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
|
|
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
|
|
--- a/dom/workers/RuntimeService.cpp
|
|
--- a/dom/workers/RuntimeService.cpp
|
|
+++ b/dom/workers/RuntimeService.cpp
|
|
+++ b/dom/workers/RuntimeService.cpp
|
|
-@@ -1589,17 +1589,17 @@ RuntimeService::RegisterWorker(WorkerPri
|
|
|
|
|
|
+@@ -1588,17 +1588,17 @@ RuntimeService::RegisterWorker(WorkerPri
|
|
MOZ_CRASH("We should not instantiate a new SharedWorker!");
|
|
MOZ_CRASH("We should not instantiate a new SharedWorker!");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -18060,7 +18060,7 @@ diff --git a/dom/workers/ServiceWorkerEvents.cpp b/dom/workers/ServiceWorkerEven
|
|
diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
|
|
diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
|
|
--- a/dom/workers/ServiceWorkerManager.cpp
|
|
--- a/dom/workers/ServiceWorkerManager.cpp
|
|
+++ b/dom/workers/ServiceWorkerManager.cpp
|
|
+++ b/dom/workers/ServiceWorkerManager.cpp
|
|
-@@ -319,51 +319,51 @@ ServiceWorkerManager::StartControllingCl
|
|
|
|
|
|
+@@ -320,51 +320,51 @@ ServiceWorkerManager::StartControllingCl
|
|
const ServiceWorkerDescriptor& active =
|
|
const ServiceWorkerDescriptor& active =
|
|
aRegistrationInfo->GetActive()->Descriptor();
|
|
aRegistrationInfo->GetActive()->Descriptor();
|
|
|
|
|
|
@@ -18202,7 +18202,7 @@ diff --git a/dom/workers/ServiceWorkerScriptCache.cpp b/dom/workers/ServiceWorke
|
|
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
|
|
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
|
|
--- a/dom/workers/WorkerPrivate.cpp
|
|
--- a/dom/workers/WorkerPrivate.cpp
|
|
+++ b/dom/workers/WorkerPrivate.cpp
|
|
+++ b/dom/workers/WorkerPrivate.cpp
|
|
-@@ -4712,17 +4712,17 @@ WorkerPrivate::Constructor(JSContext* aC
|
|
|
|
|
|
+@@ -4674,17 +4674,17 @@ WorkerPrivate::Constructor(JSContext* aC
|
|
// WorkerThreadPrimaryRunnable::Run for workers just before running worker
|
|
// WorkerThreadPrimaryRunnable::Run for workers just before running worker
|
|
// code), so this is never SpiderMonkey's builtin default locale.
|
|
// code), so this is never SpiderMonkey's builtin default locale.
|
|
JS::UniqueChars defaultLocale = JS_GetDefaultLocale(aCx);
|
|
JS::UniqueChars defaultLocale = JS_GetDefaultLocale(aCx);
|
|
@@ -18221,7 +18221,7 @@ diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
|
|
|
|
|
|
worker->EnableDebugger();
|
|
worker->EnableDebugger();
|
|
|
|
|
|
-@@ -5261,17 +5261,17 @@ WorkerPrivate::DispatchToMainThread(nsIR
|
|
|
|
|
|
+@@ -5223,17 +5223,17 @@ WorkerPrivate::DispatchToMainThread(nsIR
|
|
nsCOMPtr<nsIRunnable> r = aRunnable;
|
|
nsCOMPtr<nsIRunnable> r = aRunnable;
|
|
return DispatchToMainThread(r.forget(), aFlags);
|
|
return DispatchToMainThread(r.forget(), aFlags);
|
|
}
|
|
}
|
|
@@ -18240,7 +18240,7 @@ diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
|
|
return mWorkerControlEventTarget;
|
|
return mWorkerControlEventTarget;
|
|
}
|
|
}
|
|
|
|
|
|
-@@ -7115,17 +7115,17 @@ WorkerPrivate::GetOrCreateGlobalScope(JS
|
|
|
|
|
|
+@@ -7064,17 +7064,17 @@ WorkerPrivate::GetOrCreateGlobalScope(JS
|
|
|
|
|
|
JS::Rooted<JSObject*> global(aCx);
|
|
JS::Rooted<JSObject*> global(aCx);
|
|
NS_ENSURE_TRUE(globalScope->WrapGlobalObject(aCx, &global), nullptr);
|
|
NS_ENSURE_TRUE(globalScope->WrapGlobalObject(aCx, &global), nullptr);
|
|
@@ -18259,7 +18259,7 @@ diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
|
|
|
|
|
|
JS_FireOnNewGlobalObject(aCx, global);
|
|
JS_FireOnNewGlobalObject(aCx, global);
|
|
}
|
|
}
|
|
-@@ -7146,17 +7146,17 @@ WorkerPrivate::CreateDebuggerGlobalScope
|
|
|
|
|
|
+@@ -7095,17 +7095,17 @@ WorkerPrivate::CreateDebuggerGlobalScope
|
|
JS::Rooted<JSObject*> global(aCx);
|
|
JS::Rooted<JSObject*> global(aCx);
|
|
NS_ENSURE_TRUE(globalScope->WrapGlobalObject(aCx, &global), nullptr);
|
|
NS_ENSURE_TRUE(globalScope->WrapGlobalObject(aCx, &global), nullptr);
|
|
|
|
|
|
@@ -18300,7 +18300,7 @@ diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
|
|
nsresult
|
|
nsresult
|
|
DispatchDebuggerRunnable(already_AddRefed<WorkerRunnable> aDebuggerRunnable);
|
|
DispatchDebuggerRunnable(already_AddRefed<WorkerRunnable> aDebuggerRunnable);
|
|
|
|
|
|
-@@ -1170,17 +1170,17 @@ public:
|
|
|
|
|
|
+@@ -1166,17 +1166,17 @@ public:
|
|
}
|
|
}
|
|
|
|
|
|
JS::UniqueChars
|
|
JS::UniqueChars
|
|
@@ -18385,7 +18385,7 @@ diff --git a/dom/workers/WorkerRunnable.h b/dom/workers/WorkerRunnable.h
|
|
diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
|
|
diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
|
|
--- a/dom/workers/WorkerScope.cpp
|
|
--- a/dom/workers/WorkerScope.cpp
|
|
+++ b/dom/workers/WorkerScope.cpp
|
|
+++ b/dom/workers/WorkerScope.cpp
|
|
-@@ -493,17 +493,17 @@ WorkerGlobalScope::CreateImageBitmap(JSC
|
|
|
|
|
|
+@@ -494,17 +494,17 @@ WorkerGlobalScope::CreateImageBitmap(JSC
|
|
return nullptr;
|
|
return nullptr;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -18404,7 +18404,7 @@ diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
|
|
{
|
|
{
|
|
return mSerialEventTarget;
|
|
return mSerialEventTarget;
|
|
}
|
|
}
|
|
-@@ -1072,17 +1072,17 @@ WorkerDebuggerGlobalScope::Dump(JSContex
|
|
|
|
|
|
+@@ -1073,17 +1073,17 @@ WorkerDebuggerGlobalScope::Dump(JSContex
|
|
scope->Dump(aString);
|
|
scope->Dump(aString);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -40359,7 +40359,7 @@ diff --git a/js/xpconnect/loader/URLPreloader.cpp b/js/xpconnect/loader/URLPrelo
|
|
diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
|
|
diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
|
|
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
|
|
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
|
|
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
|
|
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
|
|
-@@ -278,17 +278,17 @@ ReportOnCallerUTF8(JSCLContextHelper& he
|
|
|
|
|
|
+@@ -279,17 +279,17 @@ ReportOnCallerUTF8(JSCLContextHelper& he
|
|
nsCString location;
|
|
nsCString location;
|
|
MOZ_TRY(info.GetLocation(location));
|
|
MOZ_TRY(info.GetLocation(location));
|
|
|
|
|
|
@@ -40378,7 +40378,7 @@ diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/
|
|
#undef ENSURE_DEP
|
|
#undef ENSURE_DEP
|
|
|
|
|
|
mozJSComponentLoader::~mozJSComponentLoader()
|
|
mozJSComponentLoader::~mozJSComponentLoader()
|
|
-@@ -1428,10 +1428,10 @@ JSCLContextHelper::~JSCLContextHelper()
|
|
|
|
|
|
+@@ -1429,10 +1429,10 @@ JSCLContextHelper::~JSCLContextHelper()
|
|
JS_ReportErrorUTF8(mContext, "%s", mBuf.get());
|
|
JS_ReportErrorUTF8(mContext, "%s", mBuf.get());
|
|
}
|
|
}
|
|
}
|
|
}
|