[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

kseo at webkit.org kseo at webkit.org
Wed Dec 22 14:36:26 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 52e6c648e4feb76419af4a5879551c1f587ba307
Author: kseo at webkit.org <kseo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 00:49:09 2010 +0000

    [BREWMP] Add TextBoundaries and TextBreakIterator
    https://bugs.webkit.org/show_bug.cgi?id=46105
    
    Reviewed by Kent Tamura.
    
    Copy the implementation of WinCE port.
    
    * platform/text/brew/TextBoundariesBrew.cpp: Added.
    (WebCore::findNextWordFromIndex):
    (WebCore::findWordBoundary):
    * platform/text/brew/TextBreakIteratorBrew.cpp: Added.
    (WebCore::isCharStop):
    (WebCore::isLineStop):
    (WebCore::isSentenceStop):
    (WebCore::TextBreakIterator::reset):
    (WebCore::TextBreakIterator::following):
    (WebCore::TextBreakIterator::preceding):
    (WebCore::WordBreakIterator::first):
    (WebCore::WordBreakIterator::next):
    (WebCore::WordBreakIterator::previous):
    (WebCore::CharBreakIterator::first):
    (WebCore::CharBreakIterator::next):
    (WebCore::CharBreakIterator::previous):
    (WebCore::LineBreakIterator::first):
    (WebCore::LineBreakIterator::next):
    (WebCore::LineBreakIterator::previous):
    (WebCore::SentenceBreakIterator::first):
    (WebCore::SentenceBreakIterator::next):
    (WebCore::SentenceBreakIterator::previous):
    (WebCore::wordBreakIterator):
    (WebCore::characterBreakIterator):
    (WebCore::lineBreakIterator):
    (WebCore::sentenceBreakIterator):
    (WebCore::textBreakFirst):
    (WebCore::textBreakNext):
    (WebCore::textBreakPreceding):
    (WebCore::textBreakFollowing):
    (WebCore::textBreakCurrent):
    (WebCore::isTextBreak):
    (WebCore::cursorMovementIterator):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 452c245..89aa41d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,46 @@
+2010-10-13  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Kent Tamura.
+
+        [BREWMP] Add TextBoundaries and TextBreakIterator
+        https://bugs.webkit.org/show_bug.cgi?id=46105
+
+        Copy the implementation of WinCE port.
+
+        * platform/text/brew/TextBoundariesBrew.cpp: Added.
+        (WebCore::findNextWordFromIndex):
+        (WebCore::findWordBoundary):
+        * platform/text/brew/TextBreakIteratorBrew.cpp: Added.
+        (WebCore::isCharStop):
+        (WebCore::isLineStop):
+        (WebCore::isSentenceStop):
+        (WebCore::TextBreakIterator::reset):
+        (WebCore::TextBreakIterator::following):
+        (WebCore::TextBreakIterator::preceding):
+        (WebCore::WordBreakIterator::first):
+        (WebCore::WordBreakIterator::next):
+        (WebCore::WordBreakIterator::previous):
+        (WebCore::CharBreakIterator::first):
+        (WebCore::CharBreakIterator::next):
+        (WebCore::CharBreakIterator::previous):
+        (WebCore::LineBreakIterator::first):
+        (WebCore::LineBreakIterator::next):
+        (WebCore::LineBreakIterator::previous):
+        (WebCore::SentenceBreakIterator::first):
+        (WebCore::SentenceBreakIterator::next):
+        (WebCore::SentenceBreakIterator::previous):
+        (WebCore::wordBreakIterator):
+        (WebCore::characterBreakIterator):
+        (WebCore::lineBreakIterator):
+        (WebCore::sentenceBreakIterator):
+        (WebCore::textBreakFirst):
+        (WebCore::textBreakNext):
+        (WebCore::textBreakPreceding):
+        (WebCore::textBreakFollowing):
+        (WebCore::textBreakCurrent):
+        (WebCore::isTextBreak):
+        (WebCore::cursorMovementIterator):
+
 2010-10-13  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/WebCore/platform/text/brew/TextBoundariesBrew.cpp b/WebCore/platform/text/brew/TextBoundariesBrew.cpp
new file mode 100644
index 0000000..506bdcf
--- /dev/null
+++ b/WebCore/platform/text/brew/TextBoundariesBrew.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2006 Zack Rusin <zack at kde.org>
+ * Copyright (C) 2007-2009 Torch Mobile, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "TextBoundaries.h"
+
+#include "NotImplemented.h"
+#include "PlatformString.h"
+
+using namespace WTF::Unicode;
+
+namespace WebCore {
+
+int findNextWordFromIndex(const UChar* buffer, int len, int position, bool forward)
+{
+    notImplemented();
+    return 0;
+}
+
+void findWordBoundary(const UChar* buffer, int len, int position, int* start, int* end)
+{
+    if (position > len) {
+        *start = 0;
+        *end = 0;
+        return;
+    }
+
+    String str(buffer, len);
+
+    int currentPosition = position - 1;
+    String foundWord;
+    while (currentPosition >= 0 && isLetter(str[currentPosition])) {
+        UChar c = str[currentPosition];
+        foundWord.insert(&c, 1, 0);
+        --currentPosition;
+    }
+
+    // currentPosition == 0 means the first char is not letter
+    // currentPosition == -1 means we reached the beginning
+    int startPos = (currentPosition < 0) ? 0 : ++currentPosition;
+    currentPosition = position;
+    while (isLetter(str[currentPosition])) {
+        foundWord.append(str[currentPosition]);
+        ++currentPosition;
+    }
+
+    *start = startPos;
+    *end = currentPosition;
+}
+
+}
diff --git a/WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp b/WebCore/platform/text/brew/TextBreakIteratorBrew.cpp
similarity index 100%
copy from WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp
copy to WebCore/platform/text/brew/TextBreakIteratorBrew.cpp

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list