Revert 148069 and 148060 to see if they were responsible for a perf regression

Source/WebCore/loader/cache/CachedRawResource.cpp

 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #include "config.h"
 #include "CachedRawResource.h"
 
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
 #include "CachedResourceLoader.h"
 #include "ResourceBuffer.h"
-#include "ResourceLoader.h"
+#include "SubresourceLoader.h"
 #include "WebCoreMemoryInstrumentation.h"
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
 CachedRawResource::CachedRawResource(ResourceRequest& resourceRequest, Type type)
     : CachedResource(resourceRequest, type)
     , m_identifier(0)
 {
 }
@@ skipping 181 matching lines @@
     }
 
     for (size_t i = 0; i < m_redirectChain.size(); i++) {
         if (m_redirectChain[i].m_redirectResponse.cacheControlContainsNoStore())
             return false;
     }
 
     return true;
 }
 
+SubresourceLoader* CachedRawResource::loader() const
+{
+    return m_loader.get();
+}
+
 void CachedRawResource::clear()
 {
     m_data.clear();
     setEncodedSize(0);
     if (m_loader)
         m_loader->clearResourceData();
 }
 
 void CachedRawResource::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResourceRaw);
     CachedResource::reportMemoryUsage(memoryObjectInfo);
 }
 
 
 } // namespace WebCore