diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/rendering/break_lines.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/rendering/break_lines.h')
| -rw-r--r-- | Source/WebCore/rendering/break_lines.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Source/WebCore/rendering/break_lines.h b/Source/WebCore/rendering/break_lines.h index 4d6b8dc..6600e52 100644 --- a/Source/WebCore/rendering/break_lines.h +++ b/Source/WebCore/rendering/break_lines.h @@ -25,14 +25,16 @@ namespace WebCore { - int nextBreakablePosition(const UChar*, int pos, int len, bool breakNBSP = false); - - inline bool isBreakable(const UChar* str, int pos, int len, int& nextBreakable, bool breakNBSP = false) - { - if (pos > nextBreakable) - nextBreakable = nextBreakablePosition(str, pos, len, breakNBSP); - return pos == nextBreakable; - } +class LazyLineBreakIterator; + +int nextBreakablePosition(LazyLineBreakIterator&, int pos, bool breakNBSP = false); + +inline bool isBreakable(LazyLineBreakIterator& lazyBreakIterator, int pos, int& nextBreakable, bool breakNBSP = false) +{ + if (pos > nextBreakable) + nextBreakable = nextBreakablePosition(lazyBreakIterator, pos, breakNBSP); + return pos == nextBreakable; +} } // namespace WebCore |