Merge 138174

Source/WebCore/loader/ResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 176 matching lines @@
     if (!m_frame)
         return 0;
     return m_frame->loader();
 }
 
 void ResourceLoader::setShouldBufferData(DataBufferingPolicy shouldBufferData)
 { 
     m_options.shouldBufferData = shouldBufferData; 
 
     // Reset any already buffered data
-    if (!shouldBufferData)
+    if (shouldBufferData == DoNotBufferData)
         m_resourceData = 0;
 }
     
 
 void ResourceLoader::addData(const char* data, int length, bool allAtOnce)
 {
     if (m_options.shouldBufferData == DoNotBufferData)
         return;
 
     if (allAtOnce) {
@@ skipping 344 matching lines @@
 void ResourceLoader::setIdentifier(unsigned long identifier)
 {
     // FIXME (NetworkProcess): This is temporary to allow WebKit to directly set the identifier on a ResourceLoader.
     // More permanently we'll want the identifier to be piped through ResourceLoader::init/start so
     // it always has it, especially in willSendRequest.
     m_identifier = identifier;
 }
 #endif
 
 }