Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2081)

Unified Diff: Source/devtools/blink/chromeServerProfile/Default/Cache/f_00004c

Issue 242263007: Add <label> to items in Event Listener Breakpoint of Chrome Dev Tools Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/blink/chromeServerProfile/Default/Cache/f_00004c
diff --git a/Source/devtools/front_end/NetworkManager.js b/Source/devtools/blink/chromeServerProfile/Default/Cache/f_00004c
similarity index 96%
copy from Source/devtools/front_end/NetworkManager.js
copy to Source/devtools/blink/chromeServerProfile/Default/Cache/f_00004c
index b32e82d4a05bf9b1ac201ccd28aaeb2dc4c302ac..3b883b3e9c14bc22f3a828c4ede972d8d454a755 100644
--- a/Source/devtools/front_end/NetworkManager.js
+++ b/Source/devtools/blink/chromeServerProfile/Default/Cache/f_00004c
@@ -30,12 +30,12 @@
/**
* @constructor
- * @extends {WebInspector.TargetAwareObject}
+ * @extends {WebInspector.Object}
* @param {!WebInspector.Target} target
*/
WebInspector.NetworkManager = function(target)
{
- WebInspector.TargetAwareObject.call(this, target);
+ WebInspector.Object.call(this);
this._dispatcher = new WebInspector.NetworkDispatcher(this);
this._target = target;
this._networkAgent = target.networkAgent();
@@ -96,7 +96,6 @@ WebInspector.NetworkManager._MIMETypes = {
"text/javascript1.3": {"script": true},
"text/jscript": {"script": true},
"text/livescript": {"script": true},
- "text/vtt": {"texttrack": true},
}
WebInspector.NetworkManager.prototype = {
@@ -118,7 +117,7 @@ WebInspector.NetworkManager.prototype = {
this._networkAgent.setCacheDisabled(enabled);
},
- __proto__: WebInspector.TargetAwareObject.prototype
+ __proto__: WebInspector.Object.prototype
}
/**
@@ -165,6 +164,9 @@ WebInspector.NetworkDispatcher.prototype = {
*/
_updateNetworkRequestWithResponse: function(networkRequest, response)
{
+ if (!response)
+ return;
+
if (response.url && networkRequest.url !== response.url)
networkRequest.url = response.url;
networkRequest.mimeType = response.mimeType;
@@ -220,7 +222,6 @@ WebInspector.NetworkDispatcher.prototype = {
if (typeof networkRequest.type === "undefined"
|| networkRequest.type === WebInspector.resourceTypes.Other
- || networkRequest.type === WebInspector.resourceTypes.Media
|| networkRequest.type === WebInspector.resourceTypes.XHR
|| networkRequest.type === WebInspector.resourceTypes.WebSocket)
return true;
@@ -235,6 +236,17 @@ WebInspector.NetworkDispatcher.prototype = {
},
/**
+ * @param {!NetworkAgent.Response} response
+ * @return {boolean}
+ */
+ _isNull: function(response)
+ {
+ if (!response)
+ return true;
+ return !response.status && !response.mimeType && (!response.headers || !Object.keys(response.headers).length);
+ },
+
+ /**
* @param {!NetworkAgent.RequestId} requestId
* @param {!PageAgent.FrameId} frameId
* @param {!NetworkAgent.LoaderId} loaderId
@@ -284,6 +296,10 @@ WebInspector.NetworkDispatcher.prototype = {
*/
responseReceived: function(requestId, frameId, loaderId, time, resourceType, response)
{
+ // FIXME: move this check to the backend.
+ if (this._isNull(response))
+ return;
+
var networkRequest = this._inflightRequestsById[requestId];
if (!networkRequest) {
// We missed the requestWillBeSent.
@@ -362,7 +378,7 @@ WebInspector.NetworkDispatcher.prototype = {
*/
webSocketCreated: function(requestId, requestURL)
{
- var networkRequest = new WebInspector.NetworkRequest(this._manager._target, requestId, requestURL, "", "", "");
+ var networkRequest = new WebInspector.NetworkRequest(requestId, requestURL, "", "", "");
networkRequest.type = WebInspector.resourceTypes.WebSocket;
this._startNetworkRequest(networkRequest);
},
@@ -546,7 +562,7 @@ WebInspector.NetworkDispatcher.prototype = {
*/
_createNetworkRequest: function(requestId, frameId, loaderId, url, documentURL, initiator)
{
- var networkRequest = new WebInspector.NetworkRequest(this._manager._target, requestId, url, documentURL, frameId, loaderId);
+ var networkRequest = new WebInspector.NetworkRequest(requestId, url, documentURL, frameId, loaderId);
networkRequest.initiator = initiator;
return networkRequest;
}

Powered by Google App Engine
This is Rietveld 408576698