[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[tkent at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit d540b53fdd1b60c550fca98501db5ab3e7a96813
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 1 01:43:29 2010 +0000

    2010-01-31  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Jeremy Orlow.
    
            [Chromium] Fix a bug that a selected word is not recognized as a
            spell-check source.
            https://bugs.webkit.org/show_bug.cgi?id=33660
    
            * src/ContextMenuClientImpl.cpp:
            (WebKit::isASingleWord): Use wordBreakIterator(), and correctly check
            the return value of textBreakNext().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54119 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a27d430..6a8e76a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-31  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        [Chromium] Fix a bug that a selected word is not recognized as a
+        spell-check source.
+        https://bugs.webkit.org/show_bug.cgi?id=33660
+
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::isASingleWord): Use wordBreakIterator(), and correctly check
+        the return value of textBreakNext().
+
 2010-01-29  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/ContextMenuClientImpl.cpp b/WebKit/chromium/src/ContextMenuClientImpl.cpp
index f23919e..72b861f 100644
--- a/WebKit/chromium/src/ContextMenuClientImpl.cpp
+++ b/WebKit/chromium/src/ContextMenuClientImpl.cpp
@@ -79,11 +79,11 @@ static WebURL urlFromFrame(Frame* frame)
     return WebURL();
 }
 
-// Helper function to determine whether text is a single word or a sentence.
+// Helper function to determine whether text is a single word.
 static bool isASingleWord(const String& text)
 {
-    TextBreakIterator* it = characterBreakIterator(text.characters(), text.length());
-    return it && textBreakNext(it) == TextBreakDone;
+    TextBreakIterator* it = wordBreakIterator(text.characters(), text.length());
+    return it && textBreakNext(it) == static_cast<int>(text.length());
 }
 
 // Helper function to get misspelled word on which context menu

-- 
WebKit Debian packaging