Imported WebKit commit 76dac539db7ece7079963adfcfe878d8e2f7d861 (http://svn.webkit.org/repository/webkit/trunk@135696)

New snapshot that fixes build after QMacStyle removal

Change-Id: Idea95c96c73b49158d52861db2a4b8d2c51766b0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp b/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp
index b24fda3a6..e673b1a0c 100644
--- a/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp
+++ b/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp
@@ -53,6 +53,7 @@ public:
     }
 
 private:
+    friend class InPageSearchManager;
     void doTimeout(Timer<DeferredScopeStringMatches>*)
     {
         m_searchManager->callScopeStringMatches(this, m_scopingFrame, m_searchText, m_reset, m_locateActiveMatchOnly);
@@ -247,6 +248,13 @@ void InPageSearchManager::setActiveMatchAndMarker(PassRefPtr<Range> range)
 
 void InPageSearchManager::frameUnloaded(const Frame* frame)
 {
+    for (size_t i = 0; i < m_deferredScopingWork.size(); i++) {
+        if (m_deferredScopingWork[i]->m_scopingFrame == frame) {
+            // Clear pending scoping efforts in case of dangling pointer.
+            cancelPendingScopingEffort();
+            break;
+        }
+    }
     if (!m_activeMatch) {
         if (m_webPage->mainFrame() == frame && m_activeSearchString.length())
             m_activeSearchString = String();