From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebCore/rendering/break_lines.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/rendering/break_lines.cpp') diff --git a/Source/WebCore/rendering/break_lines.cpp b/Source/WebCore/rendering/break_lines.cpp index b888fb8..9ac3375 100644 --- a/Source/WebCore/rendering/break_lines.cpp +++ b/Source/WebCore/rendering/break_lines.cpp @@ -158,11 +158,10 @@ static inline TextBreakLocatorRef lineBreakLocator() } #endif -int nextBreakablePosition(const UChar* str, int pos, int len, bool treatNoBreakSpaceAsBreak) +int nextBreakablePosition(LazyLineBreakIterator& lazyBreakIterator, int pos, bool treatNoBreakSpaceAsBreak) { -#if !PLATFORM(MAC) || !defined(BUILDING_ON_TIGER) - TextBreakIterator* breakIterator = 0; -#endif + const UChar* str = lazyBreakIterator.string(); + int len = lazyBreakIterator.length(); int nextBreak = -1; UChar lastCh = pos > 0 ? str[pos - 1] : 0; @@ -175,8 +174,7 @@ int nextBreakablePosition(const UChar* str, int pos, int len, bool treatNoBreakS if (needsLineBreakIterator(ch) || needsLineBreakIterator(lastCh)) { if (nextBreak < i && i) { #if !PLATFORM(MAC) || !defined(BUILDING_ON_TIGER) - if (!breakIterator) - breakIterator = lineBreakIterator(str, len); + TextBreakIterator* breakIterator = lazyBreakIterator.get(); if (breakIterator) nextBreak = textBreakFollowing(breakIterator, i - 1); #else -- cgit v1.1