[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 32a569444f76a384c677c4fec9f7f2485ab6b695
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 16:46:46 2009 +0000

    2009-10-15  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: remove timer-related logs from the previously
            submitted test.
    
            * inspector/console-tests-expected.txt:
            * inspector/console-tests.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49631 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 75300b2..574bd20 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,13 @@
 2009-10-15  Pavel Feldman  <pfeldman at chromium.org>
 
+        Not reviewed: remove timer-related logs from the previously
+        submitted test.
+
+        * inspector/console-tests-expected.txt:
+        * inspector/console-tests.html:
+
+2009-10-15  Pavel Feldman  <pfeldman at chromium.org>
+
         Reviewed by Timothy Hatcher.
 
         Web Inspector: Enable inspector layout tests.
diff --git a/LayoutTests/inspector/console-tests-expected.txt b/LayoutTests/inspector/console-tests-expected.txt
old mode 100755
new mode 100644
index d88da99..39490a8
--- a/LayoutTests/inspector/console-tests-expected.txt
+++ b/LayoutTests/inspector/console-tests-expected.txt
@@ -11,9 +11,9 @@ CONSOLE MESSAGE: line 17: repeated
 CONSOLE MESSAGE: line 17: repeated
 CONSOLE MESSAGE: line 17: repeated
 CONSOLE MESSAGE: line 17: repeated
-CONSOLE MESSAGE: line 24: 1
-CONSOLE MESSAGE: line 25: [object HTMLDocument]
-CONSOLE MESSAGE: line 26: [object HTMLHtmlElement]
+CONSOLE MESSAGE: line 22: 1
+CONSOLE MESSAGE: line 23: [object HTMLDocument]
+CONSOLE MESSAGE: line 24: [object HTMLHtmlElement]
 Tests that console logging dumps proper messages.
 
 console-tests.html:8log console-message console-js-source console-log-level
@@ -29,8 +29,7 @@ console-tests.html:19count: 1 console-message console-js-source console-log-leve
 console-tests.html:19count: 2 console-message console-js-source console-log-level
 console-tests.html:20group console-message console-js-source console-log-level console-group-title
 console-message console-js-source console-log-level
-console-tests.html:23timer: 0ms console-message console-js-source console-log-level
-console-tests.html:241 2 3 console-message console-js-source console-log-level
-console-tests.html:25HTMLDocument console-message console-js-source console-log-level
-console-tests.html:26 console-message console-js-source console-log-level
+console-tests.html:221 2 3 console-message console-js-source console-log-level
+console-tests.html:23HTMLDocument console-message console-js-source console-log-level
+console-tests.html:24 console-message console-js-source console-log-level
 
diff --git a/LayoutTests/inspector/console-tests.html b/LayoutTests/inspector/console-tests.html
index 76ff82a..72d24ac 100755
--- a/LayoutTests/inspector/console-tests.html
+++ b/LayoutTests/inspector/console-tests.html
@@ -19,8 +19,6 @@ function doit()
         console.count('count');
     console.group('group');
     console.groupEnd();
-    console.time('timer');
-    console.timeEnd('timer');
     console.log('1', '2', '3');
     console.dir(document);
     console.dirxml(document.documentElement);

-- 
WebKit Debian packaging