diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp')
| -rw-r--r-- | Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp b/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp index 2cd4ee34c..10e07359e 100644 --- a/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp +++ b/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp @@ -29,10 +29,10 @@ #include "HitTestResult.h" #include "InputHandler.h" #include "IntRect.h" +#include "SelectionOverlay.h" #include "TouchEventHandler.h" #include "WebPageClient.h" #include "WebPage_p.h" -#include "WebSelectionOverlay.h" #include "htmlediting.h" #include "visible_units.h" @@ -83,6 +83,9 @@ void SelectionHandler::cancelSelection() m_selectionActive = false; m_lastSelectionRegion = IntRectRegion(); + if (m_webPage->m_selectionOverlay) + m_webPage->m_selectionOverlay->hide(); + SelectionLog(LogLevelInfo, "SelectionHandler::cancelSelection"); if (m_webPage->m_inputHandler->isInputMode()) @@ -859,6 +862,8 @@ void SelectionHandler::selectionPositionChanged(bool forceUpdateWithoutChange) return; if (m_webPage->m_inputHandler->isInputMode() && m_webPage->m_inputHandler->processingChange()) { + if (m_webPage->m_selectionOverlay) + m_webPage->m_selectionOverlay->hide(); m_webPage->m_client->cancelSelectionVisuals(); // Since we're not calling notifyCaretPositionChangedIfNeeded now, we have to do so at the end of processing |