[tor-commits] [tor-browser/tor-browser-31.4.0esr-4.5-1] Revert "Bug #9701: Prevent ClipBoardCache from writing to disk."

[brade at torproject.org]

commit ba4eca38fdad352c564719ff49aaa8c87e8a8ded
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Mon Jan 19 16:01:11 2015 -0500

    Revert "Bug #9701: Prevent ClipBoardCache from writing to disk."
    
    This reverts commit ba34a65a5e33473cb6f53b06542a3ce087c26115.
    An improved fix is forthcoming.
---
 widget/xpwidgets/nsTransferable.cpp |    2 --
 1 file changed, 2 deletions(-)

diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp
index e6af15e..094836b 100644
--- a/widget/xpwidgets/nsTransferable.cpp
+++ b/widget/xpwidgets/nsTransferable.cpp
@@ -58,7 +58,6 @@ DataStruct::~DataStruct()
 void
 DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen )
 {
-#if 0  // Remove unnecessary disk caching to accommodate https://www.torproject.org/projects/torbrowser/design/#disk-avoidance
   // Now, check to see if we consider the data to be "too large"
   if (aDataLen > kLargeDatasetSize) {
     // if so, cache it to disk instead of memory
@@ -67,7 +66,6 @@ DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen )
     else
 			NS_WARNING("Oh no, couldn't write data to the cache file");   
   } 
-#endif  // #if 0
 
   mData    = aData;
   mDataLen = aDataLen;