[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 16:16:52 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b2cc12c31b60da208010357b1e3e70d7f493242f
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 20 23:18:51 2010 +0000
2010-11-20 Patrick Gansterer <paroga at webkit.org>
Reviewed by David Kilzer.
[WINCE] Implement textBreakLast and textBreakPrevious
https://bugs.webkit.org/show_bug.cgi?id=49552
This allows us to use TextBoundaries.cpp and remove TextBoundariesWinCE.cpp.
Also unify the different TextBreakIterator::first() implementations.
* platform/text/wince/TextBoundariesWinCE.cpp: Removed.
* platform/text/wince/TextBreakIteratorWinCE.cpp:
(WebCore::TextBreakIterator::first):
(WebCore::TextBreakIterator::last):
(WebCore::textBreakLast):
(WebCore::textBreakPrevious):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72483 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b74faa1..5f2a69a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-20 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by David Kilzer.
+
+ [WINCE] Implement textBreakLast and textBreakPrevious
+ https://bugs.webkit.org/show_bug.cgi?id=49552
+
+ This allows us to use TextBoundaries.cpp and remove TextBoundariesWinCE.cpp.
+ Also unify the different TextBreakIterator::first() implementations.
+
+ * platform/text/wince/TextBoundariesWinCE.cpp: Removed.
+ * platform/text/wince/TextBreakIteratorWinCE.cpp:
+ (WebCore::TextBreakIterator::first):
+ (WebCore::TextBreakIterator::last):
+ (WebCore::textBreakLast):
+ (WebCore::textBreakPrevious):
+
2010-11-20 Andreas Kling <kling at webkit.org>
Reviewed by David Kilzer.
diff --git a/WebCore/platform/text/wince/TextBoundariesWinCE.cpp b/WebCore/platform/text/wince/TextBoundariesWinCE.cpp
deleted file mode 100644
index f3070a4..0000000
--- a/WebCore/platform/text/wince/TextBoundariesWinCE.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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;
-}
-
-} // namespace WebCore
diff --git a/WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp b/WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp
index 7f46e4f..96488c0 100644
--- a/WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp
+++ b/WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp
@@ -55,7 +55,16 @@ public:
length = len;
currentPos = 0;
}
- virtual int first() = 0;
+ int first()
+ {
+ currentPos = 0;
+ return currentPos;
+ }
+ int last()
+ {
+ currentPos = length;
+ return currentPos;
+ }
virtual int next() = 0;
virtual int previous() = 0;
int following(int position)
@@ -75,35 +84,25 @@ public:
};
struct WordBreakIterator: TextBreakIterator {
- virtual int first();
virtual int next();
virtual int previous();
};
struct CharBreakIterator: TextBreakIterator {
- virtual int first();
virtual int next();
virtual int previous();
};
struct LineBreakIterator: TextBreakIterator {
- virtual int first();
virtual int next();
virtual int previous();
};
struct SentenceBreakIterator : TextBreakIterator {
- virtual int first();
virtual int next();
virtual int previous();
};
-int WordBreakIterator::first()
-{
- currentPos = 0;
- return currentPos;
-}
-
int WordBreakIterator::next()
{
if (currentPos == length) {
@@ -138,12 +137,6 @@ int WordBreakIterator::previous()
return currentPos;
}
-int CharBreakIterator::first()
-{
- currentPos = 0;
- return currentPos;
-}
-
int CharBreakIterator::next()
{
if (currentPos >= length)
@@ -166,12 +159,6 @@ int CharBreakIterator::previous()
return currentPos;
}
-int LineBreakIterator::first()
-{
- currentPos = 0;
- return currentPos;
-}
-
int LineBreakIterator::next()
{
if (currentPos == length) {
@@ -206,12 +193,6 @@ int LineBreakIterator::previous()
return currentPos;
}
-int SentenceBreakIterator::first()
-{
- currentPos = 0;
- return currentPos;
-}
-
int SentenceBreakIterator::next()
{
if (currentPos == length) {
@@ -279,11 +260,21 @@ int textBreakFirst(TextBreakIterator* breakIterator)
return breakIterator->first();
}
+int textBreakLast(TextBreakIterator* breakIterator)
+{
+ return breakIterator->last();
+}
+
int textBreakNext(TextBreakIterator* breakIterator)
{
return breakIterator->next();
}
+int textBreakPrevious(TextBreakIterator* breakIterator)
+{
+ return breakIterator->previous();
+}
+
int textBreakPreceding(TextBreakIterator* breakIterator, int position)
{
return breakIterator->preceding(position);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list