Merge WebKit at r73109: Initial merge by git.

Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8

1 files changed, 9 insertions, 7 deletions

diff --git a/WebCore/inspector/InspectorResourceAgent.cpp b/WebCore/inspector/InspectorResourceAgent.cpp
index fcdebbc..9dab24a 100644
--- a/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/WebCore/inspector/InspectorResourceAgent.cpp
@@ -193,11 +193,13 @@ static PassRefPtr<InspectorObject> buildObjectForResourceResponse(const Resource
     responseObject->setBoolean("wasCached", response.wasCached());
     if (response.resourceLoadTiming())
         responseObject->setObject("timing", buildObjectForTiming(*response.resourceLoadTiming()));
-    if (response.resourceRawHeaders()) {
-        RefPtr<InspectorObject> rawHeadersObject = InspectorObject::create();
-        rawHeadersObject->setObject("requestHeaders", buildObjectForHeaders(response.resourceRawHeaders()->requestHeaders));
-        rawHeadersObject->setObject("responseHeaders", buildObjectForHeaders(response.resourceRawHeaders()->responseHeaders));
-        responseObject->setObject("rawHeaders", rawHeadersObject);
+    if (response.resourceLoadInfo()) {
+        RefPtr<InspectorObject> loadInfoObject = InspectorObject::create();
+        loadInfoObject->setNumber("httpStatusCode", response.resourceLoadInfo()->httpStatusCode);
+        loadInfoObject->setString("httpStatusText", response.resourceLoadInfo()->httpStatusText);
+        loadInfoObject->setObject("requestHeaders", buildObjectForHeaders(response.resourceLoadInfo()->requestHeaders));
+        loadInfoObject->setObject("responseHeaders", buildObjectForHeaders(response.resourceLoadInfo()->responseHeaders));
+        responseObject->setObject("loadInfo", loadInfoObject);
     }
     return responseObject;
 }
@@ -342,9 +344,9 @@ void InspectorResourceAgent::didLoadResourceFromMemoryCache(DocumentLoader* load
     m_frontend->didLoadResourceFromMemoryCache(currentTime(), buildObjectForCachedResource(loader, *resource));
 }
 
-void InspectorResourceAgent::setOverrideContent(unsigned long identifier, const String& sourceString, const String& type)
+void InspectorResourceAgent::setInitialContent(unsigned long identifier, const String& sourceString, const String& type)
 {
-    m_frontend->setOverrideContent(identifier, sourceString, type);
+    m_frontend->setInitialContent(identifier, sourceString, type);
 }
 
 static PassRefPtr<InspectorObject> buildObjectForFrame(Frame* frame)