Changeset 140681 in webkit

Timestamp:

Jan 24, 2013 6:46:55 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] It can't Select texts in main frame when the current focus is in a IFrame
​https://bugs.webkit.org/show_bug.cgi?id=107773

Patch by Sean Wang <​Xuewen.Wang@torchmobile.com.cn> on 2013-01-24
Reviewed by Antonio Gomes.

PR285211 Internally reviewed by Genevieve Mak

When touch hold in the unfocused frame, it doesn't switch frame focus. Many
places in code depends on the webpage->forcusOrMainFrame(), including the
SelectionHandler, so it can't select in an unfocused frame. This patch switchs
frame focus when touch starts.

• WebKitSupport/TouchEventHandler.cpp:

(BlackBerry::WebKit::TouchEventHandler::doFatFingers):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/TouchEventHandler.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-24  Sean Wang  <Xuewen.Wang@torchmobile.com.cn>
+
+        [BlackBerry] It can't Select texts in main frame when the current focus is in a IFrame
+        https://bugs.webkit.org/show_bug.cgi?id=107773
+
+        Reviewed by Antonio Gomes.
+
+        PR285211 Internally reviewed by Genevieve Mak
+
+        When touch hold in the unfocused frame, it doesn't switch frame focus. Many
+        places in code depends on the webpage->forcusOrMainFrame(), including the
+        SelectionHandler, so it can't select in an unfocused frame. This patch switchs
+        frame focus when touch starts.
+
+        * WebKitSupport/TouchEventHandler.cpp:
+        (BlackBerry::WebKit::TouchEventHandler::doFatFingers):
+
 2013-01-23  Nima Ghanavatian  <nghanavatian@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp

@@ -74 +74 @@
     m_lastFatFingersResult = FatFingers(m_webPage, point.documentContentPosition(), FatFingers::ClickableElement).findBestPoint();
     m_webPage->resumeDocumentStyleRecalc();
+
+    Node* nodeUnderFatFinger = m_lastFatFingersResult.node();
+    if (nodeUnderFatFinger && nodeUnderFatFinger->document()->frame() != m_webPage->focusedOrMainFrame()) {
+        m_webPage->clearFocusNode();
+        m_webPage->m_selectionHandler->cancelSelection();
+        m_webPage->m_page->focusController()->setFocusedFrame(nodeUnderFatFinger->document()->frame());
+    }
 }