зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1123890: Add MOZ_OVERRIDE annotations to overriding methods in dom/broadcastchannel. r=baku
This commit is contained in:
Родитель
3823a536a2
Коммит
c88d8c3716
|
@ -187,7 +187,7 @@ public:
|
||||||
MOZ_ASSERT(mActor);
|
MOZ_ASSERT(mActor);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP Run()
|
NS_IMETHODIMP Run() MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(mActor);
|
MOZ_ASSERT(mActor);
|
||||||
if (mActor->IsActorDestroyed()) {
|
if (mActor->IsActorDestroyed()) {
|
||||||
|
@ -221,7 +221,7 @@ public:
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP Cancel()
|
NS_IMETHODIMP Cancel() MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
mActor = nullptr;
|
mActor = nullptr;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
@ -247,13 +247,13 @@ public:
|
||||||
MOZ_ASSERT(mBC);
|
MOZ_ASSERT(mBC);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP Run()
|
NS_IMETHODIMP Run() MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
mBC->Shutdown();
|
mBC->Shutdown();
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP Cancel()
|
NS_IMETHODIMP Cancel() MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
mBC = nullptr;
|
mBC = nullptr;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
@ -278,7 +278,7 @@ public:
|
||||||
MOZ_ASSERT(mActor);
|
MOZ_ASSERT(mActor);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP Run()
|
NS_IMETHODIMP Run() MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(mActor);
|
MOZ_ASSERT(mActor);
|
||||||
if (!mActor->IsActorDestroyed()) {
|
if (!mActor->IsActorDestroyed()) {
|
||||||
|
@ -287,7 +287,7 @@ public:
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP Cancel()
|
NS_IMETHODIMP Cancel() MOZ_OVERRIDE
|
||||||
{
|
{
|
||||||
mActor = nullptr;
|
mActor = nullptr;
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
|
@ -42,7 +42,7 @@ private:
|
||||||
|
|
||||||
~BroadcastChannelChild();
|
~BroadcastChannelChild();
|
||||||
|
|
||||||
void ActorDestroy(ActorDestroyReason aWhy);
|
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
|
||||||
|
|
||||||
// This raw pointer is actually the parent object.
|
// This raw pointer is actually the parent object.
|
||||||
// It's set to null when the parent object is deleted.
|
// It's set to null when the parent object is deleted.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче