mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1293117 (part 5) - Change many NS_METHOD occurrences to NS_IMETHOD. r=froydnj. 

This patch makes the following changes on many in-class methods.

- NS_METHOD F() override;      --> NS_IMETHOD F() override;
- NS_METHOD F() override {...} --> NS_IMETHOD F() override {...}
- NS_METHOD F() final;         --> NS_IMETHOD F() final;
- NS_METHOD F() final {...}    --> NS_IMETHOD F() final {...}

Using NS_IMETHOD is the preferred way of marking in-class virtual methods.
Although these transformations add an explicit |virtual|, they are safe --
there's an implicit |virtual| anyway because |override| and |final| only work
with virtual methods.

--HG--
extra : rebase_source : 3010fade82a170eab7f13d81bf61b02cd693f3cf
This commit is contained in:
Nicholas Nethercote 2016-08-08 10:54:50 +10:00
Родитель bab6d17ebf
Коммит 8f51d02c97
8 изменённых файлов: 42 добавлений и 42 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
dom/bluetooth/bluedroid/BluetoothAvrcpManager.cpp
Просмотреть файл

@ -442,7 +442,7 @@ public:
{
MOZ_ASSERT(mManager);
}
NS_METHOD Run() override
NS_IMETHOD Run() override
{
mManager->OnConnect(EmptyString());
return NS_OK;
@ -475,7 +475,7 @@ public:
{
MOZ_ASSERT(mManager);
}
NS_METHOD Run() override
NS_IMETHOD Run() override
{
mManager->OnDisconnect(EmptyString());
return NS_OK;

2
dom/media/MediaRecorder.cpp
Просмотреть файл

@ -73,7 +73,7 @@ public:
}
}
NS_METHOD
NS_IMETHOD
CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{

2
layout/generic/nsPluginFrame.h
Просмотреть файл

@ -105,7 +105,7 @@ public:
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) override;
NS_METHOD GetPluginInstance(nsNPAPIPluginInstance** aPluginInstance) override;
NS_IMETHOD GetPluginInstance(nsNPAPIPluginInstance** aPluginInstance) override;
virtual void SetIsDocumentActive(bool aIsActive) override;

2
toolkit/components/osfile/NativeOSFileInternals.cpp
Просмотреть файл

@ -594,7 +594,7 @@ public:
MOZ_ASSERT(NS_IsMainThread());
}
NS_METHOD Run() override {
NS_IMETHOD Run() override {
MOZ_ASSERT(!NS_IsMainThread());
TimeStamp dispatchDate = TimeStamp::Now();

2
toolkit/crashreporter/nsExceptionHandler.cpp
Просмотреть файл

@ -2126,7 +2126,7 @@ public:
, mAppendAppNotes(true)
{}
NS_METHOD Run() override;
NS_IMETHOD Run() override;
private:
nsCString mKey;

14
widget/nsDeviceContextSpecProxy.h
Просмотреть файл

@ -27,28 +27,28 @@ class nsDeviceContextSpecProxy final : public nsIDeviceContextSpec
public:
NS_DECL_ISUPPORTS
NS_METHOD Init(nsIWidget* aWidget, nsIPrintSettings* aPrintSettings,
NS_IMETHOD Init(nsIWidget* aWidget, nsIPrintSettings* aPrintSettings,
bool aIsPrintPreview) final;
virtual already_AddRefed<PrintTarget> MakePrintTarget() final;
NS_METHOD GetDrawEventRecorder(mozilla::gfx::DrawEventRecorder** aDrawEventRecorder) final;
NS_IMETHOD GetDrawEventRecorder(mozilla::gfx::DrawEventRecorder** aDrawEventRecorder) final;
float GetDPI() final;
float GetPrintingScale() final;
NS_METHOD BeginDocument(const nsAString& aTitle,
NS_IMETHOD BeginDocument(const nsAString& aTitle,
const nsAString& aPrintToFileName,
int32_t aStartPage, int32_t aEndPage) final;
NS_METHOD EndDocument() final;
NS_IMETHOD EndDocument() final;
NS_METHOD AbortDocument() final;
NS_IMETHOD AbortDocument() final;
NS_METHOD BeginPage() final;
NS_IMETHOD BeginPage() final;
NS_METHOD EndPage() final;
NS_IMETHOD EndPage() final;
private:
~nsDeviceContextSpecProxy() {}

26
xpcom/base/nsMemoryReporterManager.cpp
Просмотреть файл

@ -804,7 +804,7 @@ class WindowsAddressSpaceReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
// First iterate over all the segments and record how many of each kind
@ -987,7 +987,7 @@ class VsizeMaxContiguousReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
int64_t amount;
@ -1010,7 +1010,7 @@ class PrivateReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
int64_t amount;
@ -1034,7 +1034,7 @@ class VsizeReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
int64_t amount;
@ -1061,7 +1061,7 @@ class ResidentReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
int64_t amount;
@ -1090,7 +1090,7 @@ class ResidentUniqueReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
int64_t amount = 0;
@ -1118,7 +1118,7 @@ class SystemHeapReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
int64_t amount;
@ -1174,7 +1174,7 @@ class ResidentPeakReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
int64_t amount = 0;
@ -1197,7 +1197,7 @@ class PageFaultsSoftReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
struct rusage usage;
@ -1241,7 +1241,7 @@ class PageFaultsHardReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
int64_t amount = 0;
@ -1298,7 +1298,7 @@ class JemallocHeapReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
jemalloc_stats_t stats;
@ -1392,7 +1392,7 @@ class AtomTablesReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
size_t Main, Static;
@ -1429,7 +1429,7 @@ class DeadlockDetectorReporter final : public nsIMemoryReporter
public:
NS_DECL_ISUPPORTS
NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize) override
{
return MOZ_COLLECT_REPORT(

2
xpcom/threads/TaskQueue.h
Просмотреть файл

@ -173,7 +173,7 @@ protected:
: mQueue(aQueue)
{
}
NS_METHOD Run() override;
NS_IMETHOD Run() override;
private:
RefPtr<TaskQueue> mQueue;
};