Changeset 128188 in webkit

Timestamp:

Sep 11, 2012 8:08:43 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Take account for single words that exceed our client character limit
​https://bugs.webkit.org/show_bug.cgi?id=96389

Fix to the processing of long single-line text using getRangeForSpellCheckWithFineGranularity.
This was failing if a single word was longer than our maximum allowed limit.

Internally reviewed by Mike Fenton.

Patch by Nima Ghanavatian <​nghanavatian@rim.com> on 2012-09-11
Reviewed by Rob Buis.

• WebKitSupport/InputHandler.cpp:

(WebKit):
(BlackBerry::WebKit::InputHandler::getRangeForSpellCheckWithFineGranularity):

Location:

trunk/Source/WebKit/blackberry

Files:

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

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-09-11  Nima Ghanavatian  <nghanavatian@rim.com>
+
+        [BlackBerry] Take account for single words that exceed our client character limit
+        https://bugs.webkit.org/show_bug.cgi?id=96389
+
+        Fix to the processing of long single-line text using getRangeForSpellCheckWithFineGranularity.
+        This was failing if a single word was longer than our maximum allowed limit.
+
+        Internally reviewed by Mike Fenton.
+
+        Reviewed by Rob Buis.
+
+        * WebKitSupport/InputHandler.cpp:
+        (WebKit):
+        (BlackBerry::WebKit::InputHandler::getRangeForSpellCheckWithFineGranularity):
+
 2012-09-11  Arvid Nilsson  <anilsson@rim.com>
 

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

@@ -939 +939 @@
 {
     VisiblePosition endOfCurrentWord = endOfWord(startPosition);
-    RefPtr<Range> rangeForSpellChecking;
-    while (endOfCurrentWord != endPosition) {
-        rangeForSpellChecking = VisibleSelection(startPosition, endOfCurrentWord).toNormalizedRange();
-        // If we exceed the MaxSpellCheckingStringLength limit, then go back one word and return this range.
-        if (rangeForSpellChecking->text().length() >= MaxSpellCheckingStringLength)
-            return VisibleSelection(startPosition, endOfWord(previousWordPosition(endOfCurrentWord))).toNormalizedRange();
-
-        endOfCurrentWord = endOfWord(nextWordPosition(endOfCurrentWord));
+
+    // Keep iterating until one of our cases is hit, or we've incremented the starting position right to the end.
+    while (startPosition != endPosition) {
+        // Check the text length within this range.
+        if (VisibleSelection(startPosition, endOfCurrentWord).toNormalizedRange()->text().length() >= MaxSpellCheckingStringLength) {
+            // If this is not the first word, return a Range with end boundary set to the previous word.
+            if (startOfWord(endOfCurrentWord, LeftWordIfOnBoundary) != startPosition)
+                return VisibleSelection(startPosition, endOfWord(previousWordPosition(endOfCurrentWord), LeftWordIfOnBoundary)).toNormalizedRange();
+
+            // Our first word has gone over the character limit. Increment the starting position past an uncheckable word.
+            startPosition = endOfCurrentWord;
+        } else if (endOfCurrentWord == endPosition) {
+            // Return the last segment if the end of our word lies at the end of the range.
+            return VisibleSelection(startPosition, endPosition).toNormalizedRange();
+        } else {
+            // Increment the current word.
+            endOfCurrentWord = endOfWord(nextWordPosition(endOfCurrentWord));
+        }
     }
     return 0;