merge mozilla-inbound to mozilla-central a=merge

This commit is contained in:
Carsten "Tomcat" Book
2016-08-10 15:54:26 +02:00
494 changed files with 3161 additions and 1934 deletions

View File

@@ -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;