Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1241302 - Slightly modernize this code. r=jst

Browse Source
This commit is contained in:
Blake Kaplan 2016-01-20 14:45:00 +01:00
parent 096c338869
commit 6d17948bc1
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
widget/nsBaseClipboard.cpp
View File

@ -11,11 +11,9 @@
#include "nsISupportsPrimitives.h"
nsBaseClipboard::nsBaseClipboard()
: mEmptyingForSetData(false)
, mIgnoreEmptyNotification(false)
{
mClipboardOwner = nullptr;
mTransferable = nullptr;
mIgnoreEmptyNotification = false;
mEmptyingForSetData = false;
}
nsBaseClipboard::~nsBaseClipboard()
@ -50,18 +48,13 @@ NS_IMETHODIMP nsBaseClipboard::SetData(nsITransferable * aTransferable, nsIClipb
mEmptyingForSetData = false;
mClipboardOwner = anOwner;
if ( anOwner )
NS_ADDREF(mClipboardOwner);
mTransferable = aTransferable;
nsresult rv = NS_ERROR_FAILURE;
if ( mTransferable ) {
NS_ADDREF(mTransferable);
nsresult rv = NS_ERROR_FAILURE;
if (mTransferable) {
rv = SetNativeClipboardData(aWhichClipboard);
}
return rv;
}
@ -92,19 +85,18 @@ NS_IMETHODIMP nsBaseClipboard::EmptyClipboard(int32_t aWhichClipboard)
SupportsSelectionClipboard(&selectClipPresent);
bool findClipPresent;
SupportsFindClipboard(&findClipPresent);
if ( !selectClipPresent && !findClipPresent && aWhichClipboard != kGlobalClipboard )
if (!selectClipPresent && !findClipPresent && aWhichClipboard != kGlobalClipboard)
return NS_ERROR_FAILURE;
if (mIgnoreEmptyNotification)
return NS_OK;
if ( mClipboardOwner ) {
if (mClipboardOwner) {
mClipboardOwner->LosingOwnership(mTransferable);
NS_RELEASE(mClipboardOwner);
mClipboardOwner = nullptr;
}
NS_IF_RELEASE(mTransferable);
mTransferable = nullptr;
return NS_OK;
}

4
widget/nsBaseClipboard.h
View File

@ -37,8 +37,8 @@ protected:
bool mEmptyingForSetData;
bool mIgnoreEmptyNotification;
nsIClipboardOwner * mClipboardOwner;
nsITransferable * mTransferable;
nsCOMPtr<nsIClipboardOwner> mClipboardOwner;
nsCOMPtr<nsITransferable> mTransferable;
};