# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1421929317 -3600
# Node ID b8a032363ba2c9d9dd3734defb3b2b589e2907ad
# Parent  925c144e1f1f9c60fe73659fb14d2ed0b0fe9649
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

diff -r 925c144e1f1f -r b8a032363ba2 widget/xpwidgets/nsTransferable.cpp
--- a/widget/xpwidgets/nsTransferable.cpp	Fri Jan 16 18:13:44 2015 +0100
+++ b/widget/xpwidgets/nsTransferable.cpp	Thu Jan 22 13:21:57 2015 +0100
@@ -56,11 +56,11 @@
 
 //-------------------------------------------------------------------------
 void
-DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen, bool aIsPrivBrowsing )
+DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen, bool aIsPrivateData )
 {
   // Now, check to see if we consider the data to be "too large"
   // as well as ensuring that private browsing mode is disabled
-  if (aDataLen > kLargeDatasetSize && !aIsPrivBrowsing) {
+  if (aDataLen > kLargeDatasetSize && !aIsPrivateData) {
     // if so, cache it to disk instead of memory
     if ( NS_SUCCEEDED(WriteCache(aData, aDataLen)) )
       return;
@@ -402,7 +402,7 @@
   for (i = 0; i < mDataArray.Length(); ++i) {
     DataStruct& data = mDataArray.ElementAt(i);
     if ( data.GetFlavor().Equals(aFlavor) ) {
-      data.SetData ( aData, aDataLen, mPrivateData);
+      data.SetData ( aData, aDataLen, mPrivateData );
       return NS_OK;
     }
   }
diff -r 925c144e1f1f -r b8a032363ba2 widget/xpwidgets/nsTransferable.h
--- a/widget/xpwidgets/nsTransferable.h	Fri Jan 16 18:13:44 2015 +0100
+++ b/widget/xpwidgets/nsTransferable.h	Thu Jan 22 13:21:57 2015 +0100
@@ -27,7 +27,7 @@
   ~DataStruct();
   
   const nsCString& GetFlavor() const { return mFlavor; }
-  void SetData( nsISupports* inData, uint32_t inDataLen, bool inPrivBrowse );
+  void SetData( nsISupports* inData, uint32_t inDataLen, bool aIsPrivateData );
   void GetData( nsISupports** outData, uint32_t *outDataLen );
   already_AddRefed<nsIFile> GetFileSpec(const char* aFileName);
   bool IsDataAvailable() const { return (mData && mDataLen > 0) || (!mData && mCacheFileName); }