The Tor Browser / changeset

     1.1 --- a/widget/xpwidgets/nsTransferable.cpp	Thu Jan 15 21:13:52 2015 +0100
     1.2 +++ b/widget/xpwidgets/nsTransferable.cpp	Fri Jan 16 04:50:19 2015 +0100
     1.3 @@ -399,17 +399,11 @@
     1.4  
     1.5    // first check our intrinsic flavors to see if one has been registered.
     1.6    uint32_t i = 0;
     1.7 -  bool aIsPrivBrowsing = false;
     1.8    for (i = 0; i < mDataArray.Length(); ++i) {
     1.9      DataStruct& data = mDataArray.ElementAt(i);
    1.10      if ( data.GetFlavor().Equals(aFlavor) ) {
    1.11 -      if ( NS_SUCCEEDED(GetIsPrivateData(&aIsPrivBrowsing)) ) {
    1.12 -        data.SetData ( aData, aDataLen, aIsPrivBrowsing );
    1.13 -        return NS_OK;
    1.14 -      }
    1.15 -      else {                     // call to GetIsPrivateData() failed,
    1.16 -        return NS_ERROR_FAILURE; // we didn't SetData(), generic error
    1.17 -      }
    1.18 +      data.SetData ( aData, aDataLen, mPrivateData);
    1.19 +      return NS_OK;
    1.20      }
    1.21    }
    1.22  
    1.23 @@ -418,20 +412,14 @@
    1.24      for (i = 0; i < mDataArray.Length(); ++i) {
    1.25        DataStruct& data = mDataArray.ElementAt(i);
    1.26        bool canConvert = false;
    1.27 -      bool aIsPrivBrowsing = false;
    1.28        mFormatConv->CanConvert(aFlavor, data.GetFlavor().get(), &canConvert);
    1.29  
    1.30        if ( canConvert ) {
    1.31          nsCOMPtr<nsISupports> ConvertedData;
    1.32          uint32_t ConvertedLen;
    1.33          mFormatConv->Convert(aFlavor, aData, aDataLen, data.GetFlavor().get(), getter_AddRefs(ConvertedData), &ConvertedLen);
    1.34 -        if (NS_SUCCEEDED(GetIsPrivateData(&aIsPrivBrowsing))) {
    1.35 -          data.SetData(ConvertedData, ConvertedLen, aIsPrivBrowsing);
    1.36 -          return NS_OK;
    1.37 -        }
    1.38 -        else {                     // call to GetIsPrivateData() failed,
    1.39 -          return NS_ERROR_FAILURE; // we didn't SetData(), generic error
    1.40 -        }
    1.41 +        data.SetData(ConvertedData, ConvertedLen, mPrivateData);
    1.42 +        return NS_OK;
    1.43        }
    1.44      }
    1.45    }