Unreviewed, rolling out r94525.
authorloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Sep 2011 12:57:50 +0000 (12:57 +0000)
committerloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Sep 2011 12:57:50 +0000 (12:57 +0000)
http://trac.webkit.org/changeset/94525
https://bugs.webkit.org/show_bug.cgi?id=67599

WinCE compilation failed. (Requested by loislo on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-09-05

* platform/text/TextBoundaries.cpp:
* platform/text/TextBreakIteratorICU.cpp:
* platform/text/qt/TextBoundariesQt.cpp:
* platform/text/qt/TextBreakIteratorQt.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@94527 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/text/TextBoundaries.cpp
Source/WebCore/platform/text/TextBreakIteratorICU.cpp
Source/WebCore/platform/text/qt/TextBoundariesQt.cpp
Source/WebCore/platform/text/qt/TextBreakIteratorQt.cpp

index 921c283110871abdbf444cd1fb5d23758db67a81..8d364ead4b957da55f179746835f85e752d809b0 100644 (file)
@@ -1,3 +1,16 @@
+2011-09-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r94525.
+        http://trac.webkit.org/changeset/94525
+        https://bugs.webkit.org/show_bug.cgi?id=67599
+
+        WinCE compilation failed. (Requested by loislo on #webkit).
+
+        * platform/text/TextBoundaries.cpp:
+        * platform/text/TextBreakIteratorICU.cpp:
+        * platform/text/qt/TextBoundariesQt.cpp:
+        * platform/text/qt/TextBreakIteratorQt.cpp:
+
 2011-09-05  Alexander Færøy  <alexander.faeroy@nokia.com>
 
         [Qt] Compiling using system ICU uses QTextBreakIterator in some cases.
index 8ee3364fd95e50babcc82eab19cb0691f78c0b48..fbb261b692d7c171c1bfb14ffb669c5635582a37 100644 (file)
@@ -60,7 +60,7 @@ int startOfLastWordBoundaryContext(const UChar* characters, int length)
     return 0;
 }
 
-#if !PLATFORM(BREWMP) && !PLATFORM(MAC) && USE(ICU_UNICODE)
+#if !PLATFORM(BREWMP) && !PLATFORM(MAC) && !PLATFORM(QT)
 
 int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward)
 {
index 41235a848e55a7e5644974aa38e41eb21ef00857..a591297e6cc9e7c7bf1e7b0a3abfea693d74f101 100644 (file)
@@ -29,8 +29,6 @@ using namespace std;
 
 namespace WebCore {
 
-#if USE(ICU_UNICODE)
-
 static TextBreakIterator* setUpIterator(bool& createdIterator, TextBreakIterator*& iterator,
     UBreakIteratorType type, const UChar* string, int length)
 {
@@ -253,6 +251,4 @@ TextBreakIterator* cursorMovementIterator(const UChar* string, int length)
     return setUpIteratorWithRules(createdCursorMovementIterator, staticCursorMovementIterator, kRules, string, length);
 }
 
-#endif
-
 }
index b5f1ee8f2a645a7e7eb8fedd21612bd822803e97..a354ca650d2a32399e7bf0b7bc5201ab6a7d71f8 100644 (file)
 #include <QString>
 #include <QChar>
 
+#include <QDebug>
+#include <stdio.h>
+
 #include <qtextboundaryfinder.h>
 
 namespace WebCore {
 
-#if !USE(ICU_UNICODE)
-
 int findNextWordFromIndex(UChar const* buffer, int len, int position, bool forward)
 {
     QString str(reinterpret_cast<QChar const*>(buffer), len);
@@ -72,7 +73,5 @@ void findWordBoundary(UChar const* buffer, int len, int position, int* start, in
     *end = position == len ? len : iterator.toNextBoundary();
 }
 
-#endif
-
 }
 
index 53c96970070cc3184adb5fd6450a97039f732a2e..653ede39ab0a5a54fb57bf09849bf742480cbc0b 100644 (file)
@@ -36,8 +36,6 @@ using namespace std;
 
 namespace WebCore {
 
-#if !USE(ICU_UNICODE)
-
     class TextBreakIterator : public QTextBoundaryFinder {
     public:
         TextBreakIterator(QTextBoundaryFinder::BoundaryType type, const QString& string)
@@ -152,6 +150,4 @@ namespace WebCore {
         return true;
     }
 
-#endif
-
 }