<!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>[181972] 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/181972">181972</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-25 14:19:05 -0700 (Wed, 25 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Switching tabs to window with inspector open prohibits typing into console
https://bugs.webkit.org/show_bug.cgi?id=126800
Reviewed by Anders Carlsson.
This is a regression from <a href="http://trac.webkit.org/projects/webkit/changeset/85356">r85356</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/83814">r83814</a>. These two patches made WKWebView clear its selection
when WKView resigns the first responder without ever restoring it even if WKView later becomes
the first responder again. This is problematic when a text field or a editing host element had been
focused and selected prior to the resignation since the editing code uses the selection to determine
the editability of the element.
Fixed the bug by restoring selection in [WKView becomeFirstResponder] if the selection is empty.
* UIProcess/API/mac/WKView.mm:
(-[WKView becomeFirstResponder]):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::restoreSelectionInFocusedEditableElement):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::restoreSelectionInFocusedEditableElement):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181971 => 181972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-25 21:09:18 UTC (rev 181971)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-25 21:19:05 UTC (rev 181972)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-03-25 Ryosuke Niwa <rniwa@webkit.org>
+
+ Web Inspector: Switching tabs to window with inspector open prohibits typing into console
+ https://bugs.webkit.org/show_bug.cgi?id=126800
+
+ Reviewed by Anders Carlsson.
+
+ This is a regression from r85356 and r83814. These two patches made WKWebView clear its selection
+ when WKView resigns the first responder without ever restoring it even if WKView later becomes
+ the first responder again. This is problematic when a text field or a editing host element had been
+ focused and selected prior to the resignation since the editing code uses the selection to determine
+ the editability of the element.
+
+ Fixed the bug by restoring selection in [WKView becomeFirstResponder] if the selection is empty.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView becomeFirstResponder]):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::restoreSelectionInFocusedEditableElement):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::restoreSelectionInFocusedEditableElement):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2015-03-25 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r181660): Safari navigates to link after a starting and canceling a
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (181971 => 181972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-25 21:09:18 UTC (rev 181971)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-25 21:19:05 UTC (rev 181972)
</span><span class="lines">@@ -447,6 +447,8 @@
</span><span class="cx">
</span><span class="cx"> [self _updateSecureInputState];
</span><span class="cx"> _data->_page->viewStateDidChange(ViewState::IsFocused);
</span><ins>+ // Restore the selection in the editable region if resigning first responder cleared selection.
+ _data->_page->restoreSelectionInFocusedEditableElement();
</ins><span class="cx">
</span><span class="cx"> _data->_inBecomeFirstResponder = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (181971 => 181972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-25 21:09:18 UTC (rev 181971)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-03-25 21:19:05 UTC (rev 181972)
</span><span class="lines">@@ -1444,6 +1444,13 @@
</span><span class="cx"> m_process->send(Messages::WebPage::ClearSelection(), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::restoreSelectionInFocusedEditableElement()
+{
+ if (!isValid())
+ return;
+ m_process->send(Messages::WebPage::RestoreSelectionInFocusedEditableElement(), m_pageID);
+}
+
</ins><span class="cx"> void WebPageProxy::validateCommand(const String& commandName, std::function<void (const String&, bool, int32_t, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><span class="cx"> if (!isValid()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (181971 => 181972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-03-25 21:09:18 UTC (rev 181971)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-03-25 21:19:05 UTC (rev 181972)
</span><span class="lines">@@ -393,6 +393,7 @@
</span><span class="cx"> void setWindowResizerSize(const WebCore::IntSize&);
</span><span class="cx">
</span><span class="cx"> void clearSelection();
</span><ins>+ void restoreSelectionInFocusedEditableElement();
</ins><span class="cx">
</span><span class="cx"> void setViewNeedsDisplay(const WebCore::IntRect&);
</span><span class="cx"> void displayView();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (181971 => 181972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-25 21:09:18 UTC (rev 181971)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-03-25 21:19:05 UTC (rev 181972)
</span><span class="lines">@@ -3366,6 +3366,18 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void WebPage::restoreSelectionInFocusedEditableElement()
+{
+ Frame& frame = m_page->focusController().focusedOrMainFrame();
+ if (!frame.selection().isNone())
+ return;
+
+ if (auto document = frame.document()) {
+ if (auto element = document->focusedElement())
+ element->updateFocusAppearance(true /* restoreSelection */);
+ }
+}
+
</ins><span class="cx"> bool WebPage::mainFrameHasCustomContentProvider() const
</span><span class="cx"> {
</span><span class="cx"> if (Frame* frame = mainFrame()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (181971 => 181972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-03-25 21:09:18 UTC (rev 181971)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-03-25 21:19:05 UTC (rev 181972)
</span><span class="lines">@@ -683,6 +683,7 @@
</span><span class="cx">
</span><span class="cx"> void replaceSelectionWithText(WebCore::Frame*, const String&);
</span><span class="cx"> void clearSelection();
</span><ins>+ void restoreSelectionInFocusedEditableElement();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> #if PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (181971 => 181972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-03-25 21:09:18 UTC (rev 181971)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-03-25 21:19:05 UTC (rev 181972)
</span><span class="lines">@@ -143,6 +143,7 @@
</span><span class="cx"> DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, uint64_t downloadID)
</span><span class="cx">
</span><span class="cx"> ClearSelection()
</span><ins>+ RestoreSelectionInFocusedEditableElement()
</ins><span class="cx">
</span><span class="cx"> # Callbacks.
</span><span class="cx"> GetContentsAsString(uint64_t callbackID)
</span></span></pre>
</div>
</div>
</body>
</html>