Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / devtools / front_end / sdk / NetworkManager.js

diff --git a/src/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js b/src/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
index 1b72701..91af058 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
@@ -199,10 +199,13 @@ WebInspector.NetworkDispatcher.prototype = {
         }
 
         networkRequest.connectionReused = response.connectionReused;
-        networkRequest.connectionId = response.connectionId;
+        networkRequest.connectionId = String(response.connectionId);
         if (response.remoteIPAddress)
             networkRequest.setRemoteAddress(response.remoteIPAddress, response.remotePort || -1);
 
+        if (response.fromServiceWorker)
+            networkRequest.fetchedViaServiceWorker = true;
+
         if (response.fromDiskCache)
             networkRequest.cached = true;
         else
@@ -382,7 +385,8 @@ WebInspector.NetworkDispatcher.prototype = {
      */
     webSocketCreated: function(requestId, requestURL)
     {
-        var networkRequest = new WebInspector.NetworkRequest(this._manager._target, requestId, requestURL, "", "", "");
+        // FIXME: WebSocket MUST have initiator info.
+        var networkRequest = new WebInspector.NetworkRequest(this._manager._target, requestId, requestURL, "", "", "", null);
         networkRequest.type = WebInspector.resourceTypes.WebSocket;
         this._startNetworkRequest(networkRequest);
     },
@@ -508,7 +512,7 @@ WebInspector.NetworkDispatcher.prototype = {
             originalNetworkRequest.redirectSource = previousRedirects[previousRedirects.length - 1];
         this._finishNetworkRequest(originalNetworkRequest, time, -1);
         var newNetworkRequest = this._createNetworkRequest(requestId, originalNetworkRequest.frameId, originalNetworkRequest.loaderId,
-             redirectURL, originalNetworkRequest.documentURL, originalNetworkRequest.initiator);
+             redirectURL, originalNetworkRequest.documentURL, originalNetworkRequest.initiator());
         newNetworkRequest.redirects = previousRedirects.concat(originalNetworkRequest);
         return newNetworkRequest;
     },
@@ -562,12 +566,10 @@ WebInspector.NetworkDispatcher.prototype = {
      * @param {!NetworkAgent.LoaderId} loaderId
      * @param {string} url
      * @param {string} documentURL
-     * @param {!NetworkAgent.Initiator} initiator
+     * @param {?NetworkAgent.Initiator} initiator
      */
     _createNetworkRequest: function(requestId, frameId, loaderId, url, documentURL, initiator)
     {
-        var networkRequest = new WebInspector.NetworkRequest(this._manager._target, requestId, url, documentURL, frameId, loaderId);
-        networkRequest.initiator = initiator;
-        return networkRequest;
+        return new WebInspector.NetworkRequest(this._manager._target, requestId, url, documentURL, frameId, loaderId, initiator);
     }
 }