Merge 86027 - 2011-05-08 Pavel Feldman <pfeldman@chromium.org>

Source/WebCore/inspector/front-end/NetworkManager.js

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 97 matching lines @@
             resource.timing = response.timing;
     },
 
     _updateResourceWithCachedResource: function(resource, cachedResource)
     {
         resource.type = WebInspector.Resource.Type[cachedResource.type];
         resource.resourceSize = cachedResource.bodySize;
         this._updateResourceWithResponse(resource, cachedResource.response);
     },
 
+    _isNull: function(response)
+    {
+        return response && !response.status && !response.mimeType && !Object.keys(response.headers).length;
+    },
+
     requestWillBeSent: function(identifier, frameId, loaderId, documentURL, request, time, stackTrace, redirectResponse)
     {
         var resource = this._inflightResourcesById[identifier];
         if (resource) {
+            // FIXME: move this check to the backend.
+            if (this._isNull(redirectResponse))
+                return;
             this.responseReceived(identifier, time, "Other", redirectResponse);
             resource = this._appendRedirect(identifier, time, request.url);
         } else
             resource = this._createResource(identifier, frameId, loaderId, request.url, documentURL, stackTrace);
         this._updateResourceWithRequest(resource, request);
         resource.startTime = time;
 
         this._startResource(resource);
     },
 
     resourceMarkedAsCached: function(identifier)
     {
         var resource = this._inflightResourcesById[identifier];
         if (!resource)
             return;
 
         resource.cached = true;
         this._updateResource(resource);
     },
 
     responseReceived: function(identifier, time, resourceType, response)
     {
+        // FIXME: move this check to the backend.
+        if (this._isNull(response))
+            return;
+
         var resource = this._inflightResourcesById[identifier];
         if (!resource)
             return;
 
         resource.responseReceivedTime = time;
         resource.type = WebInspector.Resource.Type[resourceType];
 
         this._updateResourceWithResponse(resource, response);
 
         this._updateResource(resource);
@@ skipping 164 matching lines @@
     _createResource: function(identifier, frameId, loaderId, url, documentURL, stackTrace)
     {
         var resource = new WebInspector.Resource(identifier, url);
         resource.documentURL = documentURL;
         resource.frameId = frameId;
         resource.loaderId = loaderId;
         resource.stackTrace = stackTrace;
         return resource;
     }
 }