From 7547b7f2a688931e9bd66eb0078af2ae306f08a5 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Wed, 23 Apr 2014 00:50:08 -0400 Subject: [PATCH] Bug 999880 - Make RetrievalContext not use mozilla::RefCounted; r=roc --- widget/gtk/nsClipboard.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/widget/gtk/nsClipboard.cpp b/widget/gtk/nsClipboard.cpp index ec0693e5a70..975e73c413c 100644 --- a/widget/gtk/nsClipboard.cpp +++ b/widget/gtk/nsClipboard.cpp @@ -876,17 +876,18 @@ static GtkSelectionData* CopyRetrievedData(GtkSelectionData *aData) gtk_selection_data_copy(aData) : nullptr; } -class RetrievalContext : public RefCounted { -public: - MOZ_DECLARE_REFCOUNTED_TYPENAME(RetrievalContext) - enum State { INITIAL, COMPLETED, TIMED_OUT }; - - RetrievalContext() : mState(INITIAL), mData(nullptr) {} +class RetrievalContext { ~RetrievalContext() { MOZ_ASSERT(!mData, "Wait() wasn't called"); } +public: + NS_INLINE_DECL_REFCOUNTING(RetrievalContext) + enum State { INITIAL, COMPLETED, TIMED_OUT }; + + RetrievalContext() : mState(INITIAL), mData(nullptr) {} + /** * Call this when data has been retrieved. */