Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
widget/xpwidgets/nsTransferable.cpp | file | annotate | diff | comparison | revisions | |
widget/xpwidgets/nsTransferable.h | file | annotate | diff | comparison | revisions |
1.1 --- a/widget/xpwidgets/nsTransferable.cpp Fri Jan 16 18:13:44 2015 +0100 1.2 +++ b/widget/xpwidgets/nsTransferable.cpp Thu Jan 22 13:21:57 2015 +0100 1.3 @@ -56,11 +56,11 @@ 1.4 1.5 //------------------------------------------------------------------------- 1.6 void 1.7 -DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen, bool aIsPrivBrowsing ) 1.8 +DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen, bool aIsPrivateData ) 1.9 { 1.10 // Now, check to see if we consider the data to be "too large" 1.11 // as well as ensuring that private browsing mode is disabled 1.12 - if (aDataLen > kLargeDatasetSize && !aIsPrivBrowsing) { 1.13 + if (aDataLen > kLargeDatasetSize && !aIsPrivateData) { 1.14 // if so, cache it to disk instead of memory 1.15 if ( NS_SUCCEEDED(WriteCache(aData, aDataLen)) ) 1.16 return; 1.17 @@ -402,7 +402,7 @@ 1.18 for (i = 0; i < mDataArray.Length(); ++i) { 1.19 DataStruct& data = mDataArray.ElementAt(i); 1.20 if ( data.GetFlavor().Equals(aFlavor) ) { 1.21 - data.SetData ( aData, aDataLen, mPrivateData); 1.22 + data.SetData ( aData, aDataLen, mPrivateData ); 1.23 return NS_OK; 1.24 } 1.25 }
2.1 --- a/widget/xpwidgets/nsTransferable.h Fri Jan 16 18:13:44 2015 +0100 2.2 +++ b/widget/xpwidgets/nsTransferable.h Thu Jan 22 13:21:57 2015 +0100 2.3 @@ -27,7 +27,7 @@ 2.4 ~DataStruct(); 2.5 2.6 const nsCString& GetFlavor() const { return mFlavor; } 2.7 - void SetData( nsISupports* inData, uint32_t inDataLen, bool inPrivBrowse ); 2.8 + void SetData( nsISupports* inData, uint32_t inDataLen, bool aIsPrivateData ); 2.9 void GetData( nsISupports** outData, uint32_t *outDataLen ); 2.10 already_AddRefed<nsIFile> GetFileSpec(const char* aFileName); 2.11 bool IsDataAvailable() const { return (mData && mDataLen > 0) || (!mData && mCacheFileName); }