[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 18:10:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f2690f439b6a9ab5ba298e3b4da833980f3da873
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 8 11:28:55 2010 +0000
2010-12-08 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: remove groupLevel counter from console messages
https://bugs.webkit.org/show_bug.cgi?id=50672
* inspector/console-tests-expected.txt:
2010-12-08 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: remove groupLevel counter from console messages
https://bugs.webkit.org/show_bug.cgi?id=50672
* inspector/ConsoleMessage.cpp:
(WebCore::ConsoleMessage::ConsoleMessage):
(WebCore::ConsoleMessage::addToFrontend):
(WebCore::ConsoleMessage::isEqual):
* inspector/ConsoleMessage.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::addMessageToConsole):
(WebCore::InspectorController::clearConsoleMessages):
(WebCore::InspectorController::startGroup):
(WebCore::InspectorController::endGroup):
* inspector/InspectorController.h:
* inspector/front-end/ConsoleView.js:
(WebInspector.ConsoleView.createFilterElement):
(WebInspector.ConsoleView):
(WebInspector.ConsoleView.prototype.filter):
(WebInspector.ConsoleView.prototype.afterShow):
(WebInspector.ConsoleView.prototype.addMessage):
(WebInspector.ConsoleView.prototype.updateMessageRepeatCount):
(WebInspector.ConsoleView.prototype.clearMessages):
(WebInspector.ConsoleMessage):
(WebInspector.ConsoleMessage.createTextMessage):
(WebInspector.ConsoleMessage.prototype.toMessageElement):
(WebInspector.ConsoleMessage.prototype._addMessageHeader):
(WebInspector.ConsoleMessage.prototype._updateRepeatCount):
(WebInspector.ConsoleMessage.prototype.toString):
(WebInspector.ConsoleMessage.prototype.isEqual):
(WebInspector.ConsoleGroup):
* inspector/front-end/Resource.js:
(WebInspector.Resource.prototype._checkWarning):
* inspector/front-end/SourceFrame.js:
(WebInspector.SourceFrame.prototype._addMessageToSource):
* inspector/front-end/inspector.js:
(WebInspector.addConsoleMessage):
(WebInspector.log.logMessage):
(WebInspector.log):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73504 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 30248be..3f5665b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-08 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: remove groupLevel counter from console messages
+ https://bugs.webkit.org/show_bug.cgi?id=50672
+
+ * inspector/console-tests-expected.txt:
+
2010-12-08 Csaba Osztrogonác <ossy at webkit.org>
Unreviewed. Add new tests introduced in r73484 to the Skipped list,
diff --git a/LayoutTests/inspector/console-tests-expected.txt b/LayoutTests/inspector/console-tests-expected.txt
index d2f087d..fa6ebf4 100644
--- a/LayoutTests/inspector/console-tests-expected.txt
+++ b/LayoutTests/inspector/console-tests-expected.txt
@@ -21,26 +21,26 @@ CONSOLE MESSAGE: line 30: 1,2,3
CONSOLE MESSAGE: line 31: /regexp.*/
Tests that console logging dumps proper messages.
-console-tests.html:9log console-message console-js-source console-log-level
-console-tests.html:10debug console-message console-js-source console-log-level
-console-tests.html:11info console-message console-js-source console-log-level
-console-tests.html:12warn console-message console-js-source console-warning-level
-console-tests.html:13error console-message console-js-source console-error-level
-5console-tests.html:15repeated console-message console-js-source console-log-level repeated-message
-console-tests.html:17count: 1 console-message console-js-source console-log-level
-console-tests.html:17count: 2 console-message console-js-source console-log-level
-console-tests.html:18group console-message console-js-source console-log-level console-group-title
- console-message console-js-source console-log-level
-console-tests.html:201 2 3 console-message console-js-source console-log-level
-console-tests.html:21groupCollapsed console-message console-js-source console-log-level console-group-title
-console-tests.html:22Object console-message console-js-source console-log-level
-console-tests.html:2342 console-message console-js-source console-log-level
-console-tests.html:24true console-message console-js-source console-log-level
-console-tests.html:25null console-message console-js-source console-log-level
-console-tests.html:26undefined console-message console-js-source console-log-level
-console-tests.html:27Document console-message console-js-source console-log-level
-console-tests.html:28function () { } console-message console-js-source console-log-level
-console-tests.html:29function f() { } console-message console-js-source console-log-level
-console-tests.html:30[1, 2, 3] console-message console-js-source console-log-level
-console-tests.html:31/regexp.*/ console-message console-js-source console-log-level
+console-tests.html:9log console-message console-log-level
+console-tests.html:10debug console-message console-log-level
+console-tests.html:11info console-message console-log-level
+console-tests.html:12warn console-message console-warning-level
+console-tests.html:13error console-message console-error-level
+5console-tests.html:15repeated console-message console-log-level repeated-message
+console-tests.html:17count: 1 console-message console-log-level
+console-tests.html:17count: 2 console-message console-log-level
+console-tests.html:18group console-message console-log-level console-group-title
+ console-message console-log-level
+console-tests.html:201 2 3 console-message console-log-level
+console-tests.html:21groupCollapsed console-message console-log-level console-group-title
+console-tests.html:22Object console-message console-log-level
+console-tests.html:2342 console-message console-log-level
+console-tests.html:24true console-message console-log-level
+console-tests.html:25null console-message console-log-level
+console-tests.html:26undefined console-message console-log-level
+console-tests.html:27Document console-message console-log-level
+console-tests.html:28function () { } console-message console-log-level
+console-tests.html:29function f() { } console-message console-log-level
+console-tests.html:30[1, 2, 3] console-message console-log-level
+console-tests.html:31/regexp.*/ console-message console-log-level
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d3a38af..69a1062 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,47 @@
+2010-12-08 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: remove groupLevel counter from console messages
+ https://bugs.webkit.org/show_bug.cgi?id=50672
+
+ * inspector/ConsoleMessage.cpp:
+ (WebCore::ConsoleMessage::ConsoleMessage):
+ (WebCore::ConsoleMessage::addToFrontend):
+ (WebCore::ConsoleMessage::isEqual):
+ * inspector/ConsoleMessage.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::addMessageToConsole):
+ (WebCore::InspectorController::clearConsoleMessages):
+ (WebCore::InspectorController::startGroup):
+ (WebCore::InspectorController::endGroup):
+ * inspector/InspectorController.h:
+ * inspector/front-end/ConsoleView.js:
+ (WebInspector.ConsoleView.createFilterElement):
+ (WebInspector.ConsoleView):
+ (WebInspector.ConsoleView.prototype.filter):
+ (WebInspector.ConsoleView.prototype.afterShow):
+ (WebInspector.ConsoleView.prototype.addMessage):
+ (WebInspector.ConsoleView.prototype.updateMessageRepeatCount):
+ (WebInspector.ConsoleView.prototype.clearMessages):
+ (WebInspector.ConsoleMessage):
+ (WebInspector.ConsoleMessage.createTextMessage):
+ (WebInspector.ConsoleMessage.prototype.toMessageElement):
+ (WebInspector.ConsoleMessage.prototype._addMessageHeader):
+ (WebInspector.ConsoleMessage.prototype._updateRepeatCount):
+ (WebInspector.ConsoleMessage.prototype.toString):
+ (WebInspector.ConsoleMessage.prototype.isEqual):
+ (WebInspector.ConsoleGroup):
+ * inspector/front-end/Resource.js:
+ (WebInspector.Resource.prototype._checkWarning):
+ * inspector/front-end/SourceFrame.js:
+ (WebInspector.SourceFrame.prototype._addMessageToSource):
+ * inspector/front-end/inspector.js:
+ (WebInspector.addConsoleMessage):
+ (WebInspector.log.logMessage):
+ (WebInspector.log):
+
2010-12-07 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/inspector/ConsoleMessage.cpp b/WebCore/inspector/ConsoleMessage.cpp
index f1534df..5812aa4 100644
--- a/WebCore/inspector/ConsoleMessage.cpp
+++ b/WebCore/inspector/ConsoleMessage.cpp
@@ -43,26 +43,24 @@
namespace WebCore {
-ConsoleMessage::ConsoleMessage(MessageSource s, MessageType t, MessageLevel l, const String& m, unsigned li, const String& u, unsigned g)
+ConsoleMessage::ConsoleMessage(MessageSource s, MessageType t, MessageLevel l, const String& m, unsigned li, const String& u)
: m_source(s)
, m_type(t)
, m_level(l)
, m_message(m)
, m_line(li)
, m_url(u)
- , m_groupLevel(g)
, m_repeatCount(1)
{
}
-ConsoleMessage::ConsoleMessage(MessageSource s, MessageType t, MessageLevel l, const String& m, PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack> callStack, unsigned g)
+ConsoleMessage::ConsoleMessage(MessageSource s, MessageType t, MessageLevel l, const String& m, PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack> callStack)
: m_source(s)
, m_type(t)
, m_level(l)
, m_message(m)
, m_arguments(arguments)
, m_callStack(callStack)
- , m_groupLevel(g)
, m_repeatCount(1)
{
const ScriptCallFrame& lastCaller = m_callStack->at(0);
@@ -83,7 +81,6 @@ void ConsoleMessage::addToFrontend(InspectorFrontend* frontend, InjectedScriptHo
jsonObj->setNumber("level", static_cast<int>(m_level));
jsonObj->setNumber("line", static_cast<int>(m_line));
jsonObj->setString("url", m_url);
- jsonObj->setNumber("groupLevel", static_cast<int>(m_groupLevel));
jsonObj->setNumber("repeatCount", static_cast<int>(m_repeatCount));
jsonObj->setString("message", m_message);
if (m_arguments && m_arguments->argumentCount()) {
@@ -130,8 +127,7 @@ bool ConsoleMessage::isEqual(ConsoleMessage* msg) const
&& msg->m_level == m_level
&& msg->m_message == m_message
&& msg->m_line == m_line
- && msg->m_url == m_url
- && msg->m_groupLevel == m_groupLevel;
+ && msg->m_url == m_url;
}
} // namespace WebCore
diff --git a/WebCore/inspector/ConsoleMessage.h b/WebCore/inspector/ConsoleMessage.h
index 351c584..a6d9a18 100644
--- a/WebCore/inspector/ConsoleMessage.h
+++ b/WebCore/inspector/ConsoleMessage.h
@@ -48,8 +48,8 @@ class ScriptValue;
class ConsoleMessage : public Noncopyable {
public:
- ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& m, unsigned li, const String& u, unsigned g);
- ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& m, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>, unsigned g);
+ ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& m, unsigned li, const String& u);
+ ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& m, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
void addToFrontend(InspectorFrontend*, InjectedScriptHost*);
void updateRepeatCountInConsole(InspectorFrontend* frontend);
@@ -68,7 +68,6 @@ private:
RefPtr<ScriptCallStack> m_callStack;
unsigned m_line;
String m_url;
- unsigned m_groupLevel;
unsigned m_repeatCount;
};
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 7ef4725..6eaf89e 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -145,7 +145,6 @@ InspectorController::InspectorController(Page* page, InspectorClient* client)
, m_cssAgent(new InspectorCSSAgent())
, m_mainResourceIdentifier(0)
, m_expiredConsoleMessageCount(0)
- , m_groupLevel(0)
, m_previousMessage(0)
, m_settingsLoaded(false)
, m_inspectorBackend(InspectorBackend::create(this))
@@ -333,7 +332,7 @@ void InspectorController::addMessageToConsole(MessageSource source, MessageType
if (!enabled())
return;
- addConsoleMessage(new ConsoleMessage(source, type, level, message, arguments, callStack, m_groupLevel));
+ addConsoleMessage(new ConsoleMessage(source, type, level, message, arguments, callStack));
}
void InspectorController::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)
@@ -341,7 +340,7 @@ void InspectorController::addMessageToConsole(MessageSource source, MessageType
if (!enabled())
return;
- addConsoleMessage(new ConsoleMessage(source, type, level, message, lineNumber, sourceID, m_groupLevel));
+ addConsoleMessage(new ConsoleMessage(source, type, level, message, lineNumber, sourceID));
}
void InspectorController::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage)
@@ -371,7 +370,6 @@ void InspectorController::clearConsoleMessages()
m_consoleMessages.clear();
m_expiredConsoleMessageCount = 0;
m_previousMessage = 0;
- m_groupLevel = 0;
m_injectedScriptHost->releaseWrapperObjectGroup(0 /* release the group in all scripts */, "console");
if (m_domAgent)
m_domAgent->releaseDanglingNodes();
@@ -381,19 +379,12 @@ void InspectorController::clearConsoleMessages()
void InspectorController::startGroup(PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack> callStack, bool collapsed)
{
- ++m_groupLevel;
-
- addConsoleMessage(new ConsoleMessage(JSMessageSource, collapsed ? StartGroupCollapsedMessageType : StartGroupMessageType, LogMessageLevel, "", arguments, callStack, m_groupLevel));
+ addConsoleMessage(new ConsoleMessage(JSMessageSource, collapsed ? StartGroupCollapsedMessageType : StartGroupMessageType, LogMessageLevel, "", arguments, callStack));
}
void InspectorController::endGroup(MessageSource source, unsigned lineNumber, const String& sourceURL)
{
- if (!m_groupLevel)
- return;
-
- --m_groupLevel;
-
- addConsoleMessage(new ConsoleMessage(source, EndGroupMessageType, LogMessageLevel, String(), lineNumber, sourceURL, m_groupLevel));
+ addConsoleMessage(new ConsoleMessage(source, EndGroupMessageType, LogMessageLevel, String(), lineNumber, sourceURL));
}
void InspectorController::markTimeline(const String& message)
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index e57c089..0865a3a 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -370,7 +370,6 @@ private:
#endif
String m_showAfterVisible;
RefPtr<Node> m_highlightedNode;
- unsigned m_groupLevel;
ConsoleMessage* m_previousMessage;
bool m_settingsLoaded;
RefPtr<InspectorBackend> m_inspectorBackend;
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index 6cf3aec..09ce793 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -7,13 +7,13 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * documentation and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -50,9 +50,8 @@ WebInspector.ConsoleView = function(drawer)
this.prompt = new WebInspector.TextPrompt(this.promptElement, this.completions.bind(this), ExpressionStopCharacters + ".");
this.prompt.history = WebInspector.settings.consoleHistory;
- this.topGroup = new WebInspector.ConsoleGroup(null, 0);
+ this.topGroup = new WebInspector.ConsoleGroup(null);
this.messagesElement.insertBefore(this.topGroup.element, this.promptElement);
- this.groupLevel = 0;
this.currentGroup = this.topGroup;
this.toggleConsoleButton = document.getElementById("console-status-bar-item");
@@ -72,7 +71,7 @@ WebInspector.ConsoleView = function(drawer)
function createFilterElement(category) {
var categoryElement = document.createElement("li");
categoryElement.category = category;
- categoryElement.addStyleClass(categoryElement.category);
+ categoryElement.addStyleClass(categoryElement.category);
categoryElement.addEventListener("click", updateFilterHandler, false);
var label = category.toString();
@@ -81,7 +80,7 @@ WebInspector.ConsoleView = function(drawer)
this.filterBarElement.appendChild(categoryElement);
return categoryElement;
}
-
+
this.allElement = createFilterElement.call(this, WebInspector.UIString("All"));
createDividerElement.call(this);
this.errorElement = createFilterElement.call(this, WebInspector.UIString("Errors"));
@@ -92,7 +91,7 @@ WebInspector.ConsoleView = function(drawer)
this._registerShortcuts();
this.messagesElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), true);
-
+
this._customFormatters = {
"object": this._formatobject,
"array": this._formatarray,
@@ -113,7 +112,7 @@ WebInspector.ConsoleView.prototype = {
this.filter(e.target, selectMultiple);
},
-
+
filter: function(target, selectMultiple)
{
function unselectAll()
@@ -122,13 +121,13 @@ WebInspector.ConsoleView.prototype = {
this.errorElement.removeStyleClass("selected");
this.warningElement.removeStyleClass("selected");
this.logElement.removeStyleClass("selected");
-
+
this.messagesElement.removeStyleClass("filter-all");
this.messagesElement.removeStyleClass("filter-errors");
this.messagesElement.removeStyleClass("filter-warnings");
this.messagesElement.removeStyleClass("filter-logs");
}
-
+
var targetFilterClass = "filter-" + target.category.toLowerCase();
if (target.category == "All") {
@@ -145,18 +144,18 @@ WebInspector.ConsoleView.prototype = {
this.messagesElement.removeStyleClass("filter-all");
}
}
-
+
if (!selectMultiple) {
// If multiple selection is off, we want to unselect everything else
// and just select ourselves.
unselectAll.call(this);
-
+
target.addStyleClass("selected");
this.messagesElement.addStyleClass(targetFilterClass);
-
+
return;
}
-
+
if (target.hasStyleClass("selected")) {
// If selectMultiple is turned on, and we were selected, we just
// want to unselect ourselves.
@@ -169,7 +168,7 @@ WebInspector.ConsoleView.prototype = {
this.messagesElement.addStyleClass(targetFilterClass);
}
},
-
+
_toggleConsoleButtonClicked: function()
{
this.drawer.visibleView = this;
@@ -192,7 +191,7 @@ WebInspector.ConsoleView.prototype = {
afterShow: function()
{
- WebInspector.currentFocusElement = this.promptElement;
+ WebInspector.currentFocusElement = this.promptElement;
},
hide: function()
@@ -230,17 +229,12 @@ WebInspector.ConsoleView.prototype = {
this.messages.push(msg);
if (msg.type === WebInspector.ConsoleMessage.MessageType.EndGroup) {
- if (this.groupLevel < 1)
- return;
-
- this.groupLevel--;
-
- this.currentGroup = this.currentGroup.parentGroup;
+ var parentGroup = this.currentGroup.parentGroup
+ if (parentGroup)
+ this.currentGroup = parentGroup;
} else {
if (msg.type === WebInspector.ConsoleMessage.MessageType.StartGroup || msg.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed) {
- this.groupLevel++;
-
- var group = new WebInspector.ConsoleGroup(this.currentGroup, this.groupLevel);
+ var group = new WebInspector.ConsoleGroup(this.currentGroup);
this.currentGroup.messagesElement.appendChild(group.element);
this.currentGroup = group;
}
@@ -255,7 +249,7 @@ WebInspector.ConsoleView.prototype = {
{
var msg = this.previousMessage;
var prevRepeatCount = msg.totalRepeatCount;
-
+
if (!this.commandSincePreviousMessage) {
msg.repeatDelta = count - prevRepeatCount;
msg.repeatCount = msg.repeatCount + msg.repeatDelta;
@@ -263,7 +257,7 @@ WebInspector.ConsoleView.prototype = {
msg._updateRepeatCount();
this._incrementErrorWarningCount(msg);
} else {
- var msgCopy = new WebInspector.ConsoleMessage(msg.source, msg.type, msg.level, msg.line, msg.url, msg.groupLevel, count - prevRepeatCount, msg._messageText, msg._parameters, msg._stackTrace);
+ var msgCopy = new WebInspector.ConsoleMessage(msg.source, msg.type, msg.level, msg.line, msg.url, count - prevRepeatCount, msg._messageText, msg._parameters, msg._stackTrace);
msgCopy.totalRepeatCount = count;
msgCopy._formatMessage();
this.addMessage(msgCopy);
@@ -293,7 +287,6 @@ WebInspector.ConsoleView.prototype = {
this.messages = [];
- this.groupLevel = 0;
this.currentGroup = this.topGroup;
this.topGroup.messagesElement.removeChildren();
@@ -634,14 +627,13 @@ WebInspector.ConsoleView.prototype = {
WebInspector.ConsoleView.prototype.__proto__ = WebInspector.View.prototype;
-WebInspector.ConsoleMessage = function(source, type, level, line, url, groupLevel, repeatCount, message, parameters, stackTrace)
+WebInspector.ConsoleMessage = function(source, type, level, line, url, repeatCount, message, parameters, stackTrace)
{
this.source = source;
this.type = type;
this.level = level;
this.line = line;
this.url = url;
- this.groupLevel = groupLevel;
this.repeatCount = repeatCount;
this.repeatDelta = repeatCount;
this.totalRepeatCount = repeatCount;
@@ -654,7 +646,7 @@ WebInspector.ConsoleMessage = function(source, type, level, line, url, groupLeve
WebInspector.ConsoleMessage.createTextMessage = function(text, level)
{
level = level || WebInspector.ConsoleMessage.MessageLevel.Log;
- return new WebInspector.ConsoleMessage(WebInspector.ConsoleMessage.MessageSource.JS, WebInspector.ConsoleMessage.MessageType.Log, level, 0, null, null, 1, null, [text], null);
+ return new WebInspector.ConsoleMessage(WebInspector.ConsoleMessage.MessageSource.JS, WebInspector.ConsoleMessage.MessageType.Log, level, 0, null, 1, null, [text], null);
}
WebInspector.ConsoleMessage.prototype = {
@@ -790,27 +782,6 @@ WebInspector.ConsoleMessage.prototype = {
this._element = element;
- switch (this.source) {
- case WebInspector.ConsoleMessage.MessageSource.HTML:
- element.addStyleClass("console-html-source");
- break;
- case WebInspector.ConsoleMessage.MessageSource.WML:
- element.addStyleClass("console-wml-source");
- break;
- case WebInspector.ConsoleMessage.MessageSource.XML:
- element.addStyleClass("console-xml-source");
- break;
- case WebInspector.ConsoleMessage.MessageSource.JS:
- element.addStyleClass("console-js-source");
- break;
- case WebInspector.ConsoleMessage.MessageSource.CSS:
- element.addStyleClass("console-css-source");
- break;
- case WebInspector.ConsoleMessage.MessageSource.Other:
- element.addStyleClass("console-other-source");
- break;
- }
-
switch (this.level) {
case WebInspector.ConsoleMessage.MessageLevel.Tip:
element.addStyleClass("console-tip-level");
@@ -874,7 +845,7 @@ WebInspector.ConsoleMessage.prototype = {
_addMessageHeader: function(parentElement, formattedMessage)
{
if (this.url && this.url !== "undefined") {
- var urlElement = WebInspector.linkifyResourceAsNode(this.url, "scripts", this.line, "console-message-url");
+ var urlElement = WebInspector.linkifyResourceAsNode(this.url, "scripts", this.line, "console-message-url");
parentElement.appendChild(urlElement);
}
@@ -890,7 +861,7 @@ WebInspector.ConsoleMessage.prototype = {
if (!this.repeatCountElement) {
this.repeatCountElement = document.createElement("span");
this.repeatCountElement.className = "bubble";
-
+
this._element.insertBefore(this.repeatCountElement, this._element.firstChild);
this._element.addStyleClass("repeated-message");
}
@@ -947,7 +918,7 @@ WebInspector.ConsoleMessage.prototype = {
typeString = "Result";
break;
}
-
+
var levelString;
switch (this.level) {
case WebInspector.ConsoleMessage.MessageLevel.Tip:
@@ -975,14 +946,12 @@ WebInspector.ConsoleMessage.prototype = {
if (!msg)
return false;
- var ret = (this.source == msg.source)
- && (this.type == msg.type)
- && (this.level == msg.level)
- && (this.line == msg.line)
- && (this.url == msg.url)
- && (this.message == msg.message);
-
- return (disreguardGroup ? ret : (ret && (this.groupLevel == msg.groupLevel)));
+ return (this.source === msg.source)
+ && (this.type === msg.type)
+ && (this.level === msg.level)
+ && (this.line === msg.line)
+ && (this.url === msg.url)
+ && (this.message === msg.message);
}
}
@@ -1041,7 +1010,7 @@ WebInspector.ConsoleCommandResult = function(result, originatingCommand)
{
var level = (result.isError() ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log);
this.originatingCommand = originatingCommand;
- WebInspector.ConsoleMessage.call(this, WebInspector.ConsoleMessage.MessageSource.JS, WebInspector.ConsoleMessage.MessageType.Result, level, -1, null, null, 1, null, [result]);
+ WebInspector.ConsoleMessage.call(this, WebInspector.ConsoleMessage.MessageSource.JS, WebInspector.ConsoleMessage.MessageType.Result, level, -1, null, 1, null, [result]);
}
WebInspector.ConsoleCommandResult.prototype = {
@@ -1055,10 +1024,9 @@ WebInspector.ConsoleCommandResult.prototype = {
WebInspector.ConsoleCommandResult.prototype.__proto__ = WebInspector.ConsoleMessage.prototype;
-WebInspector.ConsoleGroup = function(parentGroup, level)
+WebInspector.ConsoleGroup = function(parentGroup)
{
this.parentGroup = parentGroup;
- this.level = level;
var element = document.createElement("div");
element.className = "console-group";
diff --git a/WebCore/inspector/front-end/Resource.js b/WebCore/inspector/front-end/Resource.js
index aefdd6c..d03a684 100644
--- a/WebCore/inspector/front-end/Resource.js
+++ b/WebCore/inspector/front-end/Resource.js
@@ -608,7 +608,6 @@ WebInspector.Resource.prototype = {
WebInspector.ConsoleMessage.MessageLevel.Warning,
-1,
this.url,
- null,
1,
String.sprintf(WebInspector.Warnings.IncorrectMIMEType.message, WebInspector.Resource.Type.toUIString(this.type), this.mimeType),
null,
diff --git a/WebCore/inspector/front-end/SourceFrame.js b/WebCore/inspector/front-end/SourceFrame.js
index 1e0244f..8f101e2 100644
--- a/WebCore/inspector/front-end/SourceFrame.js
+++ b/WebCore/inspector/front-end/SourceFrame.js
@@ -377,7 +377,7 @@ WebInspector.SourceFrame.prototype = {
}
for (var i = 0; i < rowMessages.length; ++i) {
- if (rowMessages[i].isEqual(msg, true)) {
+ if (rowMessages[i].isEqual(msg)) {
this._incrementMessageRepeatCount(rowMessages[i], msg.repeatDelta);
return;
}
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 3279d95..008010d 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1383,7 +1383,6 @@ WebInspector.addConsoleMessage = function(payload)
payload.level,
payload.line,
payload.url,
- payload.groupLevel,
payload.repeatCount,
payload.message,
payload.parameters,
@@ -1453,7 +1452,6 @@ WebInspector.log = function(message, messageLevel)
messageLevel || WebInspector.ConsoleMessage.MessageLevel.Debug,
-1,
null,
- null,
repeatCount,
null,
[message],
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list