[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 6fe375bdf2f8f9c155c81f6e48d957e4f0bb0faf
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 02:46:26 2010 +0000

    Rubber-stamped by Anders Carlsson.
    
    Keep this test’s behavior the same after r55203.
    
    * fast/dom/script-tests/prototype-inheritance-2.js: Explicitly set the inner document’s body
    display property to “none”. Before r55203, this happened as a side effect of parsing the
    <frameset> tag.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55212 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5ebf207..44ac7a9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,15 @@
 2010-02-24  Dan Bernstein  <mitz at apple.com>
 
+        Rubber-stamped by Anders Carlsson.
+
+        Keep this test’s behavior the same after r55203.
+
+        * fast/dom/script-tests/prototype-inheritance-2.js: Explicitly set the inner document’s body
+        display property to “none”. Before r55203, this happened as a side effect of parsing the
+        <frameset> tag.
+
+2010-02-24  Dan Bernstein  <mitz at apple.com>
+
         Reviewed by Anders Carlsson.
 
         <rdar://problem/7018611> innerHTML applies meta/link/title tags from a detached html element
diff --git a/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js b/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
index 5d6fddb..60776ee 100644
--- a/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
+++ b/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
@@ -205,6 +205,7 @@ styleContents += "@-webkit-keyframes fade { 0% { opacity: 0; } }\n"; // a WebKit
 htmlToAdd += "<style id='dummyStyle'>" + styleContents + "</style>";
 htmlToAdd += "<span id='styledSpan' style='clip: rect(0, 0, 1, 1); content: counter(dummy, square);'></span>";
 
+inner.document.body.style.display = "none";
 inner.document.body.innerHTML = htmlToAdd;
 
 var crawlStartPaths = [

-- 
WebKit Debian packaging