Title: [94527] trunk/Source/WebCore
- Revision
- 94527
- Author
- [email protected]
- Date
- 2011-09-05 05:57:50 -0700 (Mon, 05 Sep 2011)
Log Message
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).
Patch by Sheriff Bot <[email protected]> on 2011-09-05
* platform/text/TextBoundaries.cpp:
* platform/text/TextBreakIteratorICU.cpp:
* platform/text/qt/TextBoundariesQt.cpp:
* platform/text/qt/TextBreakIteratorQt.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94526 => 94527)
--- trunk/Source/WebCore/ChangeLog 2011-09-05 12:55:38 UTC (rev 94526)
+++ trunk/Source/WebCore/ChangeLog 2011-09-05 12:57:50 UTC (rev 94527)
@@ -1,3 +1,16 @@
+2011-09-05 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[Qt] Compiling using system ICU uses QTextBreakIterator in some cases.
Modified: trunk/Source/WebCore/platform/text/TextBoundaries.cpp (94526 => 94527)
--- trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2011-09-05 12:55:38 UTC (rev 94526)
+++ trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2011-09-05 12:57:50 UTC (rev 94527)
@@ -60,7 +60,7 @@
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)
{
Modified: trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp (94526 => 94527)
--- trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp 2011-09-05 12:55:38 UTC (rev 94526)
+++ trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp 2011-09-05 12:57:50 UTC (rev 94527)
@@ -29,8 +29,6 @@
namespace WebCore {
-#if USE(ICU_UNICODE)
-
static TextBreakIterator* setUpIterator(bool& createdIterator, TextBreakIterator*& iterator,
UBreakIteratorType type, const UChar* string, int length)
{
@@ -253,6 +251,4 @@
return setUpIteratorWithRules(createdCursorMovementIterator, staticCursorMovementIterator, kRules, string, length);
}
-#endif
-
}
Modified: trunk/Source/WebCore/platform/text/qt/TextBoundariesQt.cpp (94526 => 94527)
--- trunk/Source/WebCore/platform/text/qt/TextBoundariesQt.cpp 2011-09-05 12:55:38 UTC (rev 94526)
+++ trunk/Source/WebCore/platform/text/qt/TextBoundariesQt.cpp 2011-09-05 12:57:50 UTC (rev 94527)
@@ -33,12 +33,13 @@
#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 @@
*end = position == len ? len : iterator.toNextBoundary();
}
-#endif
-
}
Modified: trunk/Source/WebCore/platform/text/qt/TextBreakIteratorQt.cpp (94526 => 94527)
--- trunk/Source/WebCore/platform/text/qt/TextBreakIteratorQt.cpp 2011-09-05 12:55:38 UTC (rev 94526)
+++ trunk/Source/WebCore/platform/text/qt/TextBreakIteratorQt.cpp 2011-09-05 12:57:50 UTC (rev 94527)
@@ -36,8 +36,6 @@
namespace WebCore {
-#if !USE(ICU_UNICODE)
-
class TextBreakIterator : public QTextBoundaryFinder {
public:
TextBreakIterator(QTextBoundaryFinder::BoundaryType type, const QString& string)
@@ -152,6 +150,4 @@
return true;
}
-#endif
-
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
