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

[rniwa at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 46c69a4d722599634acf973f64ad6a59d1d058a0
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 02:45:57 2010 +0000

    2010-10-21  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Kent Tamura.
    
            REGRESSION(r70283): editing/execCommand/remove-format-elements.html fails on qt, gtk, and chromium
            https://bugs.webkit.org/show_bug.cgi?id=48108
    
            Modified the test to ignore the contents of keygen element.
    
            * editing/execCommand/remove-format-elements-expected.txt:
            * editing/execCommand/remove-format-elements.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70285 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 35a962e..7d6823f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-21  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Kent Tamura.
+
+        REGRESSION(r70283): editing/execCommand/remove-format-elements.html fails on qt, gtk, and chromium
+        https://bugs.webkit.org/show_bug.cgi?id=48108
+
+        Modified the test to ignore the contents of keygen element.
+
+        * editing/execCommand/remove-format-elements-expected.txt:
+        * editing/execCommand/remove-format-elements.html:
+
 2010-10-21  Yuzo Fujishima  <yuzo at google.com>
 
         Unreviewed Chromium test expectation change.
diff --git a/LayoutTests/editing/execCommand/remove-format-elements-expected.txt b/LayoutTests/editing/execCommand/remove-format-elements-expected.txt
index 204c9d9..745fbdd 100644
--- a/LayoutTests/editing/execCommand/remove-format-elements-expected.txt
+++ b/LayoutTests/editing/execCommand/remove-format-elements-expected.txt
@@ -1,7 +1,6 @@
 Removed
 acronym, b, bdo, big, cite, code, dfn, em, font, i, ins, kbd, nobr, q, s, samp, small, strike, strong, sub, sup, tt, u, var
 Preserved
-noscript, a, abbr, address, applet, area, article, aside, audio, base, basefont, bgsound, blockquote, body, br, button, canvas, caption, center, col, colgroup, command, datagrid, datalist, dcell, dcol, dd, del, details, dir, div, dl, drow, dt, embed, fieldset, figcaption, figure, footer, form, frame, frameset, h1, h2, h3, h4, h5, h6, head, header, hgroup, hr, html, iframe, image, img, input, isindex, label, layer, legend, li, link, listing, map, mark, marquee, menu, meta, meter, nav, noembed, noframes, nolayer, noscript, object, ol, optgroup, option, p, param, plaintext, pre, progress, rp, rt, ruby, script, section, select, source, span, style, summary, table, tbody, td, textarea, tfoot, th, thead, title, tr, track, ul, video, wbr, xmp
+noscript, a, abbr, address, applet, area, article, aside, audio, base, basefont, bgsound, blockquote, body, br, button, canvas, caption, center, col, colgroup, command, datagrid, datalist, dcell, dcol, dd, del, details, dir, div, dl, drow, dt, embed, fieldset, figcaption, figure, footer, form, frame, frameset, h1, h2, h3, h4, h5, h6, head, header, hgroup, hr, html, iframe, image, img, input, isindex, keygen, label, layer, legend, li, link, listing, map, mark, marquee, menu, meta, meter, nav, noembed, noframes, nolayer, noscript, object, ol, optgroup, option, p, param, plaintext, pre, progress, rp, rt, ruby, script, section, select, source, span, style, summary, table, tbody, td, textarea, tfoot, th, thead, title, tr, track, ul, video, wbr, xmp
 Exceptions
-keygen (<keygen><option>2048 (High Grade)</option><option>1024 (Medium Grade)</option><option>512 (Low Grade)</option>hello=1;</keygen> webkit=2;)
 
diff --git a/LayoutTests/editing/execCommand/remove-format-elements.html b/LayoutTests/editing/execCommand/remove-format-elements.html
index 0f7b60d..3ce5853 100644
--- a/LayoutTests/editing/execCommand/remove-format-elements.html
+++ b/LayoutTests/editing/execCommand/remove-format-elements.html
@@ -98,7 +98,7 @@ for (var i = 0; i < elements.length; i++) {
 
     if (!test.firstChild || test.firstChild.nodeType == 3 /*TextNode*/)
         addResult(document.getElementById('removed'), elementName)
-    else if (contains(test, instance) && (instance.innerHTML == "" || instance.innerHTML == "hello=1;"))
+    else if (contains(test, instance) && (instance.innerHTML == "" || instance.innerHTML == "hello=1;" || elementName == "keygen"))
         addResult(document.getElementById('preserved'), elementName);
     else
         addResult(document.getElementById('exceptions'), elementName, test.innerHTML);

-- 
WebKit Debian packaging