bug 845562 - nsFrameSelection doesn't need to inherit from nsISupports r=smaug

This commit is contained in:
Trevor Saunders 2013-02-15 16:32:19 -05:00
parent 1a20d1b3c3
commit fb135090eb
2 changed files with 6 additions and 8 deletions

View File

@ -7,6 +7,7 @@
#include "mozilla/Attributes.h" #include "mozilla/Attributes.h"
#include "mozilla/Selection.h"
#include "nsIFrame.h" #include "nsIFrame.h"
#include "nsIContent.h" #include "nsIContent.h"
#include "nsISelectionController.h" #include "nsISelectionController.h"
@ -185,13 +186,13 @@ class nsIScrollableFrame;
* or they may cause other objects to be deleted. * or they may cause other objects to be deleted.
*/ */
class nsFrameSelection MOZ_FINAL : public nsISupports { class nsFrameSelection MOZ_FINAL {
public: public:
enum HINT { HINTLEFT = 0, HINTRIGHT = 1}; //end of this line or beginning of next enum HINT { HINTLEFT = 0, HINTRIGHT = 1}; //end of this line or beginning of next
/*interfaces for addref and release and queryinterface*/ /*interfaces for addref and release and queryinterface*/
NS_DECL_CYCLE_COLLECTING_ISUPPORTS NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(nsFrameSelection)
NS_DECL_CYCLE_COLLECTION_CLASS(nsFrameSelection) NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(nsFrameSelection)
/** Init will initialize the frame selector with the necessary pres shell to /** Init will initialize the frame selector with the necessary pres shell to
* be used by most of the methods * be used by most of the methods

View File

@ -415,11 +415,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsFrameSelection)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAncestorLimiter) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAncestorLimiter)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsFrameSelection) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsFrameSelection, AddRef)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsFrameSelection) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(nsFrameSelection, Release)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFrameSelection)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END
nsresult nsresult