Attachment #225191 for bug #308699




#include "PlatformString.h"
#include "TextBreakIteratorInternalICU.h"

#include <unicode/ubrk.h>
#include <wtf/Assertions.h>

    if (!createdIterator) {
        UErrorCode openStatus = U_ZERO_ERROR;
        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
        createdIterator = true;
        ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);


    UErrorCode setTextStatus = U_ZERO_ERROR;
    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
    if (U_FAILURE(setTextStatus))
        return 0;

}

int textBreakFirst(TextBreakIterator* iterator)
{
    return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
}

int textBreakLast(TextBreakIterator* iterator)
{
    return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
}

int textBreakNext(TextBreakIterator* iterator)
{
    return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
}

int textBreakPrevious(TextBreakIterator* iterator)
{
    return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
}

int textBreakPreceding(TextBreakIterator* iterator, int pos)
{
    return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
}

int textBreakFollowing(TextBreakIterator* iterator, int pos)
{
    return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
}

int textBreakCurrent(TextBreakIterator* iterator)
{
    return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
}

bool isTextBreak(TextBreakIterator* iterator, int position)
{
    return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
}


        UErrorCode openStatus = U_ZERO_ERROR;
        String rules(breakRules);
        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
        createdIterator = true;
        ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);


    UErrorCode setTextStatus = U_ZERO_ERROR;
    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
    if (U_FAILURE(setTextStatus))
        return 0;

Return to bug 308699

Lines 25-29 Link Here

(-)/trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (-43 / +42 lines)
25	#include "PlatformString.h"	25	#include "PlatformString.h"
26	#include "TextBreakIteratorInternalICU.h"	26	#include "TextBreakIteratorInternalICU.h"
27
28	#include <unicode/ubrk.h>	27	#include <unicode/ubrk.h>
29	#include <wtf/Assertions.h>	28	#include <wtf/Assertions.h>
Lines 39-43 Link Here
39	if (!createdIterator) {	38	if (!createdIterator) {
40	UErrorCode openStatus = U_ZERO_ERROR;	39	UErrorCode openStatus = U_ZERO_ERROR;
41	iterator = static_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));	40	iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
42	createdIterator = true;	41	createdIterator = true;
43	ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);	42	ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
Lines 47-51 Link Here
47		46
48	UErrorCode setTextStatus = U_ZERO_ERROR;	47	UErrorCode setTextStatus = U_ZERO_ERROR;
49	ubrk_setText(iterator, string, length, &setTextStatus);	48	ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
50	if (U_FAILURE(setTextStatus))	49	if (U_FAILURE(setTextStatus))
51	return 0;	50	return 0;
Lines 86-127 Link Here
86	}	85	}
87		86
88	int textBreakFirst(TextBreakIterator* bi)	87	int textBreakFirst(TextBreakIterator* iterator)
89	{	88	{
90	return ubrk_first(bi);	89	return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
91	}	90	}
92		91
93	int textBreakLast(TextBreakIterator* bi)	92	int textBreakLast(TextBreakIterator* iterator)
94	{	93	{
95	return ubrk_last(bi);	94	return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
96	}	95	}
97		96
98	int textBreakNext(TextBreakIterator* bi)	97	int textBreakNext(TextBreakIterator* iterator)
99	{	98	{
100	return ubrk_next(bi);	99	return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
101	}	100	}
102		101
103	int textBreakPrevious(TextBreakIterator* bi)	102	int textBreakPrevious(TextBreakIterator* iterator)
104	{	103	{
105	return ubrk_previous(bi);	104	return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
106	}	105	}
107		106
108	int textBreakPreceding(TextBreakIterator* bi, int pos)	107	int textBreakPreceding(TextBreakIterator* iterator, int pos)
109	{	108	{
110	return ubrk_preceding(bi, pos);	109	return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
111	}	110	}
112		111
113	int textBreakFollowing(TextBreakIterator* bi, int pos)	112	int textBreakFollowing(TextBreakIterator* iterator, int pos)
114	{	113	{
115	return ubrk_following(bi, pos);	114	return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
116	}	115	}
117		116
118	int textBreakCurrent(TextBreakIterator* bi)	117	int textBreakCurrent(TextBreakIterator* iterator)
119	{	118	{
120	return ubrk_current(bi);	119	return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
121	}	120	}
122		121
123	bool isTextBreak(TextBreakIterator* bi, int pos)	122	bool isTextBreak(TextBreakIterator* iterator, int position)
124	{	123	{
125	return ubrk_isBoundary(bi, pos);	124	return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
126	}	125	}
127		126
Lines 137-141 Link Here
137	UErrorCode openStatus = U_ZERO_ERROR;	136	UErrorCode openStatus = U_ZERO_ERROR;
138	String rules(breakRules);	137	String rules(breakRules);
139	iterator = static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));	138	iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
140	createdIterator = true;	139	createdIterator = true;
141	ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);	140	ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
Lines 145-149 Link Here
145		144
146	UErrorCode setTextStatus = U_ZERO_ERROR;	145	UErrorCode setTextStatus = U_ZERO_ERROR;
147	ubrk_setText(iterator, string, length, &setTextStatus);	146	ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
148	if (U_FAILURE(setTextStatus))	147	if (U_FAILURE(setTextStatus))
149	return 0;	148	return 0;