The Tor Browser / changeset

     1.1 --- a/widget/xpwidgets/nsTransferable.cpp	Thu Jan 15 15:59:08 2015 +0100
     1.2 +++ b/widget/xpwidgets/nsTransferable.cpp	Thu Jan 15 21:03:48 2015 +0100
     1.3 @@ -55,8 +55,6 @@
     1.4  }
     1.5  
     1.6  //-------------------------------------------------------------------------
     1.7 -// The SetData method is overloaded to indicate private browsing mode
     1.8 -// while achieving some semblance of (private) interface compatibility.
     1.9  //-------------------------------------------------------------------------
    1.10  void
    1.11  DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen, bool aIsPrivBrowsing )
    1.12 @@ -78,24 +76,6 @@
    1.13  
    1.14  //-------------------------------------------------------------------------
    1.15  void
    1.16 -DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen )
    1.17 -{
    1.18 -  // Now, check to see if we consider the data to be "too large"
    1.19 -  if (aDataLen > kLargeDatasetSize) {
    1.20 -    // if so, cache it to disk instead of memory
    1.21 -    if ( NS_SUCCEEDED(WriteCache(aData, aDataLen)) )
    1.22 -      return;
    1.23 -    else
    1.24 -			NS_WARNING("Oh no, couldn't write data to the cache file");   
    1.25 -  } 
    1.26 -
    1.27 -  mData    = aData;
    1.28 -  mDataLen = aDataLen;  
    1.29 -}
    1.30 -
    1.31 -
    1.32 -//-------------------------------------------------------------------------
    1.33 -void
    1.34  DataStruct::GetData ( nsISupports** aData, uint32_t *aDataLen )
    1.35  {
    1.36    // check here to see if the data is cached on disk
    1.37 @@ -439,14 +419,20 @@
    1.38      for (i = 0; i < mDataArray.Length(); ++i) {
    1.39        DataStruct& data = mDataArray.ElementAt(i);
    1.40        bool canConvert = false;
    1.41 +      bool aIsPrivBrowsing = false;
    1.42        mFormatConv->CanConvert(aFlavor, data.GetFlavor().get(), &canConvert);
    1.43  
    1.44        if ( canConvert ) {
    1.45          nsCOMPtr<nsISupports> ConvertedData;
    1.46          uint32_t ConvertedLen;
    1.47          mFormatConv->Convert(aFlavor, aData, aDataLen, data.GetFlavor().get(), getter_AddRefs(ConvertedData), &ConvertedLen);
    1.48 -        data.SetData(ConvertedData, ConvertedLen);
    1.49 -        return NS_OK;
    1.50 +        if (NS_SUCCEEDED(GetIsPrivateData(&aIsPrivBrowsing))) {
    1.51 +          data.SetData(ConvertedData, ConvertedLen, aIsPrivBrowsing);
    1.52 +          return NS_OK;
    1.53 +        }
    1.54 +        else {                     // call to GetIsPrivateData() failed,
    1.55 +          return NS_ERROR_FAILURE; // we didn't SetData(), generic error
    1.56 +        }
    1.57        }
    1.58      }
    1.59    }

     2.1 --- a/widget/xpwidgets/nsTransferable.h	Thu Jan 15 15:59:08 2015 +0100
     2.2 +++ b/widget/xpwidgets/nsTransferable.h	Thu Jan 15 21:03:48 2015 +0100
     2.3 @@ -27,7 +27,6 @@
     2.4    ~DataStruct();
     2.5    
     2.6    const nsCString& GetFlavor() const { return mFlavor; }
     2.7 -  void SetData( nsISupports* inData, uint32_t inDataLen );
     2.8    void SetData( nsISupports* inData, uint32_t inDataLen, bool inPrivBrowse );
     2.9    void GetData( nsISupports** outData, uint32_t *outDataLen );
    2.10    already_AddRefed<nsIFile> GetFileSpec(const char* aFileName);