<!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>[192007] 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/192007">192007</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2015-11-03 18:47:50 -0800 (Tue, 03 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WK1] Null dereference loading Blink layout test editing/input/text-input-controller-no-editable-no-crash.html
https://bugs.webkit.org/show_bug.cgi?id=149484
&lt;rdar://problem/22811338&gt;

Reviewed by Darin Adler.

Source/WebKit/mac:

firstRectForCharacterRange(): don't fall over in an editable-less frame.

* WebView/WebFrame.mm:
(-[WebFrame _convertToDOMRange:]):

LayoutTests:

This test is from Blink <a href="http://trac.webkit.org/projects/webkit/changeset/194870">r194870</a>:
https://codereview.chromium.org/1122593004

* editing/mac/input/text-input-controller-no-editable-no-crash-expected.txt: Added.
* editing/mac/input/text-input-controller-no-editable-no-crash.html: Added.
* platform/wk2/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwk2TestExpectations">trunk/LayoutTests/platform/wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingmacinputtextinputcontrollernoeditablenocrashexpectedtxt">trunk/LayoutTests/editing/mac/input/text-input-controller-no-editable-no-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingmacinputtextinputcontrollernoeditablenocrashhtml">trunk/LayoutTests/editing/mac/input/text-input-controller-no-editable-no-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192006 => 192007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-11-04 01:58:34 UTC (rev 192006)
+++ trunk/LayoutTests/ChangeLog        2015-11-04 02:47:50 UTC (rev 192007)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-11-03  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
+
+        [WK1] Null dereference loading Blink layout test editing/input/text-input-controller-no-editable-no-crash.html
+        https://bugs.webkit.org/show_bug.cgi?id=149484
+        &lt;rdar://problem/22811338&gt;
+
+        Reviewed by Darin Adler.
+
+        This test is from Blink r194870:
+        https://codereview.chromium.org/1122593004
+
+        * editing/mac/input/text-input-controller-no-editable-no-crash-expected.txt: Added.
+        * editing/mac/input/text-input-controller-no-editable-no-crash.html: Added.
+        * platform/wk2/TestExpectations:
+
</ins><span class="cx"> 2015-11-03  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS] Skip the touch tests
</span></span></pre></div>
<a id="trunkLayoutTestseditingmacinputtextinputcontrollernoeditablenocrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/mac/input/text-input-controller-no-editable-no-crash-expected.txt (0 => 192007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/mac/input/text-input-controller-no-editable-no-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/editing/mac/input/text-input-controller-no-editable-no-crash-expected.txt        2015-11-04 02:47:50 UTC (rev 192007)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS, WebKit didn't crash.
</ins></span></pre></div>
<a id="trunkLayoutTestseditingmacinputtextinputcontrollernoeditablenocrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/mac/input/text-input-controller-no-editable-no-crash.html (0 => 192007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/mac/input/text-input-controller-no-editable-no-crash.html                                (rev 0)
+++ trunk/LayoutTests/editing/mac/input/text-input-controller-no-editable-no-crash.html        2015-11-04 02:47:50 UTC (rev 192007)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+&lt;html&gt;
+&lt;body onload=&quot;runTest();&quot;&gt;
+&lt;script&gt;
+    if (window.testRunner)
+        testRunner.dumpAsText();
+
+    function runTest()
+    {
+        document.open();
+        if (window.textInputController)
+            textInputController.firstRectForCharacterRange(0, 0);
+        document.write(&quot;PASS, WebKit didn't crash.&quot;);
+    }
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/TestExpectations (192006 => 192007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/TestExpectations        2015-11-04 01:58:34 UTC (rev 192006)
+++ trunk/LayoutTests/platform/wk2/TestExpectations        2015-11-04 02:47:50 UTC (rev 192007)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> editing/mac/input/replace-invalid-range.html
</span><span class="cx"> editing/mac/input/secure-input.html
</span><span class="cx"> editing/mac/input/text-input-controller.html
</span><ins>+editing/mac/input/text-input-controller-no-editable-no-crash.html
</ins><span class="cx"> editing/mac/input/wrapped-line-char-rect.html
</span><span class="cx"> editing/mac/input/NSBackgroundColor-transparent.html
</span><span class="cx"> editing/mac/pasteboard/paste-and-match-style-selector-event.html
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (192006 => 192007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-11-04 01:58:34 UTC (rev 192006)
+++ trunk/Source/WebKit/mac/ChangeLog        2015-11-04 02:47:50 UTC (rev 192007)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-03  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
+
+        [WK1] Null dereference loading Blink layout test editing/input/text-input-controller-no-editable-no-crash.html
+        https://bugs.webkit.org/show_bug.cgi?id=149484
+        &lt;rdar://problem/22811338&gt;
+
+        Reviewed by Darin Adler.
+
+        firstRectForCharacterRange(): don't fall over in an editable-less frame.
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _convertToDOMRange:]):
+
</ins><span class="cx"> 2015-11-02  Andy Estes  &lt;aestes@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Add tvOS and watchOS to SUPPORTED_PLATFORMS
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (192006 => 192007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm        2015-11-04 01:58:34 UTC (rev 192006)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm        2015-11-04 02:47:50 UTC (rev 192007)
</span><span class="lines">@@ -807,7 +807,10 @@
</span><span class="cx">     // directly in the document DOM, so serialization is problematic. Our solution is
</span><span class="cx">     // to use the root editable element of the selection start as the positional base.
</span><span class="cx">     // That fits with AppKit's idea of an input context.
</span><del>-    return TextIterator::rangeFromLocationAndLength(_private-&gt;coreFrame-&gt;selection().rootEditableElementOrDocumentElement(), nsrange.location, nsrange.length);
</del><ins>+    Element* element = _private-&gt;coreFrame-&gt;selection().rootEditableElementOrDocumentElement();
+    if (!element)
+        return nil;
+    return TextIterator::rangeFromLocationAndLength(element, nsrange.location, nsrange.length);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (DOMRange *)_convertNSRangeToDOMRange:(NSRange)nsrange
</span></span></pre>
</div>
</div>

</body>
</html>