Fix for bug 838721 (nsDOMDeviceStorage should have nsDOMEventTargetHelper as its first base class). r=smaug.
authorPeter Van der Beken <peterv@propagandism.org>
Thu, 07 Feb 2013 10:19:08 +0000
changeset 121172 0af7f130555a7864ce3491caa5c3060642cffcd8
parent 121171 0c9b624f525f289fd32af01ef9187f632a8d3a5f
child 121173 5e735fee82b4ca8da3a7cfab914e4afe98b98b9d
push id22612
push userpvanderbeken@mozilla.com
push dateThu, 07 Feb 2013 16:18:51 +0000
treeherdermozilla-inbound@0af7f130555a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs838721
milestone21.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
Fix for bug 838721 (nsDOMDeviceStorage should have nsDOMEventTargetHelper as its first base class). r=smaug.
content/html/content/test/test_ol_attributes_reflection.html
dom/devicestorage/DeviceStorage.h
dom/devicestorage/nsDeviceStorage.cpp
--- a/dom/devicestorage/DeviceStorage.h
+++ b/dom/devicestorage/DeviceStorage.h
@@ -52,27 +52,26 @@ class FileUpdateDispatcher MOZ_FINAL
   NS_DECL_NSIOBSERVER
 
   static FileUpdateDispatcher* GetSingleton();
  private:
   static mozilla::StaticRefPtr<FileUpdateDispatcher> sSingleton;
 };
 
 class nsDOMDeviceStorage MOZ_FINAL
-  : public nsIDOMDeviceStorage
-  , public nsDOMEventTargetHelper
+  : public nsDOMEventTargetHelper
+  , public nsIDOMDeviceStorage
   , public nsIObserver
 {
 public:
-  NS_DECL_ISUPPORTS
+  NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMDEVICESTORAGE
 
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIDOMEVENTTARGET
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMDeviceStorage, nsDOMEventTargetHelper)
 
   nsDOMDeviceStorage();
 
   nsresult Init(nsPIDOMWindow* aWindow, const nsAString &aType);
 
   void SetRootDirectoryForType(const nsAString& aType);
 
   static void CreateDeviceStoragesFor(nsPIDOMWindow* aWin,
--- a/dom/devicestorage/nsDeviceStorage.cpp
+++ b/dom/devicestorage/nsDeviceStorage.cpp
@@ -1813,21 +1813,19 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(DeviceS
 NS_IMPL_CYCLE_COLLECTION_5(DeviceStorageRequest,
                            mRequest,
                            mWindow,
                            mBlob,
                            mDeviceStorage,
                            mListener)
 
 
-NS_IMPL_CYCLE_COLLECTION_INHERITED_0(nsDOMDeviceStorage, nsDOMEventTargetHelper)
-
 DOMCI_DATA(DeviceStorage, nsDOMDeviceStorage)
 
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMDeviceStorage)
+NS_INTERFACE_MAP_BEGIN(nsDOMDeviceStorage)
   NS_INTERFACE_MAP_ENTRY(nsIDOMDeviceStorage)
   NS_INTERFACE_MAP_ENTRY(nsIObserver)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DeviceStorage)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
 
 NS_IMPL_ADDREF_INHERITED(nsDOMDeviceStorage, nsDOMEventTargetHelper)
 NS_IMPL_RELEASE_INHERITED(nsDOMDeviceStorage, nsDOMEventTargetHelper)