1 files changed, 9 insertions, 7 deletions
diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp
index f66aa67..3bc1119 100644
--- a/WebCore/loader/ResourceLoader.cpp
+++ b/WebCore/loader/ResourceLoader.cpp
@@ -35,6 +35,8 @@
 #include "FileStreamProxy.h"
 #include "Frame.h"
 #include "FrameLoader.h"
+#include "FrameLoaderClient.h"
+#include "InspectorController.h"
 #include "InspectorTimelineAgent.h"
 #include "Page.h"
 #include "ProgressTracker.h"
@@ -145,7 +147,7 @@ bool ResourceLoader::load(const ResourceRequest& r)
         return true;
     }
     
-    m_handle = ResourceHandle::create(clientRequest, this, m_frame.get(), m_defersLoading, m_shouldContentSniff);
+    m_handle = ResourceHandle::create(m_frame->loader()->networkingContext(), clientRequest, this, m_defersLoading, m_shouldContentSniff);
 
     return true;
 }
@@ -286,7 +288,7 @@ void ResourceLoader::willStopBufferingData(const char* data, int length)
     m_resourceData = SharedBuffer::create(data, length);
 }
 
-void ResourceLoader::didFinishLoading()
+void ResourceLoader::didFinishLoading(double finishTime)
 {
     // If load has been cancelled after finishing (which could happen with a 
     // JavaScript that changes the window location), do nothing.
@@ -294,11 +296,11 @@ void ResourceLoader::didFinishLoading()
         return;
     ASSERT(!m_reachedTerminalState);
 
-    didFinishLoadingOnePart();
+    didFinishLoadingOnePart(finishTime);
     releaseResources();
 }
 
-void ResourceLoader::didFinishLoadingOnePart()
+void ResourceLoader::didFinishLoadingOnePart(double finishTime)
 {
     if (m_cancelled)
         return;
@@ -308,7 +310,7 @@ void ResourceLoader::didFinishLoadingOnePart()
         return;
     m_calledDidFinishLoad = true;
     if (m_sendResourceLoadCallbacks)
-        frameLoader()->notifier()->didFinishLoad(this);
+        frameLoader()->notifier()->didFinishLoad(this, finishTime);
 }
 
 void ResourceLoader::didFail(const ResourceError& error)
@@ -450,9 +452,9 @@ void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, int lengt
 #endif
 }
 
-void ResourceLoader::didFinishLoading(ResourceHandle*)
+void ResourceLoader::didFinishLoading(ResourceHandle*, double finishTime)
 {
-    didFinishLoading();
+    didFinishLoading(finishTime);
 }
 
 void ResourceLoader::didFail(ResourceHandle*, const ResourceError& error)