diff -r 7540298fafa1 -r 44a2da4a2ab2 widget/xpwidgets/nsTransferable.cpp --- a/widget/xpwidgets/nsTransferable.cpp Thu Jan 15 21:13:52 2015 +0100 +++ b/widget/xpwidgets/nsTransferable.cpp Fri Jan 16 04:50:19 2015 +0100 @@ -399,17 +399,11 @@ // first check our intrinsic flavors to see if one has been registered. uint32_t i = 0; - bool aIsPrivBrowsing = false; for (i = 0; i < mDataArray.Length(); ++i) { DataStruct& data = mDataArray.ElementAt(i); if ( data.GetFlavor().Equals(aFlavor) ) { - if ( NS_SUCCEEDED(GetIsPrivateData(&aIsPrivBrowsing)) ) { - data.SetData ( aData, aDataLen, aIsPrivBrowsing ); - return NS_OK; - } - else { // call to GetIsPrivateData() failed, - return NS_ERROR_FAILURE; // we didn't SetData(), generic error - } + data.SetData ( aData, aDataLen, mPrivateData); + return NS_OK; } } @@ -418,20 +412,14 @@ for (i = 0; i < mDataArray.Length(); ++i) { DataStruct& data = mDataArray.ElementAt(i); bool canConvert = false; - bool aIsPrivBrowsing = false; mFormatConv->CanConvert(aFlavor, data.GetFlavor().get(), &canConvert); if ( canConvert ) { nsCOMPtr ConvertedData; uint32_t ConvertedLen; mFormatConv->Convert(aFlavor, aData, aDataLen, data.GetFlavor().get(), getter_AddRefs(ConvertedData), &ConvertedLen); - if (NS_SUCCEEDED(GetIsPrivateData(&aIsPrivBrowsing))) { - data.SetData(ConvertedData, ConvertedLen, aIsPrivBrowsing); - return NS_OK; - } - else { // call to GetIsPrivateData() failed, - return NS_ERROR_FAILURE; // we didn't SetData(), generic error - } + data.SetData(ConvertedData, ConvertedLen, mPrivateData); + return NS_OK; } } }