Diff
Modified: trunk/LayoutTests/ChangeLog (98455 => 98456)
--- trunk/LayoutTests/ChangeLog 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/LayoutTests/ChangeLog 2011-10-26 09:25:39 UTC (rev 98456)
@@ -1,3 +1,12 @@
+2011-10-26 Pavel Feldman <pfeld...@google.com>
+
+ Web Inspector: order console message parameters for better optional parameters handling.
+ https://bugs.webkit.org/show_bug.cgi?id=70809
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/console/console-preserve-log.html:
+
2011-10-26 Ryosuke Niwa <rn...@webkit.org>
Fix rebaseline done in r98439.
Modified: trunk/LayoutTests/inspector/console/console-preserve-log.html (98455 => 98456)
--- trunk/LayoutTests/inspector/console/console-preserve-log.html 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/LayoutTests/inspector/console/console-preserve-log.html 2011-10-26 09:25:39 UTC (rev 98456)
@@ -5,7 +5,7 @@
<script>
function test()
{
- WebInspector.console.addMessage(WebInspector.ConsoleMessage.createTextMessage("PASS"));
+ WebInspector.console.addMessage(WebInspector.ConsoleMessage.create(WebInspector.ConsoleMessage.MessageSource.Other, WebInspector.ConsoleMessage.MessageLevel, "PASS"));
WebInspector.settings.preserveConsoleLog.set(true);
InspectorTest.reloadPage(function() {
InspectorTest.dumpConsoleMessages();
Modified: trunk/Source/WebCore/ChangeLog (98455 => 98456)
--- trunk/Source/WebCore/ChangeLog 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/Source/WebCore/ChangeLog 2011-10-26 09:25:39 UTC (rev 98456)
@@ -1,3 +1,29 @@
+2011-10-26 Pavel Feldman <pfeld...@google.com>
+
+ Web Inspector: order console message parameters for better optional parameters handling.
+ https://bugs.webkit.org/show_bug.cgi?id=70809
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/Inspector.json:
+ * inspector/front-end/ConsoleMessage.js:
+ (WebInspector.ConsoleMessageImpl):
+ (WebInspector.ConsoleMessageImpl.prototype._formatMessage):
+ * inspector/front-end/ConsoleModel.js:
+ (WebInspector.ConsoleModel.prototype._messageRepeatCountUpdated):
+ (WebInspector.ConsoleMessage.create):
+ (WebInspector.ConsoleDispatcher.prototype.messageAdded):
+ * inspector/front-end/ConsoleView.js:
+ (WebInspector.ConsoleCommandResult):
+ (WebInspector.ConsoleMessage.create):
+ * inspector/front-end/ExtensionServer.js:
+ (WebInspector.ExtensionServer.prototype._onAddConsoleMessage):
+ * inspector/front-end/NetworkManager.js:
+ (WebInspector.NetworkDispatcher.prototype._updateResourceWithResponse):
+ * inspector/front-end/inspector.js:
+ (WebInspector.log.logMessage):
+ (WebInspector.log):
+
2011-10-26 Vsevolod Vlasov <vse...@chromium.org>
Web Inspector: Debugger fails when there is an invalid watch _expression_.
Modified: trunk/Source/WebCore/inspector/Inspector.json (98455 => 98456)
--- trunk/Source/WebCore/inspector/Inspector.json 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/Source/WebCore/inspector/Inspector.json 2011-10-26 09:25:39 UTC (rev 98456)
@@ -417,9 +417,9 @@
{ "name": "url", "type": "string", "optional": true, "description": "URL of the message origin." },
{ "name": "line", "type": "integer", "optional": true, "description": "Line number in the resource that generated this message." },
{ "name": "repeatCount", "type": "integer", "optional": true, "description": "Repeat count for repeated messages." },
- { "name": "networkRequestId", "$ref": "Network.RequestId", "optional": true, "description": "Identifier of the network request associated with this message." },
{ "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Message parameters in case of the formatted message." },
- { "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "_javascript_ stack trace for assertions and error messages." }
+ { "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "_javascript_ stack trace for assertions and error messages." },
+ { "name": "networkRequestId", "$ref": "Network.RequestId", "optional": true, "description": "Identifier of the network request associated with this message." }
]
},
{
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js (98455 => 98456)
--- trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js 2011-10-26 09:25:39 UTC (rev 98456)
@@ -31,21 +31,30 @@
/**
* @constructor
* @extends {WebInspector.ConsoleMessage}
+ *
+ * @param {string} source
+ * @param {string} level
+ * @param {string} message
* @param {WebInspector.DebuggerPresentationModel.Linkifier} linkifier
+ * @param {string=} type
+ * @param {string=} url
+ * @param {number=} line
+ * @param {number=} repeatCount
* @param {Array.<RuntimeAgent.RemoteObject>=} parameters
* @param {ConsoleAgent.StackTrace=} stackTrace
* @param {WebInspector.Resource=} request
*/
-WebInspector.ConsoleMessageImpl = function(source, type, level, line, url, repeatCount, message, linkifier, parameters, stackTrace, request)
+WebInspector.ConsoleMessageImpl = function(source, level, message, linkifier, type, url, line, repeatCount, parameters, stackTrace, request)
{
WebInspector.ConsoleMessage.call();
this._linkifier = linkifier;
this.source = source;
- this.type = type;
+ this.type = type || WebInspector.ConsoleMessage.MessageType.Log;
this.level = level;
- this.line = line;
- this.url = ""
+ this.line = line || -1;
+ this.url = "" || null;
+ repeatCount = repeatCount || 1;
this.repeatCount = repeatCount;
this.repeatDelta = repeatCount;
this.totalRepeatCount = repeatCount;
@@ -129,9 +138,11 @@
messageText.appendChild(fragment);
}
} else {
- var isExternal = !WebInspector.resourceForURL(this.url);
- var anchor = WebInspector.linkifyURLAsNode(this.url, this.url, "console-message-url", isExternal);
- this._formattedMessage.appendChild(anchor);
+ if (this.url) {
+ var isExternal = !WebInspector.resourceForURL(this.url);
+ var anchor = WebInspector.linkifyURLAsNode(this.url, this.url, "console-message-url", isExternal);
+ this._formattedMessage.appendChild(anchor);
+ }
messageText = this._format([this._messageText]);
}
} else {
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleModel.js (98455 => 98456)
--- trunk/Source/WebCore/inspector/front-end/ConsoleModel.js 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleModel.js 2011-10-26 09:25:39 UTC (rev 98456)
@@ -121,7 +121,7 @@
this._incrementErrorWarningCount(msg);
this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.RepeatCountUpdated, msg);
} else {
- var msgCopy = WebInspector.ConsoleMessage.create(msg.source, msg.type, msg.level, msg.line, msg.url, count - prevRepeatCount, msg._messageText, msg._parameters, msg._stackTrace, msg._request);
+ var msgCopy = WebInspector.ConsoleMessage.create(msg.source, msg.level, msg._messageText, msg.type, msg.url, msg.line, count - prevRepeatCount, msg._parameters, msg._stackTrace, msg._request);
msgCopy.totalRepeatCount = count;
this.addMessage(msgCopy);
}
@@ -162,31 +162,22 @@
/**
* @param {string} source
- * @param {string} type
* @param {string} level
- * @param {number} line
- * @param {string} url
- * @param {number} repeatCount
* @param {string} message
+ * @param {string=} type
+ * @param {string=} url
+ * @param {number=} line
+ * @param {number=} repeatCount
* @param {Array.<RuntimeAgent.RemoteObject>=} parameters
* @param {ConsoleAgent.StackTrace=} stackTrace
* @param {WebInspector.Resource=} request
*
* @return {WebInspector.ConsoleMessage}
*/
-WebInspector.ConsoleMessage.create = function(source, type, level, line, url, repeatCount, message, parameters, stackTrace, request)
+WebInspector.ConsoleMessage.create = function(source, level, message, type, url, line, repeatCount, parameters, stackTrace, request)
{
}
-/**
- * @param {string} text
- * @param {string} level
- * @return {WebInspector.ConsoleMessage}
- */
-WebInspector.ConsoleMessage.createTextMessage = function(text, level)
-{
-}
-
// Note: Keep these constants in sync with the ones in Console.h
WebInspector.ConsoleMessage.MessageSource = {
HTML: "html",
@@ -236,12 +227,12 @@
{
var consoleMessage = WebInspector.ConsoleMessage.create(
payload.source,
- payload.type,
payload.level,
- payload.line,
+ payload.text,
+ payload.type,
payload.url,
+ payload.line,
payload.repeatCount,
- payload.text,
payload.parameters,
payload.stackTrace,
payload.networkRequestId ? WebInspector.networkResourceById(payload.networkRequestId) : undefined);
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleView.js (98455 => 98456)
--- trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2011-10-26 09:25:39 UTC (rev 98456)
@@ -704,12 +704,13 @@
/**
* @extends {WebInspector.ConsoleMessageImpl}
* @constructor
+ * @param {WebInspector.DebuggerPresentationModel.Linkifier} linkifier
*/
WebInspector.ConsoleCommandResult = function(result, wasThrown, originatingCommand, linkifier)
{
var level = (wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log);
this.originatingCommand = originatingCommand;
- WebInspector.ConsoleMessageImpl.call(this, WebInspector.ConsoleMessage.MessageSource.JS, WebInspector.ConsoleMessage.MessageType.Result, level, -1, null, 1, null, linkifier, [result]);
+ WebInspector.ConsoleMessageImpl.call(this, WebInspector.ConsoleMessage.MessageSource.JS, level, "", linkifier, WebInspector.ConsoleMessage.MessageType.Result, undefined, undefined, undefined, [result]);
}
WebInspector.ConsoleCommandResult.prototype = {
@@ -788,13 +789,7 @@
*/
WebInspector.consoleView = null;
-WebInspector.ConsoleMessage.create = function(source, type, level, line, url, repeatCount, message, parameters, stackTrace, request)
+WebInspector.ConsoleMessage.create = function(source, level, message, type, url, line, repeatCount, parameters, stackTrace, request)
{
- return new WebInspector.ConsoleMessageImpl(source, type, level, line, url, repeatCount, message, WebInspector.consoleView._linkifier, parameters, stackTrace, request);
+ return new WebInspector.ConsoleMessageImpl(source, level, message, WebInspector.consoleView._linkifier, type, url, line, repeatCount, parameters, stackTrace, request);
}
-
-WebInspector.ConsoleMessage.createTextMessage = function(text, level)
-{
- level = level || WebInspector.ConsoleMessage.MessageLevel.Log;
- return new WebInspector.ConsoleMessageImpl(WebInspector.ConsoleMessage.MessageSource.ConsoleAPI, WebInspector.ConsoleMessage.MessageType.Log, level, 0, null, 1, null, WebInspector.consoleView._linkifier, [text], null);
-}
Modified: trunk/Source/WebCore/inspector/front-end/ExtensionServer.js (98455 => 98456)
--- trunk/Source/WebCore/inspector/front-end/ExtensionServer.js 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/Source/WebCore/inspector/front-end/ExtensionServer.js 2011-10-26 09:25:39 UTC (rev 98456)
@@ -339,12 +339,12 @@
var consoleMessage = WebInspector.ConsoleMessage.create(
WebInspector.ConsoleMessage.MessageSource.JS,
+ level,
+ message.text,
WebInspector.ConsoleMessage.MessageType.Log,
- level,
+ message.url,
message.line,
- message.url,
1,
- message.text,
null, // parameters
null, // stackTrace
null); // networkRequestId
Modified: trunk/Source/WebCore/inspector/front-end/NetworkManager.js (98455 => 98456)
--- trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/Source/WebCore/inspector/front-end/NetworkManager.js 2011-10-26 09:25:39 UTC (rev 98456)
@@ -128,12 +128,10 @@
if (!this._mimeTypeIsConsistentWithType(resource)) {
WebInspector.console.addMessage(WebInspector.ConsoleMessage.create(WebInspector.ConsoleMessage.MessageSource.Other,
- WebInspector.ConsoleMessage.MessageType.Log,
WebInspector.ConsoleMessage.MessageLevel.Warning,
- -1,
- this.url,
- 1,
- 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.", WebInspector.Resource.Type.toUIString(this.type), this.mimeType),
+ WebInspector.ConsoleMessage.MessageType.Log,
+ this.url));
}
},
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (98455 => 98456)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2011-10-26 09:14:26 UTC (rev 98455)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2011-10-26 09:25:39 UTC (rev 98456)
@@ -959,27 +959,11 @@
// actually log the message
function logMessage(message)
{
- var repeatCount = 1;
- if (message == WebInspector.log.lastMessage)
- repeatCount = WebInspector.log.repeatCount + 1;
-
- WebInspector.log.lastMessage = message;
- WebInspector.log.repeatCount = repeatCount;
-
- // ConsoleMessage expects a proxy object
- message = WebInspector.RemoteObject.fromPrimitiveValue(message);
-
// post the message
var msg = WebInspector.ConsoleMessage.create(
WebInspector.ConsoleMessage.MessageSource.Other,
- WebInspector.ConsoleMessage.MessageType.Log,
messageLevel || WebInspector.ConsoleMessage.MessageLevel.Debug,
- -1,
- null,
- repeatCount,
- null,
- [message],
- null);
+ message);
self.console.addMessage(msg);
if (showConsole)
