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

yurys at chromium.org yurys at chromium.org
Wed Dec 22 11:19:23 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 7ab6dad5d38c0f686a6657b015b50d04138af80e
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 15:23:43 2010 +0000

    2010-07-19  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            [chromium] inspector/console-trace.html failing on windows after r63548
            https://bugs.webkit.org/show_bug.cgi?id=42485
    
            * inspector/console-trace.html: call dumpConsoleMessages sycnhronously right after console.trace
            * platform/chromium/test_expectations.txt:
    2010-07-19  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: add/removeStyleClass shouldn't increase number of spaces between class names.
            https://bugs.webkit.org/show_bug.cgi?id=42485
    
            * inspector/front-end/utilities.js:
            (Element.prototype.removeStyleClass):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63663 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f487d3b..f557f0b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-19  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [chromium] inspector/console-trace.html failing on windows after r63548
+        https://bugs.webkit.org/show_bug.cgi?id=42485
+
+        * inspector/console-trace.html: call dumpConsoleMessages sycnhronously right after console.trace
+        * platform/chromium/test_expectations.txt:
+
 2010-07-19  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed.
diff --git a/LayoutTests/inspector/console-trace.html b/LayoutTests/inspector/console-trace.html
index 2ba843c..056df6e 100755
--- a/LayoutTests/inspector/console-trace.html
+++ b/LayoutTests/inspector/console-trace.html
@@ -12,12 +12,12 @@ function b()
 function a()
 {
     b();
+    dumpConsoleMessages();
 }
 
 function doit()
 {
     setTimeout(a, 0);
-    dumpConsoleMessages();
 }
 
 </script>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index b920b56..9c71070 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3128,6 +3128,4 @@ BUGWK20011 : printing/setPrinting.html = FAIL
 // Needs V8 change.
 BUG49343 : fast/js/reserved-words-as-property.html = TEXT
 
-BUG42485 WIN : inspector/console-trace.html = TEXT
-
 BUG42486 MAC DEBUG : svg/filters/filter-empty-g.svg = CRASH
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 255cb5d..4a92080 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Pavel Feldman.
 
+        Web Inspector: add/removeStyleClass shouldn't increase number of spaces between class names.
+        https://bugs.webkit.org/show_bug.cgi?id=42485
+
+        * inspector/front-end/utilities.js:
+        (Element.prototype.removeStyleClass):
+
+2010-07-19  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
         Web Inspector: show stack trace for uncaught exceptions when Web Inspector is open.
         https://bugs.webkit.org/show_bug.cgi?id=42560
 
diff --git a/WebCore/inspector/front-end/utilities.js b/WebCore/inspector/front-end/utilities.js
index 1312e5b..6e7c725 100644
--- a/WebCore/inspector/front-end/utilities.js
+++ b/WebCore/inspector/front-end/utilities.js
@@ -188,8 +188,9 @@ Element.prototype.removeStyleClass = function(className)
     if (index === -1)
         return;
 
-    var newClassName = " " + this.className + " ";
-    this.className = newClassName.replace(" " + className + " ", " ");
+    this.className = this.className.split(" ").filter(function(s) {
+        return s && s !== className;
+    }).join(" ");
 }
 
 Element.prototype.removeMatchingStyleClasses = function(classNameRegex)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list