Changeset 179885 in webkit

Timestamp:

Feb 10, 2015 3:02:22 PM (9 years ago)

Author:

enrica@apple.com

Message:

Hit testing is misplaced when selecting on wikipedia page.
​https://bugs.webkit.org/show_bug.cgi?id=141410
rdar://problem/19768211

Reviewed by Simon Fraser.

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 was caused by the use of a stale
assisted node to constrain the point where the gesture occurs.
The node was still valid, since the previous page was in the cache.
I've added a ASSERT to check that, when constraining the point to
node rectangle, the node is in the same document as the one we
are performing hit test on. When the frame is detached, we clear
the assisted node if the node is part of the document is the frame
being detached.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::detachedFromParent2):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::constrainPoint):
(WebKit::WebPage::resetAssistedNodeForFrame):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-10  Enrica Casucci  <enrica@apple.com>
+
+        Hit testing is misplaced when selecting on wikipedia page.
+        https://bugs.webkit.org/show_bug.cgi?id=141410
+        rdar://problem/19768211
+
+        Reviewed by Simon Fraser.
+
+        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 was caused by the use of a stale
+        assisted node to constrain the point where the gesture occurs.
+        The node was still valid, since the previous page was in the cache.
+        I've added a ASSERT to check that, when constraining the point to
+        node rectangle, the node is in the same document as the one we
+        are performing hit test on. When the frame is detached, we clear
+        the assisted node if the node is part of the document is the frame
+        being detached.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::detachedFromParent2):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::constrainPoint):
+        (WebKit::WebPage::resetAssistedNodeForFrame):
+
 2015-02-10  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -143 +143 @@
         return;
 
+#if PLATFORM(IOS)
+    webPage->resetAssistedNodeForFrame(m_frame);
+#endif
     RefPtr<API::Object> userData;
 

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

@@ -517 +517 @@
     void setAssistedNodeValueAsNumber(double);
     void setAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection);
+    void resetAssistedNodeForFrame(WebFrame*);
     WebCore::IntRect rectForElementAtInteractionLocation();
     void updateSelectionAppearance();

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

@@ -696 +696 @@
 static IntPoint constrainPoint(const IntPoint& point, Frame* frame, Node* assistedNode)
 {
+    ASSERT(!assistedNode || &assistedNode->document() == frame->document());
     const int DEFAULT_CONSTRAIN_INSET = 2;
     IntRect innerFrame = innerFrameQuad(frame, assistedNode).enclosingBoundingBox();
@@ -2265 +2266 @@
 }
 
+void WebPage::resetAssistedNodeForFrame(WebFrame* frame)
+{
+    if (!m_assistedNode)
+        return;
+    if (m_assistedNode->document().frame() == frame->coreFrame()) {
+        send(Messages::WebPageProxy::StopAssistingNode());
+        m_assistedNode = nullptr;
+    }
+}
+
 void WebPage::elementDidFocus(WebCore::Node* node)
 {