Skip to content

Commit

Permalink
Bug 1118609 - Mark virtual overridden functions as MOZ_OVERRIDE in do…
Browse files Browse the repository at this point in the history
…m/storage; r=baku
  • Loading branch information
ehsan committed Jan 7, 2015
1 parent e3ed55d commit 6c40271
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion dom/storage/DOMStorageCache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class DOMStorageCacheHolder : public nsITimerCallback
NS_DECL_ISUPPORTS

NS_IMETHODIMP
Notify(nsITimer* aTimer)
Notify(nsITimer* aTimer) MOZ_OVERRIDE
{
mCache = nullptr;
return NS_OK;
Expand Down
22 changes: 11 additions & 11 deletions dom/storage/DOMStorageIPC.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,27 +174,27 @@ class DOMStorageDBParent MOZ_FINAL : public PStorageParent
private:
// IPC
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
bool RecvAsyncPreload(const nsCString& aScope, const bool& aPriority);
bool RecvAsyncPreload(const nsCString& aScope, const bool& aPriority) MOZ_OVERRIDE;
bool RecvPreload(const nsCString& aScope, const uint32_t& aAlreadyLoadedCount,
InfallibleTArray<nsString>* aKeys, InfallibleTArray<nsString>* aValues,
nsresult* aRv);
bool RecvAsyncGetUsage(const nsCString& aScope);
bool RecvAsyncAddItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue);
bool RecvAsyncUpdateItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue);
bool RecvAsyncRemoveItem(const nsCString& aScope, const nsString& aKey);
bool RecvAsyncClear(const nsCString& aScope);
bool RecvAsyncFlush();
nsresult* aRv) MOZ_OVERRIDE;
bool RecvAsyncGetUsage(const nsCString& aScope) MOZ_OVERRIDE;
bool RecvAsyncAddItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue) MOZ_OVERRIDE;
bool RecvAsyncUpdateItem(const nsCString& aScope, const nsString& aKey, const nsString& aValue) MOZ_OVERRIDE;
bool RecvAsyncRemoveItem(const nsCString& aScope, const nsString& aKey) MOZ_OVERRIDE;
bool RecvAsyncClear(const nsCString& aScope) MOZ_OVERRIDE;
bool RecvAsyncFlush() MOZ_OVERRIDE;

// DOMStorageObserverSink
virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix);
virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix) MOZ_OVERRIDE;

private:
CacheParentBridge* NewCache(const nsACString& aScope);

ThreadSafeAutoRefCnt mRefCnt;
NS_DECL_OWNINGTHREAD
// True when IPC channel is open and Send*() methods are OK to use.

// True when IPC channel is open and Send*() methods are OK to use.
bool mIPCOpen;
};

Expand Down
2 changes: 1 addition & 1 deletion dom/storage/DOMStorageManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class DOMStorageManager : public nsIDOMStorageManager

private:
// DOMStorageObserverSink, handler to various chrome clearing notification
virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix);
virtual nsresult Observe(const char* aTopic, const nsACString& aScopePrefix) MOZ_OVERRIDE;

// Since nsTHashtable doesn't like multiple inheritance, we have to aggregate
// DOMStorageCache into the entry.
Expand Down

0 comments on commit 6c40271

Please sign in to comment.