<!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>[190512] trunk/Source/WebKit2</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/190512">190512</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2015-10-02 11:29:03 -0700 (Fri, 02 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Text selection is inaccurate in Wikipedia pages when starting navigation from wikipedia.org.
https://bugs.webkit.org/show_bug.cgi?id=149756
rdar://problem/22332409
Reviewed by Tim Horton.
When loading a new document into the same WebPage object, we need
to clear the assisted node, since there is no guarantee that the
node will be blurred. The bug is caused by the use of a stale
assisted node to constrain the point where the gesture occurs.
A fix for this problem was landed in http://trac.webkit.org/changeset/179885
where the cleanup was added when FrameLoaderClient::detach2 was called.
This method doesn't seem to be called any longer for the main frame,
so the correct solution is to add the cleanup to didCommitLoad in WebPage.
I've also added some checks to webSelectionsRects and selectedTextRange to avoid
the use of postLayoutData when the selection is none.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView webSelectionRects]):
(-[WKContentView selectedTextRange]):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::detachedFromParent2): Removed call to resetAssistedNodeForFrame.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didCommitLoad): Added call to resetAssistedNodeForFrame.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190511 => 190512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-02 17:58:21 UTC (rev 190511)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-02 18:29:03 UTC (rev 190512)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-10-02 Enrica Casucci <enrica@apple.com>
+
+ Text selection is inaccurate in Wikipedia pages when starting navigation from wikipedia.org.
+ https://bugs.webkit.org/show_bug.cgi?id=149756
+ rdar://problem/22332409
+
+ Reviewed by Tim Horton.
+
+ When loading a new document into the same WebPage object, we need
+ to clear the assisted node, since there is no guarantee that the
+ node will be blurred. The bug is caused by the use of a stale
+ assisted node to constrain the point where the gesture occurs.
+ A fix for this problem was landed in http://trac.webkit.org/changeset/179885
+ where the cleanup was added when FrameLoaderClient::detach2 was called.
+ This method doesn't seem to be called any longer for the main frame,
+ so the correct solution is to add the cleanup to didCommitLoad in WebPage.
+ I've also added some checks to webSelectionsRects and selectedTextRange to avoid
+ the use of postLayoutData when the selection is none.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView webSelectionRects]):
+ (-[WKContentView selectedTextRange]):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::detachedFromParent2): Removed call to resetAssistedNodeForFrame.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didCommitLoad): Added call to resetAssistedNodeForFrame.
+
</ins><span class="cx"> 2015-10-02 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reloading without content blockers doesn't apply to resource loads after the main frame finishes
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (190511 => 190512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-02 17:58:21 UTC (rev 190511)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-02 18:29:03 UTC (rev 190512)
</span><span class="lines">@@ -1026,6 +1026,8 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)webSelectionRects
</span><span class="cx"> {
</span><ins>+ if (_page->editorState().selectionIsNone)
+ return nil;
</ins><span class="cx"> const auto& selectionRects = _page->editorState().postLayoutData().selectionRects;
</span><span class="cx"> unsigned size = selectionRects.size();
</span><span class="cx"> if (!size)
</span><span class="lines">@@ -2301,6 +2303,8 @@
</span><span class="cx">
</span><span class="cx"> - (UITextRange *)selectedTextRange
</span><span class="cx"> {
</span><ins>+ if (_page->editorState().selectionIsNone)
+ return nil;
</ins><span class="cx"> auto& postLayoutEditorStateData = _page->editorState().postLayoutData();
</span><span class="cx"> FloatRect startRect = postLayoutEditorStateData.caretRectAtStart;
</span><span class="cx"> FloatRect endRect = postLayoutEditorStateData.caretRectAtEnd;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (190511 => 190512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-02 17:58:21 UTC (rev 190511)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-02 18:29:03 UTC (rev 190512)
</span><span class="lines">@@ -140,9 +140,6 @@
</span><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- webPage->resetAssistedNodeForFrame(m_frame);
-#endif
</del><span class="cx"> RefPtr<API::Object> userData;
</span><span class="cx">
</span><span class="cx"> // Notify the bundle client.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (190511 => 190512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-10-02 17:58:21 UTC (rev 190511)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-10-02 18:29:03 UTC (rev 190512)
</span><span class="lines">@@ -4592,6 +4592,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> frame->setFirstLayerTreeTransactionIDAfterDidCommitLoad(downcast<RemoteLayerTreeDrawingArea>(*m_drawingArea).nextTransactionID());
</span><span class="cx"> cancelPotentialTapInFrame(*frame);
</span><ins>+ resetAssistedNodeForFrame(frame);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!frame->isMainFrame())
</span></span></pre>
</div>
</div>
</body>
</html>