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

rniwa at webkit.org rniwa at webkit.org
Wed Dec 22 12:19:29 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit eba26a0a9f2faf9b8226fafde30c5183a7d36c7a
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 19 07:45:48 2010 +0000

    2010-08-19  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Tony Chang.
    
            REGRESSION(r64303): dumpAsMarkup doesn't print the output without layoutTestController
            https://bugs.webkit.org/show_bug.cgi?id=44225
    
            Have notifyDone append Markup._container to document.body even if window.layoutTestController is undefined.
    
            * resources/dump-as-markup.js:
            (Markup.notifyDone):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65657 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 757fc82..1235143 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-19  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Tony Chang.
+
+        REGRESSION(r64303): dumpAsMarkup doesn't print the output without layoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=44225
+
+        Have notifyDone append Markup._container to document.body even if window.layoutTestController is undefined.
+
+        * resources/dump-as-markup.js:
+        (Markup.notifyDone):
+
 2010-08-18  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Mark Rowe.
diff --git a/LayoutTests/resources/dump-as-markup.js b/LayoutTests/resources/dump-as-markup.js
index ded8176..eafcc80 100644
--- a/LayoutTests/resources/dump-as-markup.js
+++ b/LayoutTests/resources/dump-as-markup.js
@@ -106,10 +106,10 @@ Markup.notifyDone = function()
     // In non-layout test mode, append the results in a pre so that we don't
     // clobber the test itself. But when in layout test mode, we don't want
     // side effects from the test to be included in the results.
-    if (window.layoutTestController) {
+    if (window.layoutTestController)
         document.body.innerHTML = '';
-        document.body.appendChild(Markup._container);
-    }
+
+    document.body.appendChild(Markup._container);
 
     if (window.layoutTestController)
         layoutTestController.notifyDone();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list