[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
pfeldman at chromium.org
pfeldman at chromium.org
Sun Feb 20 23:25:51 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit c5b4f94cb9ea8c5d444f27670b37e99a27e9c3a4
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 20 13:46:13 2011 +0000
2011-01-20 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: rebaselined inspector tests.
* http/tests/inspector/console-xhr-logging.html:
* inspector/report-API-errors-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76234 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b545e53..a523b6f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-20 Pavel Feldman <pfeldman at chromium.org>
+
+ Not reviewed: rebaselined inspector tests.
+
+ * http/tests/inspector/console-xhr-logging.html:
+ * inspector/report-API-errors-expected.txt:
+
2011-01-20 Jeremy Orlow <jorlow at chromium.org>
[Chromium] Update baselines and add exception.
diff --git a/LayoutTests/http/tests/inspector/console-xhr-logging.html b/LayoutTests/http/tests/inspector/console-xhr-logging.html
index 533dcf0..5b5aa7b 100755
--- a/LayoutTests/http/tests/inspector/console-xhr-logging.html
+++ b/LayoutTests/http/tests/inspector/console-xhr-logging.html
@@ -45,12 +45,12 @@ function requestHelper(method, url)
function frontend_enableXMLHttpRequestLogging(testController)
{
- InspectorBackend.setMonitoringXHREnabled(true, function(newStatus) {
- if (newStatus)
+ InspectorBackend.setMonitoringXHREnabled(true, function() {
+ if (WebInspector.console._monitoringXHREnabled)
testController.notifyDone("enabled");
});
- if (WebInspector.monitoringXHREnabled)
+ if (WebInspector.console._monitoringXHREnabled)
return "enabled";
testController.waitUntilDone();
@@ -58,12 +58,12 @@ function frontend_enableXMLHttpRequestLogging(testController)
function frontend_disableXMLHttpRequestLogging(testController)
{
- InspectorBackend.setMonitoringXHREnabled(false, function(newStatus) {
- if (!newStatus)
+ InspectorBackend.setMonitoringXHREnabled(false, function() {
+ if (!WebInspector.console._monitoringXHREnabled)
testController.notifyDone("disabled");
});
- if (!WebInspector.monitoringXHREnabled)
+ if (!WebInspector.console._monitoringXHREnabled)
return "disabled";
testController.waitUntilDone();
diff --git a/LayoutTests/inspector/report-API-errors-expected.txt b/LayoutTests/inspector/report-API-errors-expected.txt
index 263f80e..124c29e 100644
--- a/LayoutTests/inspector/report-API-errors-expected.txt
+++ b/LayoutTests/inspector/report-API-errors-expected.txt
@@ -1,7 +1,7 @@
Tests that InspectorBackendStub is catching incorrect arguments.
-Protocol Error: Invalid type of argument 'enable' for 'InspectorBackend.setMonitoringXHREnabled' call. It should be 'boolean' but it is 'number'.
-Protocol Error: Invalid number of arguments for 'InspectorBackend.setMonitoringXHREnabled' call. It should have the next arguments '{"enable":"boolean"}'.
+Protocol Error: Invalid type of argument 'enabled' for 'InspectorBackend.setMonitoringXHREnabled' call. It should be 'boolean' but it is 'number'.
+Protocol Error: Invalid number of arguments for 'InspectorBackend.setMonitoringXHREnabled' call. It should have the next arguments '{"enabled":"boolean"}'.
Protocol Error: Optional callback argument for 'InspectorBackend.setMonitoringXHREnabled' call should be a function but its type is 'string'.
Protocol Error: the message is for non-existing domain 'wrongDomain'
Protocol Error: Attempted to dispatch an unimplemented method 'Inspector.something-strange'
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list