Changeset 148710 in webkit

Timestamp:

Apr 18, 2013, 3:45:32 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Invalidate spell checking requests in platform code
​https://bugs.webkit.org/show_bug.cgi?id=114830

Patch by Nima Ghanavatian <​nghanavatian@blackberry.com> on 2013-04-18
Reviewed by Rob Buis.

Internally reviewed by Mike Fenton.

Cache the value of the last requested sequence id at focus change.
All requests prior to this point will be rejected upon processing.

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::InputHandler):
(BlackBerry::WebKit::InputHandler::requestCheckingOfString):
(BlackBerry::WebKit::InputHandler::stopPendingSpellCheckRequests):

• WebKitSupport/InputHandler.h:

(InputHandler):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/InputHandler.cpp (modified) (3 diffs)
• WebKitSupport/InputHandler.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-18 Nima Ghanavatian <nghanavatian@blackberry.com>
+
+        [BlackBerry] Invalidate spell checking requests in platform code
+        https://bugs.webkit.org/show_bug.cgi?id=114830
+
+        Reviewed by Rob Buis.
+
+        Internally reviewed by Mike Fenton.
+
+        Cache the value of the last requested sequence id at focus change.
+        All requests prior to this point will be rejected upon processing.
+
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::InputHandler):
+        (BlackBerry::WebKit::InputHandler::requestCheckingOfString):
+        (BlackBerry::WebKit::InputHandler::stopPendingSpellCheckRequests):
+        * WebKitSupport/InputHandler.h:
+        (InputHandler):
+
 2013-04-17  Geoffrey Garen  <ggaren@apple.com>
 

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

@@ -155 +155 @@
     , m_spellCheckStatusConfirmed(false)
     , m_globalSpellCheckStatus(false)
+    , m_minimumSpellCheckingRequestSequence(-1)
 {
 }
@@ -609 +610 @@
     }
 
+    if (spellCheckRequest->data().sequence() <= m_minimumSpellCheckingRequestSequence) {
+        SpellingLog(Platform::LogLevelWarn, "InputHandler::requestCheckingOfString rejecting stale request with sequenceId=%d. Sentinal currently at %d."
+            , spellCheckRequest->data().sequence(), m_minimumSpellCheckingRequestSequence);
+        spellCheckRequest->didCancel();
+        return;
+    }
+
     unsigned requestLength = spellCheckRequest->data().text().length();
 
@@ -1172 +1180 @@
     // Prevent response from propagating through
     m_processingTransactionId = 0;
-    // Clear the pending queue as well
-    if (m_request)
-        m_request->setCheckerAndSequence(getSpellChecker(), -1);
+    // Reject requests until lastRequestSequence. This helps us clear the queue of stale requests.
+    if (SpellChecker* spellChecker = getSpellChecker())
+        m_minimumSpellCheckingRequestSequence = spellChecker->lastRequestSequence();
 }
 

trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h

@@ -265 +265 @@
     bool m_spellCheckStatusConfirmed;
     bool m_globalSpellCheckStatus;
+    int m_minimumSpellCheckingRequestSequence;
 
     OwnPtr<WebCore::SuggestionBoxHandler> m_suggestionDropdownBoxHandler;