diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp | |
parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp')
-rw-r--r-- | Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp b/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp index fcd2e7e10..1b89071ac 100644 --- a/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp +++ b/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp @@ -253,14 +253,17 @@ void SelectionHandler::setCaretPosition(const WebCore::IntPoint &position) VisiblePosition visibleCaretPosition(focusedFrame->visiblePositionForPoint(relativePoint)); - if (!DOMSupport::isPositionInNode(m_webPage->focusedOrMainFrame()->document()->focusedNode(), visibleCaretPosition.deepEquivalent())) { - if (unsigned short character = directionOfPointRelativeToRect(relativePoint, currentCaretRect)) - m_webPage->m_inputHandler->handleKeyboardInput(Platform::KeyboardEvent(character)); - - // Send the selection changed in case this does not trigger a selection change to - // ensure the caret position is accurate. This may be a duplicate event. - selectionPositionChanged(true /* forceUpdateWithoutChange */); - return; + if (RenderObject* focusedRenderer = focusedFrame->document()->focusedNode()->renderer()) { + WebCore::IntRect nodeOutlineBounds(focusedRenderer->absoluteOutlineBounds()); + if (!nodeOutlineBounds.contains(relativePoint)) { + if (unsigned short character = directionOfPointRelativeToRect(relativePoint, currentCaretRect)) + m_webPage->m_inputHandler->handleKeyboardInput(Platform::KeyboardEvent(character)); + + // Send the selection changed in case this does not trigger a selection change to + // ensure the caret position is accurate. This may be a duplicate event. + selectionPositionChanged(true /* forceUpdateWithoutChange */); + return; + } } VisibleSelection newSelection(visibleCaretPosition); |