Changeset 168473 in webkit

Timestamp:

May 8, 2014, 9:42:35 AM (11 years ago)

Author:

Antti Koivisto

Message:

[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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DOMTimer.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.h (modified) (3 diffs)
• WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2014-05-07  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/page/DOMTimer.cpp

@@ -126 +126 @@
 #if PLATFORM(IOS)
     Document* document = nullptr;
-    if (!context->isDocument()) {
+    if (context->isDocument()) {
         document = toDocument(context);
         ASSERT(!document->frame()->timersPaused());

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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.
+
 2014-05-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm

@@ -66 +66 @@
 void WebChromeClient::observedContentChange(WebCore::Frame*)
 {
-    notImplemented();
+    m_page->completePendingSyntheticClickForContentChangeObserver();
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -716 +716 @@
     void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
     void dispatchTouchEvent(const WebTouchEvent&, bool& handled);
+    void completePendingSyntheticClickForContentChangeObserver();
 #endif
 
@@ -825 +826 @@
     void platformInitializeAccessibility();
     void handleSyntheticClick(WebCore::Node* nodeRespondingToClick, const WebCore::FloatPoint& location);
+    void completeSyntheticClick(WebCore::Node* nodeRespondingToClick, const WebCore::FloatPoint& location);
     void sendTapHighlightForNodeIfNecessary(uint64_t requestID, WebCore::Node*);
 #endif
@@ -1194 +1196 @@
     bool m_inDynamicSizeUpdate;
     HashMap<std::pair<WebCore::IntSize, double>, WebCore::IntPoint> m_dynamicSizeUpdateHistory;
+    RefPtr<WebCore::Node> m_pendingSyntheticClickNode;
+    WebCore::FloatPoint m_pendingSyntheticClickLocation;
 #endif
 

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -326 +326 @@
 
     WKBeginObservingContentChanges(true);
+
     mainframe.eventHandler().mouseMoved(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, false, false, false, false, 0));
     mainframe.document()->updateStyleIfNeeded();
+
     WKStopObservingContentChanges();
-    if (WKObservedContentChange() != WKContentNoChange)
+
+    m_pendingSyntheticClickNode = nullptr;
+    m_pendingSyntheticClickLocation = FloatPoint();
+
+    switch (WKObservedContentChange()) {
+    case WKContentVisibilityChange:
+        // The move event caused new contents to appear. Don't send the click event.
         return;
+    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();
+}
+
+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();
 
     RefPtr<Frame> oldFocusedFrame = m_page->focusController().focusedFrame();