Bug 1038411 - Give myDownloadObserver a private destructor; r=mak
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 16 Jul 2014 13:21:23 -0400
changeset 216340 f22e1fd54e85560f0c2a526b8f67d5e53e9e1fd5
parent 216339 19f35def6780c9acae910e40e956f233afb7218c
child 216341 21974ff3c9d76b927d96b285403eeef783c838f7
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1038411
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1038411 - Give myDownloadObserver a private destructor; r=mak
widget/windows/WinUtils.cpp
widget/windows/WinUtils.h
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -55,18 +55,18 @@
 PRLogModuleInfo* gWindowsLog = nullptr;
 #endif
 
 using namespace mozilla::gfx;
 
 namespace mozilla {
 namespace widget {
 
+#ifdef MOZ_PLACES
 NS_IMPL_ISUPPORTS(myDownloadObserver, nsIDownloadObserver)
-#ifdef MOZ_PLACES
 NS_IMPL_ISUPPORTS(AsyncFaviconDataReady, nsIFaviconDataCallback)
 #endif
 NS_IMPL_ISUPPORTS(AsyncEncodeAndWriteIcon, nsIRunnable)
 NS_IMPL_ISUPPORTS(AsyncDeleteIconFromDisk, nsIRunnable)
 NS_IMPL_ISUPPORTS(AsyncDeleteAllFaviconsFromDisk, nsIRunnable)
 
 
 const char FaviconHelper::kJumpListCacheDir[] = "jumpListCache";
--- a/widget/windows/WinUtils.h
+++ b/widget/windows/WinUtils.h
@@ -92,22 +92,26 @@ namespace widget {
 
 // Logging macros
 #define LogFunction() mozilla::widget::WinUtils::Log(__FUNCTION__)
 #define LogThread() mozilla::widget::WinUtils::Log("%s: IsMainThread:%d ThreadId:%X", __FUNCTION__, NS_IsMainThread(), GetCurrentThreadId())
 #define LogThis() mozilla::widget::WinUtils::Log("[%X] %s", this, __FUNCTION__)
 #define LogException(e) mozilla::widget::WinUtils::Log("%s Exception:%s", __FUNCTION__, e->ToString()->Data())
 #define LogHRESULT(hr) mozilla::widget::WinUtils::Log("%s hr=%X", __FUNCTION__, hr)
 
+#ifdef MOZ_PLACES
 class myDownloadObserver MOZ_FINAL : public nsIDownloadObserver
 {
+  ~myDownloadObserver() {}
+
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOWNLOADOBSERVER
 };
+#endif
 
 class WinUtils {
 public:
   /**
    * Functions to convert between logical pixels as used by most Windows APIs
    * and physical (device) pixels.
    */
   static double LogToPhysFactor();