<!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" />
<title>[69831] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/69831">69831</a></dd>
<dt>Author</dt> <dd>jschuh@chromium.org</dd>
<dt>Date</dt> <dd>2010-10-14 18:50:40 -0700 (Thu, 14 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-10-14  Justin Schuh  &lt;jschuh@chromium.org&gt;

        Reviewed by James Robinson.

        Crash in HTMLTextFormControlElement::selection()
        https://bugs.webkit.org/show_bug.cgi?id=47522

        Patch by Ryosuke Niwa  &lt;rniwa@webkit.org&gt;

        The bug was caused by our triggering layout inside RenderTextControl::selection.
        Fixed it by changing the return type of RenderTextControl::selection to PassRefPtr&lt;Range&gt; from VisibleSelection.

        Test: fast/forms/render-text-crash.html

        * editing/Editor.cpp:
        (WebCore::Editor::selectionForCommand): Calls HTMLTextFormControlElement::selection.
        * html/HTMLFormControlElement.cpp:
        (WebCore::HTMLTextFormControlElement::selection): Calls RenderTextControl::selection.
        * html/HTMLFormControlElement.h:
        * rendering/RenderTextControl.cpp:
        (WebCore::RenderTextControl::selection): Changed the return type.
        * rendering/RenderTextControl.h:
2010-10-14  Justin Schuh  &lt;jschuh@chromium.org&gt;

        Reviewed by James Robinson.

        Crash in HTMLTextFormControlElement::selection()
        https://bugs.webkit.org/show_bug.cgi?id=47522

        Patch by Ryosuke Niwa  &lt;rniwa@webkit.org&gt;

        Added a test to ensure WebKit does not crash when moving selection between input elements.

        * fast/forms/render-text-crash-expected.txt: Added.
        * fast/forms/render-text-crash.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreeditingEditorcpp">trunk/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkWebCorehtmlHTMLFormControlElementcpp">trunk/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkWebCorehtmlHTMLFormControlElementh">trunk/WebCore/html/HTMLFormControlElement.h</a></li>
<li><a href="#trunkWebCorerenderingRenderTextControlcpp">trunk/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderTextControlh">trunk/WebCore/rendering/RenderTextControl.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsrendertextcrashexpectedtxt">trunk/LayoutTests/fast/forms/render-text-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsrendertextcrashhtml">trunk/LayoutTests/fast/forms/render-text-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (69830 => 69831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-10-15 01:10:48 UTC (rev 69830)
+++ trunk/LayoutTests/ChangeLog        2010-10-15 01:50:40 UTC (rev 69831)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2010-10-14  Justin Schuh  &lt;jschuh@chromium.org&gt;
+
+        Reviewed by James Robinson.
+
+        Crash in HTMLTextFormControlElement::selection()
+        https://bugs.webkit.org/show_bug.cgi?id=47522
+
+        Patch by Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        Added a test to ensure WebKit does not crash when moving selection between input elements.
+
+        * fast/forms/render-text-crash-expected.txt: Added.
+        * fast/forms/render-text-crash.html: Added.
+
</ins><span class="cx"> 2010-10-14  James Robinson  &lt;jamesr@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Simon Fraser.
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsrendertextcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/render-text-crash-expected.txt (0 => 69831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/render-text-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/forms/render-text-crash-expected.txt        2010-10-15 01:50:40 UTC (rev 69831)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+To run this test manually, press arrow keys three times. WebKit should not crash. On DRT, you see see PASS:
+
+ PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsrendertextcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/render-text-crash.html (0 => 69831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/render-text-crash.html                                (rev 0)
+++ trunk/LayoutTests/fast/forms/render-text-crash.html        2010-10-15 01:50:40 UTC (rev 69831)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;p&gt;To run this test manually, press arrow keys three times. WebKit should not crash. On DRT, you see see PASS:&lt;/p&gt;
+&lt;input type=&quot;text&quot; onkeydown=&quot;move(this.nextSibling)&quot;
+&gt;&lt;input type=&quot;text&quot; onkeydown=&quot;move(this.nextSibling)&quot;
+&gt;&lt;input type=&quot;text&quot; onkeydown=&quot;move(this.nextSibling)&quot;
+&gt;&lt;input type=&quot;text&quot; onkeydown=&quot;move(this.nextSibling)&quot;
+&gt;&lt;input type=&quot;text&quot; onkeydown=&quot;move(this.nextSibling)&quot;
+&gt;&lt;input type=&quot;text&quot; onkeydown=&quot;move(this.nextSibling)&quot;&gt;
+&lt;script type=&quot;text/javascript&quot;&gt;
+
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+var activeInput = null;
+
+function move(newInput)
+{
+    newInput.className = '';
+    newInput.style.dispaly = '';
+    newInput.focus();
+    if (activeInput)
+        activeInput.style.display = 'none';
+    activeInput = newInput;
+}
+
+var inputs = document.getElementsByTagName('input');
+move(inputs[0]);
+
+if (window.eventSender) {
+    layoutTestController.waitUntilDone();
+    for (var i = 0; i &lt; inputs.length - 1; i++)
+        eventSender.keyDown('downArrow', []);
+    layoutTestController.notifyDone();
+}
+
+document.body.appendChild(document.createTextNode('PASS'));
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (69830 => 69831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-10-15 01:10:48 UTC (rev 69830)
+++ trunk/WebCore/ChangeLog        2010-10-15 01:50:40 UTC (rev 69831)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2010-10-14  Justin Schuh  &lt;jschuh@chromium.org&gt;
+
+        Reviewed by James Robinson.
+
+        Crash in HTMLTextFormControlElement::selection()
+        https://bugs.webkit.org/show_bug.cgi?id=47522
+
+        Patch by Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        The bug was caused by our triggering layout inside RenderTextControl::selection.
+        Fixed it by changing the return type of RenderTextControl::selection to PassRefPtr&lt;Range&gt; from VisibleSelection.
+
+        Test: fast/forms/render-text-crash.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::selectionForCommand): Calls HTMLTextFormControlElement::selection.
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLTextFormControlElement::selection): Calls RenderTextControl::selection.
+        * html/HTMLFormControlElement.h:
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::selection): Changed the return type.
+        * rendering/RenderTextControl.h:
+
</ins><span class="cx"> 2010-10-14  James Robinson  &lt;jamesr@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Simon Fraser.
</span></span></pre></div>
<a id="trunkWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/editing/Editor.cpp (69830 => 69831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/editing/Editor.cpp        2010-10-15 01:10:48 UTC (rev 69830)
+++ trunk/WebCore/editing/Editor.cpp        2010-10-15 01:50:40 UTC (rev 69831)
</span><span class="lines">@@ -95,10 +95,14 @@
</span><span class="cx">     Node* target = event-&gt;target()-&gt;toNode();
</span><span class="cx">     Node* selectionStart = selection.start().node();
</span><span class="cx">     if (target &amp;&amp; (!selectionStart || target-&gt;shadowAncestorNode() != selectionStart-&gt;shadowAncestorNode())) {
</span><ins>+        RefPtr&lt;Range&gt; range;
</ins><span class="cx">         if (target-&gt;hasTagName(inputTag) &amp;&amp; static_cast&lt;HTMLInputElement*&gt;(target)-&gt;isTextField())
</span><del>-            return static_cast&lt;HTMLInputElement*&gt;(target)-&gt;selection();
-        if (target-&gt;hasTagName(textareaTag))
-            return static_cast&lt;HTMLTextAreaElement*&gt;(target)-&gt;selection();
</del><ins>+            range = static_cast&lt;HTMLInputElement*&gt;(target)-&gt;selection();
+        else if (target-&gt;hasTagName(textareaTag))
+            range = static_cast&lt;HTMLTextAreaElement*&gt;(target)-&gt;selection();
+
+        if (range)
+            return VisibleSelection(range.get());
</ins><span class="cx">     }
</span><span class="cx">     return selection;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLFormControlElement.cpp (69830 => 69831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLFormControlElement.cpp        2010-10-15 01:10:48 UTC (rev 69830)
+++ trunk/WebCore/html/HTMLFormControlElement.cpp        2010-10-15 01:50:40 UTC (rev 69831)
</span><span class="lines">@@ -592,10 +592,10 @@
</span><span class="cx">     return toRenderTextControl(renderer())-&gt;selectionEnd();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VisibleSelection HTMLTextFormControlElement::selection() const
</del><ins>+PassRefPtr&lt;Range&gt; HTMLTextFormControlElement::selection() const
</ins><span class="cx"> {
</span><span class="cx">     if (!renderer() || !isTextFormControl() || cachedSelectionStart() &lt; 0 || cachedSelectionEnd() &lt; 0)
</span><del>-        return VisibleSelection();
</del><ins>+        return 0;
</ins><span class="cx">     return toRenderTextControl(renderer())-&gt;selection(cachedSelectionStart(), cachedSelectionEnd());
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLFormControlElementh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLFormControlElement.h (69830 => 69831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLFormControlElement.h        2010-10-15 01:10:48 UTC (rev 69830)
+++ trunk/WebCore/html/HTMLFormControlElement.h        2010-10-15 01:50:40 UTC (rev 69831)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">     void setSelectionEnd(int);
</span><span class="cx">     void select();
</span><span class="cx">     void setSelectionRange(int start, int end);
</span><del>-    VisibleSelection selection() const;
</del><ins>+    PassRefPtr&lt;Range&gt; selection() const;
</ins><span class="cx"> 
</span><span class="cx"> protected:
</span><span class="cx">     HTMLTextFormControlElement(const QualifiedName&amp;, Document*, HTMLFormElement*);
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderTextControl.cpp (69830 => 69831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderTextControl.cpp        2010-10-15 01:10:48 UTC (rev 69830)
+++ trunk/WebCore/rendering/RenderTextControl.cpp        2010-10-15 01:50:40 UTC (rev 69831)
</span><span class="lines">@@ -262,10 +262,12 @@
</span><span class="cx">         frame-&gt;selection()-&gt;setSelection(newSelection);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VisibleSelection RenderTextControl::selection(int start, int end) const
</del><ins>+PassRefPtr&lt;Range&gt; RenderTextControl::selection(int start, int end) const
</ins><span class="cx"> {
</span><del>-    return VisibleSelection(VisiblePosition(m_innerText.get(), start, VP_DEFAULT_AFFINITY),
-                            VisiblePosition(m_innerText.get(), end, VP_DEFAULT_AFFINITY));
</del><ins>+    if (!m_innerText)
+        return 0;
+
+    return Range::create(document(), m_innerText, start, m_innerText, end);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> VisiblePosition RenderTextControl::visiblePositionForIndex(int index)
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderTextControlh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderTextControl.h (69830 => 69831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderTextControl.h        2010-10-15 01:10:48 UTC (rev 69830)
+++ trunk/WebCore/rendering/RenderTextControl.h        2010-10-15 01:50:40 UTC (rev 69831)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">     void setSelectionEnd(int);
</span><span class="cx">     void select();
</span><span class="cx">     void setSelectionRange(int start, int end);
</span><del>-    VisibleSelection selection(int start, int end) const;
</del><ins>+    PassRefPtr&lt;Range&gt; selection(int start, int end) const;
</ins><span class="cx"> 
</span><span class="cx">     virtual void subtreeHasChanged();
</span><span class="cx">     String text();
</span></span></pre>
</div>
</div>

</body>
</html>