merge mozilla-inbound to mozilla-central a=merge
This commit is contained in:
@@ -242,7 +242,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMETHOD Run()
|
||||
NS_IMETHOD Run() override
|
||||
{
|
||||
// Silently cancel if our load has been cancelled.
|
||||
if (IsCancelled())
|
||||
@@ -264,7 +264,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMETHOD Run() {
|
||||
NS_IMETHOD Run() override {
|
||||
// Silently cancel if our load has been cancelled.
|
||||
if (IsCancelled())
|
||||
return NS_OK;
|
||||
@@ -1052,7 +1052,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMETHOD Run() {
|
||||
NS_IMETHOD Run() override {
|
||||
// Silently cancel if our load has been cancelled.
|
||||
if (IsCancelled())
|
||||
return NS_OK;
|
||||
|
||||
Reference in New Issue
Block a user