Merge 102898 - Web Inspector: [Regression] Network manager fails to show resource type and MIME t...

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 119 matching lines @@
 
         resource.connectionReused = response.connectionReused;
         resource.connectionId = response.connectionId;
 
         if (response.fromDiskCache)
             resource.cached = true;
         else
             resource.timing = response.timing;
 
         if (!this._mimeTypeIsConsistentWithType(resource)) {
-            WebInspector.console.addMessage(WebInspector.ConsoleMessage.create(WebInspector.ConsoleMessage.MessageSource.Other,
+            WebInspector.console.addMessage(WebInspector.ConsoleMessage.create(WebInspector.ConsoleMessage.MessageSource.Network,
                 WebInspector.ConsoleMessage.MessageLevel.Warning,
-                WebInspector.UIString("Resource interpreted as %s but transferred with MIME type %s.", WebInspector.Resource.Type.toUIString(this.type), this.mimeType),
+                WebInspector.UIString("Resource interpreted as %s but transferred with MIME type %s: \"%s\".", WebInspector.Resource.Type.toUIString(resource.type), resource.mimeType, resource.url),
                 WebInspector.ConsoleMessage.MessageType.Log,
-                this.url));
+                "",
+                0,
+                1,
+                [],
+                null,
+                resource));
         }
     },
 
     _mimeTypeIsConsistentWithType: function(resource)
     {
         // If status is an error, content is likely to be of an inconsistent type,
         // as it's going to be an error message. We do not want to emit a warning
         // for this, though, as this will already be reported as resource loading failure.
         // Also, if a URL like http://localhost/wiki/load.php?debug=true&lang=en produces text/css and gets reloaded,
         // it is 304 Not Modified and its guessed mime-type is text/php, which is wrong.
@@ skipping 228 matching lines @@
         resource.initiator = initiator;
         resource.stackTrace = stackTrace;
         return resource;
     }
 }
 
 /**
  * @type {?WebInspector.NetworkManager}
  */
 WebInspector.networkManager = null;