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

Side by Side Diff: Source/WebCore/inspector/front-end/ConsoleMessage.js

Issue 9008007: Merge 102898 - Web Inspector: [Regression] Network manager fails to show resource type and MIME t... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 9 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
4 * Copyright (C) 2009 Joseph Pecoraro 4 * Copyright (C) 2009 Joseph Pecoraro
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 var urlElement = this._linkifyCallFrame(this._stackTrace[0]); 132 var urlElement = this._linkifyCallFrame(this._stackTrace[0]);
133 this._formattedMessage.appendChild(urlElement); 133 this._formattedMessage.appendChild(urlElement);
134 } else if (this.url && this.url !== "undefined") { 134 } else if (this.url && this.url !== "undefined") {
135 var urlElement = this._linkifyLocation(this.url, this.line, 0); 135 var urlElement = this._linkifyLocation(this.url, this.line, 0);
136 this._formattedMessage.appendChild(urlElement); 136 this._formattedMessage.appendChild(urlElement);
137 } 137 }
138 } 138 }
139 139
140 this._formattedMessage.appendChild(messageText); 140 this._formattedMessage.appendChild(messageText);
141 141
142 var dumpStackTrace = !!this._stackTrace && (this.source === WebInspector .ConsoleMessage.MessageSource.Network || this.level === WebInspector.ConsoleMess age.MessageLevel.Error || this.type === WebInspector.ConsoleMessage.MessageType. Trace); 142 var dumpStackTrace = !!this._stackTrace && this._stackTrace.length && (t his.source === WebInspector.ConsoleMessage.MessageSource.Network || this.level = == WebInspector.ConsoleMessage.MessageLevel.Error || this.type === WebInspector. ConsoleMessage.MessageType.Trace);
143 if (dumpStackTrace) { 143 if (dumpStackTrace) {
144 var ol = document.createElement("ol"); 144 var ol = document.createElement("ol");
145 ol.className = "outline-disclosure"; 145 ol.className = "outline-disclosure";
146 var treeOutline = new TreeOutline(ol); 146 var treeOutline = new TreeOutline(ol);
147 147
148 var content = this._formattedMessage; 148 var content = this._formattedMessage;
149 var root = new TreeElement(content, null, true); 149 var root = new TreeElement(content, null, true);
150 content.treeElementForTest = root; 150 content.treeElementForTest = root;
151 treeOutline.appendChild(root); 151 treeOutline.appendChild(root);
152 if (this.type === WebInspector.ConsoleMessage.MessageType.Trace) 152 if (this.type === WebInspector.ConsoleMessage.MessageType.Trace)
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 && (this._request === msg._request); 588 && (this._request === msg._request);
589 }, 589 },
590 590
591 get stackTrace() 591 get stackTrace()
592 { 592 {
593 return this._stackTrace; 593 return this._stackTrace;
594 } 594 }
595 } 595 }
596 596
597 WebInspector.ConsoleMessageImpl.prototype.__proto__ = WebInspector.ConsoleMessag e.prototype; 597 WebInspector.ConsoleMessageImpl.prototype.__proto__ = WebInspector.ConsoleMessag e.prototype;
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698