Changeset 133562 in webkit


Ignore:
Timestamp:
Nov 5, 2012 10:41:29 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Ensure acquireLineBreakIterator signature consistency on non-ICU ports.
​https://bugs.webkit.org/show_bug.cgi?id=101281

Patch by Glenn Adams <​glenn@skynav.com> on 2012-11-05
Reviewed by Ryosuke Niwa.

Fix (newly) inconsistent signature for acquireLineBreakIterator for non-ICU ports
caused by ​http://trac.webkit.org/changeset/133529.

See new tests added from ​https://bugs.webkit.org/show_bug.cgi?id=89235.

  • platform/text/TextBreakIterator.cpp:

(WebCore::acquireLineBreakIterator):

  • platform/text/gtk/TextBreakIteratorGtk.cpp:

(WebCore::setUpIterator):
(WebCore::acquireLineBreakIterator):

  • platform/text/wince/TextBreakIteratorWinCE.cpp:

(WebCore::acquireLineBreakIterator):

Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r133561 r133562  
     12012-11-05  Glenn Adams  <glenn@skynav.com>
     2
     3        Ensure acquireLineBreakIterator signature consistency on non-ICU ports.
     4        https://bugs.webkit.org/show_bug.cgi?id=101281
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Fix (newly) inconsistent signature for acquireLineBreakIterator for non-ICU ports
     9        caused by http://trac.webkit.org/changeset/133529.
     10
     11        See new tests added from https://bugs.webkit.org/show_bug.cgi?id=89235.
     12
     13        * platform/text/TextBreakIterator.cpp:
     14        (WebCore::acquireLineBreakIterator):
     15        * platform/text/gtk/TextBreakIteratorGtk.cpp:
     16        (WebCore::setUpIterator):
     17        (WebCore::acquireLineBreakIterator):
     18        * platform/text/wince/TextBreakIteratorWinCE.cpp:
     19        (WebCore::acquireLineBreakIterator):
     20
    1212012-11-05  Hayato Ito  <hayato@chromium.org>
    222

  • trunk/Source/WebCore/platform/text/TextBreakIterator.cpp

    r129731 r133562  
    5151
    5252#if !USE(ICU_UNICODE)
    53 TextBreakIterator* acquireLineBreakIterator(const LChar* string, int length, const AtomicString& locale)
     53TextBreakIterator* acquireLineBreakIterator(const LChar* string, int length, const AtomicString& locale, LineBreakIteratorMode mode, bool isCJK)
    5454{
    5555    Vector<UChar> utf16string(length);
    5656    for (int i = 0; i < length; ++i)
    5757        utf16string[i] = string[i];
    58     return acquireLineBreakIterator(utf16string.data(), length, locale);
     58    return acquireLineBreakIterator(utf16string.data(), length, locale, mode, isCJK);
    5959}
    6060#endif

  • trunk/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp

    r129305 r133562  
    195195
    196196static TextBreakIterator* setUpIterator(bool& createdIterator, TextBreakIterator*& iterator,
    197     UBreakIteratorType type, const UChar* string, int length)
     197    UBreakIteratorType type, const UChar* string, int length, LineBreakIteratorMode, bool)
    198198{
    199199    if (!string)
    … …  
    255255static TextBreakIterator* staticLineBreakIterator;
    256256
    257 TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&)
     257TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&, LineBreakIteratorMode mode, bool isCJK)
    258258{
    259259    TextBreakIterator* lineBreakIterator = 0;
    260260    if (!createdLineBreakIterator || staticLineBreakIterator) {
    261         setUpIterator(createdLineBreakIterator, staticLineBreakIterator, UBRK_LINE, string, length);
     261        setUpIterator(createdLineBreakIterator, staticLineBreakIterator, UBRK_LINE, string, length, mode, isCJK);
    262262        swap(staticLineBreakIterator, lineBreakIterator);
    263263    }
    … …  
    265265    if (!lineBreakIterator) {
    266266        bool createdNewLineBreakIterator = false;
    267         setUpIterator(createdNewLineBreakIterator, lineBreakIterator, UBRK_LINE, string, length);
     267        setUpIterator(createdNewLineBreakIterator, lineBreakIterator, UBRK_LINE, string, length, mode, isCJK);
    268268    }
    269269

  • trunk/Source/WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp

    r127757 r133562  
    257257static TextBreakIterator* staticLineBreakIterator;
    258258
    259 TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&)
     259TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&, LineBreakIteratorMode, bool)
    260260{
    261261    TextBreakIterator* lineBreakIterator = 0;
Note: See TracChangeset for help on using the changeset viewer.