[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 12:08:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ee86c824a9d7393212802df7936ec91c0c33f1ad
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 12:16:15 2010 +0000
2010-08-16 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Joseph Pecoraro.
Web Inspector: [REGRESSION] console's clear command does not work.
https://bugs.webkit.org/show_bug.cgi?id=44027
* inspector/console-clear.html:
* inspector/console-command-clear-expected.txt: Added.
* inspector/console-command-clear.html: Copied from LayoutTests/inspector/console-clear.html.
2010-08-16 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Joseph Pecoraro.
Web Inspector: [REGRESSION] console's clear command does not work.
https://bugs.webkit.org/show_bug.cgi?id=44027
Test: inspector/console-command-clear.html
* inspector/Inspector.idl:
* inspector/InspectorBackend.cpp:
* inspector/InspectorBackend.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::clearConsoleMessages):
* inspector/front-end/ConsoleView.js:
(WebInspector.ConsoleView.prototype.requestClearMessages):
* inspector/front-end/inspector.js:
(WebInspector.consoleMessagesCleared):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65412 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 96988bd..93e2e43 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-16 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Joseph Pecoraro.
+
+ Web Inspector: [REGRESSION] console's clear command does not work.
+ https://bugs.webkit.org/show_bug.cgi?id=44027
+
+ * inspector/console-clear.html:
+ * inspector/console-command-clear-expected.txt: Added.
+ * inspector/console-command-clear.html: Copied from LayoutTests/inspector/console-clear.html.
+
2010-08-16 MORITA Hajime <morrita at google.com>
Unreviewed; test expectations fix for Chromium.
diff --git a/LayoutTests/inspector/console-command-clear-expected.txt b/LayoutTests/inspector/console-command-clear-expected.txt
new file mode 100644
index 0000000..848e8c2
--- /dev/null
+++ b/LayoutTests/inspector/console-command-clear-expected.txt
@@ -0,0 +1,11 @@
+CONSOLE MESSAGE: line 9: one
+CONSOLE MESSAGE: line 10: two
+CONSOLE MESSAGE: line 11: three
+Tests that console is cleared upon clear() eval in console.
+
+=== Before clear ===
+console-command-clear.html:9one
+console-command-clear.html:10two
+console-command-clear.html:11three
+=== After clear ===
+
diff --git a/LayoutTests/inspector/console-command-clear.html b/LayoutTests/inspector/console-command-clear.html
new file mode 100644
index 0000000..9cb2f5c
--- /dev/null
+++ b/LayoutTests/inspector/console-command-clear.html
@@ -0,0 +1,32 @@
+<html>
+<head>
+<script src="../http/tests/inspector/inspector-test.js"></script>
+<script src="../http/tests/inspector/console-tests.js"></script>
+<script>
+
+function doit()
+{
+ console.log("one");
+ console.log("two");
+ console.log("three");
+
+ output("=== Before clear ===");
+ dumpConsoleMessages(true);
+ function callback()
+ {
+ output("=== After clear ===");
+ dumpConsoleMessages();
+ }
+ evaluateInWebInspector("InjectedScriptAccess.getDefault().evaluate('clear()', '', function() {})", callback);
+}
+
+</script>
+</head>
+
+<body onload="onload()">
+<p>
+Tests that console is cleared upon clear() eval in console.
+</p>
+
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1d96228..bb51d41 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-08-16 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Joseph Pecoraro.
+
+ Web Inspector: [REGRESSION] console's clear command does not work.
+ https://bugs.webkit.org/show_bug.cgi?id=44027
+
+ Test: inspector/console-command-clear.html
+
+ * inspector/Inspector.idl:
+ * inspector/InspectorBackend.cpp:
+ * inspector/InspectorBackend.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::clearConsoleMessages):
+ * inspector/front-end/ConsoleView.js:
+ (WebInspector.ConsoleView.prototype.requestClearMessages):
+ * inspector/front-end/inspector.js:
+ (WebInspector.consoleMessagesCleared):
+
2010-08-16 Jeremy Orlow <jorlow at chromium.org>
Ugh, the #if ENABLE() was supposed to be added to Settings not GroupSettings.
diff --git a/WebCore/inspector/Inspector.idl b/WebCore/inspector/Inspector.idl
index d73d374..1c66b59 100644
--- a/WebCore/inspector/Inspector.idl
+++ b/WebCore/inspector/Inspector.idl
@@ -67,6 +67,7 @@ module core {
[notify] void updateConsoleMessageRepeatCount(out unsigned long count);
[notify] void updateFocusedNode(out long nodeId);
[notify] void updateResource(out Value resource);
+ [notify] void consoleMessagesCleared();
#if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER
[notify] void addProfileHeader(out Object header);
@@ -176,8 +177,7 @@ module core {
[handler=DOM] void searchCanceled();
[handler=DOM] void pushNodeByPathToFrontend(in long callId, in String path, out long nodeId);
- [handler=Backend] void clearConsoleMessages(in long callId);
-
+ [handler=Controller] void clearConsoleMessages();
[handler=Controller] void highlightDOMNode(in long nodeId);
[handler=Controller] void hideDOMNodeHighlight();
[handler=Controller] void openInInspectedWindow(in String url);
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index 0a18e1c..f0ed94b 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -106,11 +106,6 @@ void InspectorBackend::dispatchOnInjectedScript(long injectedScriptId, const Str
injectedScript.dispatch(methodName, arguments, result, hadException);
}
-void InspectorBackend::clearConsoleMessages()
-{
- m_inspectorController->clearConsoleMessages();
-}
-
void InspectorBackend::releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup)
{
m_inspectorController->injectedScriptHost()->releaseWrapperObjectGroup(injectedScriptId, objectGroup);
diff --git a/WebCore/inspector/InspectorBackend.h b/WebCore/inspector/InspectorBackend.h
index 63c4a09..27a93eb 100644
--- a/WebCore/inspector/InspectorBackend.h
+++ b/WebCore/inspector/InspectorBackend.h
@@ -67,7 +67,6 @@ public:
void setInjectedScriptSource(const String& source);
void dispatchOnInjectedScript(long injectedScriptId, const String& methodName, const String& arguments, RefPtr<InspectorValue>* result, bool* hadException);
- void clearConsoleMessages();
// Generic code called from custom implementations.
void releaseWrapperObjectGroup(long injectedScriptId, const String& objectGroup);
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index eb92b33..d1c5070 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -361,6 +361,8 @@ void InspectorController::clearConsoleMessages()
m_injectedScriptHost->releaseWrapperObjectGroup(0 /* release the group in all scripts */, "console");
if (m_domAgent)
m_domAgent->releaseDanglingNodes();
+ if (m_remoteFrontend)
+ m_remoteFrontend->consoleMessagesCleared();
}
void InspectorController::startGroup(MessageSource source, ScriptCallStack* callStack, bool collapsed)
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index 155f441..1f59897 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -296,7 +296,7 @@ WebInspector.ConsoleView.prototype = {
requestClearMessages: function()
{
- InspectorBackend.clearConsoleMessages(WebInspector.Callback.wrap(this.clearMessages.bind(this)));
+ InspectorBackend.clearConsoleMessages();
},
clearMessages: function()
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index cf5eda3..42e1355 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -1109,6 +1109,11 @@ WebInspector.selectDatabase = function(o)
WebInspector.panels.storage.selectDatabase(o);
}
+WebInspector.consoleMessagesCleared = function()
+{
+ WebInspector.console.clearMessages();
+}
+
WebInspector.selectDOMStorage = function(o)
{
WebInspector.showPanel("storage");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list