# HG changeset patch # User Michael Schloh von Bennewitz # Date 1421333704 -3600 # Node ID a63d609f5ebee63b3f8966d808fb671c3a859808 # Parent 97036ab72558bda963f820869ed8c2e647affb5f Back out 97036ab72558 which inappropriately compared turds to third parties. diff -r 97036ab72558 -r a63d609f5ebe widget/xpwidgets/nsTransferable.cpp --- a/widget/xpwidgets/nsTransferable.cpp Tue Jan 06 21:39:09 2015 +0100 +++ b/widget/xpwidgets/nsTransferable.cpp Thu Jan 15 15:55:04 2015 +0100 @@ -14,7 +14,6 @@ #include "nsTransferable.h" -#include "mozilla/Preferences.h" #include "nsString.h" #include "nsReadableUtils.h" #include "nsTArray.h" @@ -59,11 +58,8 @@ void DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) { - // First, prepare for conditional caching according to isolation mode - int32_t isolationState = mozilla::Preferences::GetInt("privacy.thirdparty.isolate"); - // Now, check to see if we consider the data to be "too large" - if (aDataLen > kLargeDatasetSize && isolationState == 0) { + if (aDataLen > kLargeDatasetSize) { // if so, cache it to disk instead of memory if ( NS_SUCCEEDED(WriteCache(aData, aDataLen)) ) return;