[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ce6270ca6c31866b56857621c7900634e441d1b9
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 2 12:09:07 2010 +0000

    2010-09-01  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            WebInspector: protocol related Inspector's tests are failing in Chromium.
    
            The expectation is different because Chromium tests use test_shell.
            1) a lot of console messages automaticaly published by test_shell;
            2) debugger was enabled by default;
            3) for (i in an_array) produces some garbage.
    
            The solution:
            1) override reportProtocolError and console.error functions;
            2) debugger was explicitly disabled;
            3) just fixed.
    
            https://bugs.webkit.org/show_bug.cgi?id=44996
    
            * inspector/report-API-errors.html:
            * inspector/report-protocol-errors.html:
            * LayoutTests/platform/chromium/test_expectations.txt
    
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66663 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c9b4c65..7f7a62f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-01  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        WebInspector: protocol related Inspector's tests are failing in Chromium.
+
+        The expectation is different because Chromium tests use test_shell.
+        1) a lot of console messages automaticaly published by test_shell;
+        2) debugger was enabled by default;
+        3) for (i in an_array) produces some garbage.
+
+        The solution:
+        1) override reportProtocolError and console.error functions;
+        2) debugger was explicitly disabled;
+        3) just fixed.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44996
+
+        * inspector/report-API-errors.html:
+        * inspector/report-protocol-errors.html:
+        * LayoutTests/platform/chromium/test_expectations.txt
+
 2010-09-02  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r66656.
diff --git a/LayoutTests/inspector/report-API-errors.html b/LayoutTests/inspector/report-API-errors.html
index 07d0b66..55d5579 100644
--- a/LayoutTests/inspector/report-API-errors.html
+++ b/LayoutTests/inspector/report-API-errors.html
@@ -5,14 +5,13 @@
 
 function test()
 {
-    function callback()
+
+    console.error = function()
     {
         InspectorTest.addResult(String.sprintf.apply(this, arguments));
     }
 
-    InspectorTest._addSniffer(console, "error", callback, true);
-
-    InspectorBackend.enableResourceTracking(1, callback);
+    InspectorBackend.enableResourceTracking(1);
     InspectorBackend.enableResourceTracking();
     InspectorBackend.enableResourceTracking(true, "not a function");
     WebInspector_syncDispatch('{"type": "event", "domain": "dom", "event": "something-strange", "data": {}}');
diff --git a/LayoutTests/inspector/report-protocol-errors.html b/LayoutTests/inspector/report-protocol-errors.html
index a5e7874..cd7ba5c 100644
--- a/LayoutTests/inspector/report-protocol-errors.html
+++ b/LayoutTests/inspector/report-protocol-errors.html
@@ -22,7 +22,7 @@ function test()
     ];
     var numberOfReports = 0;
 
-    function callback(message)
+    WebInspector.reportProtocolError = function(message)
     {
         if (numberOfReports < messages.length)
             InspectorTest.addObject(message);
@@ -31,9 +31,12 @@ function test()
             InspectorTest.completeTest();
     }
 
-    InspectorTest._addSniffer(WebInspector, "reportProtocolError", callback, true);
-    for (var message in messages)
-        InspectorFrontendHost.sendMessageToBackend(messages[message]);
+    function fire() {
+        for (var i = 0; i < messages.length; ++i)
+            InspectorFrontendHost.sendMessageToBackend(messages[i]);
+    }
+
+    InspectorBackend.disableDebugger(true, fire);
 }
 
 </script>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 09b66b5..4959f63 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2383,7 +2383,6 @@ BUG32675 LINUX : fast/repaint/trailing-floats-root-line-box-overflow.html = IMAG
 
 // Flaky tests found during the roll.
 BUG32679 LINUX DEBUG : http/tests/navigation/lockedhistory-iframe.html = TEXT PASS
-BUG32684 WIN : inspector/timeline-layout.html = TEXT PASS
 BUG32688 MAC DEBUG : fast/lists/inlineBoxWrapperNullCheck.html = TEXT PASS
 BUG32689 MAC LINUX DEBUG : http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html = TEXT PASS
 BUG32693 MAC DEBUG : svg/dom/SVGRectElement/rect-modify-rx.svg = TEXT PASS

-- 
WebKit Debian packaging