<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20014] trunk/LayoutTests</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20014">20014</a></dd>
<dt>Author</dt> <dd>justing</dd>
<dt>Date</dt> <dd>2007-03-07 01:05:54 -0800 (Wed, 07 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by mjs
<http://bugs.webkit.org/show_bug.cgi?id=8592>
Extra line left after deleting whitespace:pre text
Re-enabled the test and removed a FIXME:
* editing/deleting/merge-whitespace-pre-expected.checksum:
* editing/deleting/merge-whitespace-pre-expected.png:
* editing/deleting/merge-whitespace-pre-expected.txt:
* editing/deleting/merge-whitespace-pre.html: Added.
* editing/deleting/merge-whitespace-pre.html-disabled: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingdeletingmergewhitespacepreexpectedchecksum">trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.checksum</a></li>
<li><a href="#trunkLayoutTestseditingdeletingmergewhitespacepreexpectedpng">trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.png</a></li>
<li><a href="#trunkLayoutTestseditingdeletingmergewhitespacepreexpectedtxt">trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.txt</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingdeletingmergewhitespaceprehtml">trunk/LayoutTests/editing/deleting/merge-whitespace-pre.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingdeletingmergewhitespaceprehtmldisabled">trunk/LayoutTests/editing/deleting/merge-whitespace-pre.html-disabled</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (20013 => 20014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2007-03-07 08:49:20 UTC (rev 20013)
+++ trunk/LayoutTests/ChangeLog 2007-03-07 09:05:54 UTC (rev 20014)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2007-03-07 Justin Garcia <justin.garcia@apple.com>
+
+ Reviewed by mjs
+
+ <http://bugs.webkit.org/show_bug.cgi?id=8592>
+ Extra line left after deleting whitespace:pre text
+
+ Re-enabled the test and removed a FIXME:
+ * editing/deleting/merge-whitespace-pre-expected.checksum:
+ * editing/deleting/merge-whitespace-pre-expected.png:
+ * editing/deleting/merge-whitespace-pre-expected.txt:
+ * editing/deleting/merge-whitespace-pre.html: Added.
+ * editing/deleting/merge-whitespace-pre.html-disabled: Removed.
+
</ins><span class="cx"> 2007-03-06 Alexey Proskuryakov <ap@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Sam Weinig.
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingmergewhitespacepreexpectedchecksum"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.checksum (20013 => 20014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.checksum 2007-03-07 08:49:20 UTC (rev 20013)
+++ trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.checksum 2007-03-07 09:05:54 UTC (rev 20014)
</span><span class="lines">@@ -1 +1 @@
</span><del>-69b5ac145e0e49f098a165c742188fb8
</del><span class="cx">\ No newline at end of file
</span><ins>+eaee268557999ac81c9cd72d01b26e86
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingmergewhitespacepreexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingmergewhitespacepreexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.txt (20013 => 20014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.txt 2007-03-07 08:49:20 UTC (rev 20013)
+++ trunk/LayoutTests/editing/deleting/merge-whitespace-pre-expected.txt 2007-03-07 09:05:54 UTC (rev 20014)
</span><span class="lines">@@ -1,27 +1,21 @@
</span><del>-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 5 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</del><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><del>- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 781x18
- text run at (0,0) width 339: "This places the caret before the 'b' in 'bar' and Delete. "
- text run at (339,0) width 442: "'foo' and 'bar' should end up on the same line with 'baz' on the second."
- RenderBlock {P} at (0,34) size 784x18
- RenderText {#text} at (0,0) size 532x18
- text run at (0,0) width 532: "This demonstrates a bug, which is that 'bar' changes size when it's merged with 'foo'."
- RenderBlock {DIV} at (0,68) size 784x18
</del><ins>+ RenderBody {BODY} at (8,8) size 784x579
+ RenderBlock {P} at (0,0) size 784x36
+ RenderText {#text} at (0,0) size 743x36
+ text run at (0,0) width 364: "This test places the caret before the 'b' in 'bar' and Delete. "
+ text run at (364,0) width 379: "Afterword, 'foobar' should be in the first paragraph and 'baz'"
+ text run at (0,18) width 152: "should be in the second."
+ RenderBlock {DIV} at (0,52) size 784x46
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 784x18
</span><span class="cx"> RenderText {#text} at (0,0) size 21x18
</span><span class="cx"> text run at (0,0) width 21: "foo"
</span><del>- RenderInline {FONT} at (0,0) size 30x18
- RenderInline {SPAN} at (0,0) size 30x18
- RenderText {#text} at (21,0) size 30x18
- text run at (21,0) width 30: "bar"
-caret: position 3 of child 0 {#text} of child 1 {DIV} of child 4 {DIV} of child 0 {BODY} of child 0 {HTML} of document
</del><ins>+ RenderInline {SPAN} at (0,0) size 24x15
+ RenderText {#text} at (21,2) size 24x15
+ text run at (21,2) width 24: "bar"
+ RenderBlock {PRE} at (0,31) size 784x15
+ RenderText {#text} at (0,0) size 24x15
+ text run at (0,0) width 24: "baz"
+caret: position 3 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
</ins></span></pre></div>
<a id="trunkLayoutTestseditingdeletingmergewhitespaceprehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/deleting/merge-whitespace-pre.html (0 => 20014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/merge-whitespace-pre.html (rev 0)
+++ trunk/LayoutTests/editing/deleting/merge-whitespace-pre.html 2007-03-07 09:05:54 UTC (rev 20014)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<p>This test places the caret before the 'b' in 'bar' and Delete. Afterword, 'foobar' should be in the first paragraph and 'baz' should be in the second.</p>
+<div contenteditable="true">
+<div>foo</div>
+<pre id="test">bar
+baz</pre>
+</div>
+
+<script>
+var s = window.getSelection();
+var e = document.getElementById("test");
+s.setPosition(e, 0);
+document.execCommand("Delete");
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestseditingdeletingmergewhitespaceprehtmldisabled"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/editing/deleting/merge-whitespace-pre.html-disabled (20013 => 20014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/merge-whitespace-pre.html-disabled 2007-03-07 08:49:20 UTC (rev 20013)
+++ trunk/LayoutTests/editing/deleting/merge-whitespace-pre.html-disabled 2007-03-07 09:05:54 UTC (rev 20014)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-<p>This test places the caret before the 'b' in 'bar' and Delete. Afterword, 'foobar' should be in the first paragraph and 'baz' should be in the second.</p>
-<p><b>This test illustrates two bugs.</b> First 'bar' changes size when it moves onto the line containing 'foo'. Second, there's an extraneous line between 'foobar' and 'baz', but only until the window is resized, when it turns into an extraneous space before 'baz'.</p>
-<div contenteditable="true">
-<div>foo</div>
-<pre id="test">bar
-baz</pre>
-</div>
-
-<script>
-var s = window.getSelection();
-var e = document.getElementById("test");
-s.setPosition(e, 0);
-document.execCommand("Delete");
-</script>
</del><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>