<!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>[168473] trunk/Source</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/168473">168473</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-05-08 09:42:35 -0700 (Thu, 08 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WebKit2] Can't activate text fields on Facebook
https://bugs.webkit.org/show_bug.cgi?id=132682
Reviewed by Enrica Casucci.
Source/WebCore:
* page/DOMTimer.cpp:
(WebCore::DOMTimer::fired):
The isDocument() test here had reversed in the merge breaking content change observer callback.
Source/WebKit2:
* WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
(WebKit::WebChromeClient::observedContentChange):
Implement content change observer callback.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::handleSyntheticClick):
If the event gets canceled by a potential change (a started short-duration timer)
save the position and node so we can continue later.
(WebKit::WebPage::completePendingSyntheticClickForContentChangeObserver):
If it turns out the observed timer changed nothing continue the click event.
(WebKit::WebPage::completeSyntheticClick):
Factored click event dispatch part of handleSyntheticClick here.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimercpp">trunk/Source/WebCore/page/DOMTimer.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportiosWebChromeClientIOSmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168472 => 168473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-08 16:19:56 UTC (rev 168472)
+++ trunk/Source/WebCore/ChangeLog 2014-05-08 16:42:35 UTC (rev 168473)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-08 Antti Koivisto <antti@apple.com>
+
+ [iOS WebKit2] Can't activate text fields on Facebook
+ https://bugs.webkit.org/show_bug.cgi?id=132682
+
+ Reviewed by Enrica Casucci.
+
+ * page/DOMTimer.cpp:
+ (WebCore::DOMTimer::fired):
+
+ The isDocument() test here had reversed in the merge breaking content change observer callback.
+
</ins><span class="cx"> 2014-05-07 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> Replace DEPRECATED_DEFINE_STATIC_LOCAL by static NeverDestroyed<T> in svg/
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.cpp (168472 => 168473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.cpp 2014-05-08 16:19:56 UTC (rev 168472)
+++ trunk/Source/WebCore/page/DOMTimer.cpp 2014-05-08 16:42:35 UTC (rev 168473)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> ASSERT(context);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> Document* document = nullptr;
</span><del>- if (!context->isDocument()) {
</del><ins>+ if (context->isDocument()) {
</ins><span class="cx"> document = toDocument(context);
</span><span class="cx"> ASSERT(!document->frame()->timersPaused());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168472 => 168473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-08 16:19:56 UTC (rev 168472)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-08 16:42:35 UTC (rev 168473)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-05-08 Antti Koivisto <antti@apple.com>
+
+ [iOS WebKit2] Can't activate text fields on Facebook
+ https://bugs.webkit.org/show_bug.cgi?id=132682
+
+ Reviewed by Enrica Casucci.
+
+ * WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
+ (WebKit::WebChromeClient::observedContentChange):
+
+ Implement content change observer callback.
+
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::handleSyntheticClick):
+
+ If the event gets canceled by a potential change (a started short-duration timer)
+ save the position and node so we can continue later.
+
+ (WebKit::WebPage::completePendingSyntheticClickForContentChangeObserver):
+
+ If it turns out the observed timer changed nothing continue the click event.
+
+ (WebKit::WebPage::completeSyntheticClick):
+
+ Factored click event dispatch part of handleSyntheticClick here.
+
</ins><span class="cx"> 2014-05-07 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics][WK2] Scale factor and scroll position is not being restored properly in a back/forward load
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportiosWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (168472 => 168473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2014-05-08 16:19:56 UTC (rev 168472)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2014-05-08 16:42:35 UTC (rev 168473)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::observedContentChange(WebCore::Frame*)
</span><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ m_page->completePendingSyntheticClickForContentChangeObserver();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::clearContentChangeObservers(WebCore::Frame*)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (168472 => 168473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-05-08 16:19:56 UTC (rev 168472)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-05-08 16:42:35 UTC (rev 168473)
</span><span class="lines">@@ -715,6 +715,7 @@
</span><span class="cx"> void applicationDidBecomeActive();
</span><span class="cx"> void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
</span><span class="cx"> void dispatchTouchEvent(const WebTouchEvent&, bool& handled);
</span><ins>+ void completePendingSyntheticClickForContentChangeObserver();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
</span><span class="lines">@@ -824,6 +825,7 @@
</span><span class="cx"> void getAssistedNodeInformation(AssistedNodeInformation&);
</span><span class="cx"> void platformInitializeAccessibility();
</span><span class="cx"> void handleSyntheticClick(WebCore::Node* nodeRespondingToClick, const WebCore::FloatPoint& location);
</span><ins>+ void completeSyntheticClick(WebCore::Node* nodeRespondingToClick, const WebCore::FloatPoint& location);
</ins><span class="cx"> void sendTapHighlightForNodeIfNecessary(uint64_t requestID, WebCore::Node*);
</span><span class="cx"> #endif
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="lines">@@ -1193,6 +1195,8 @@
</span><span class="cx"> WebCore::FloatSize m_minimumLayoutSizeForMinimalUI;
</span><span class="cx"> bool m_inDynamicSizeUpdate;
</span><span class="cx"> HashMap<std::pair<WebCore::IntSize, double>, WebCore::IntPoint> m_dynamicSizeUpdateHistory;
</span><ins>+ RefPtr<WebCore::Node> m_pendingSyntheticClickNode;
+ WebCore::FloatPoint m_pendingSyntheticClickLocation;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WebInspectorClient* m_inspectorClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (168472 => 168473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-08 16:19:56 UTC (rev 168472)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-08 16:42:35 UTC (rev 168473)
</span><span class="lines">@@ -325,12 +325,48 @@
</span><span class="cx"> Frame& mainframe = m_page->mainFrame();
</span><span class="cx">
</span><span class="cx"> WKBeginObservingContentChanges(true);
</span><ins>+
</ins><span class="cx"> mainframe.eventHandler().mouseMoved(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, false, false, false, false, 0));
</span><span class="cx"> mainframe.document()->updateStyleIfNeeded();
</span><ins>+
</ins><span class="cx"> WKStopObservingContentChanges();
</span><del>- if (WKObservedContentChange() != WKContentNoChange)
</del><ins>+
+ m_pendingSyntheticClickNode = nullptr;
+ m_pendingSyntheticClickLocation = FloatPoint();
+
+ switch (WKObservedContentChange()) {
+ case WKContentVisibilityChange:
+ // The move event caused new contents to appear. Don't send the click event.
</ins><span class="cx"> return;
</span><ins>+ case WKContentIndeterminateChange:
+ // Wait for callback to completePendingSyntheticClickForContentChangeObserver() to decide whether to send the click event.
+ m_pendingSyntheticClickNode = nodeRespondingToClick;
+ m_pendingSyntheticClickLocation = location;
+ return;
+ case WKContentNoChange:
+ completeSyntheticClick(nodeRespondingToClick, location);
+ return;
+ }
+ ASSERT_NOT_REACHED();
+}
</ins><span class="cx">
</span><ins>+void WebPage::completePendingSyntheticClickForContentChangeObserver()
+{
+ if (!m_pendingSyntheticClickNode)
+ return;
+ // Only dispatch the click if the document didn't get changed by any timers started by the move event.
+ if (WKObservedContentChange() == WKContentNoChange)
+ completeSyntheticClick(m_pendingSyntheticClickNode.get(), m_pendingSyntheticClickLocation);
+
+ m_pendingSyntheticClickNode = nullptr;
+ m_pendingSyntheticClickLocation = FloatPoint();
+}
+
+void WebPage::completeSyntheticClick(Node* nodeRespondingToClick, const WebCore::FloatPoint& location)
+{
+ IntPoint roundedAdjustedPoint = roundedIntPoint(location);
+ Frame& mainframe = m_page->mainFrame();
+
</ins><span class="cx"> RefPtr<Frame> oldFocusedFrame = m_page->focusController().focusedFrame();
</span><span class="cx"> RefPtr<Element> oldFocusedElement = oldFocusedFrame ? oldFocusedFrame->document()->focusedElement() : nullptr;
</span><span class="cx"> m_userIsInteracting = true;
</span></span></pre>
</div>
</div>
</body>
</html>