[webkit-changes] [133562] trunk/Source/WebCore

Mon, 05 Nov 2012 22:40:01 -0800

Title: [133562] trunk/Source/WebCore
Revision
133562
Author
[email protected]
Date
2012-11-05 22:41:29 -0800 (Mon, 05 Nov 2012)

Log Message

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

Patch by Glenn Adams <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (133561 => 133562)


--- trunk/Source/WebCore/ChangeLog	2012-11-06 06:25:40 UTC (rev 133561)
+++ trunk/Source/WebCore/ChangeLog	2012-11-06 06:41:29 UTC (rev 133562)
@@ -1,3 +1,23 @@
+2012-11-05  Glenn Adams  <[email protected]>
+
+        Ensure acquireLineBreakIterator signature consistency on non-ICU ports.
+        https://bugs.webkit.org/show_bug.cgi?id=101281
+
+        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):
+
 2012-11-05  Hayato Ito  <[email protected]>
 
         Use switch/case statements instead of if/elseif in CSSSelector.cpp

Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.cpp (133561 => 133562)


--- trunk/Source/WebCore/platform/text/TextBreakIterator.cpp	2012-11-06 06:25:40 UTC (rev 133561)
+++ trunk/Source/WebCore/platform/text/TextBreakIterator.cpp	2012-11-06 06:41:29 UTC (rev 133562)
@@ -50,12 +50,12 @@
 }
 
 #if !USE(ICU_UNICODE)
-TextBreakIterator* acquireLineBreakIterator(const LChar* string, int length, const AtomicString& locale)
+TextBreakIterator* acquireLineBreakIterator(const LChar* string, int length, const AtomicString& locale, LineBreakIteratorMode mode, bool isCJK)
 {
     Vector<UChar> utf16string(length);
     for (int i = 0; i < length; ++i)
         utf16string[i] = string[i];
-    return acquireLineBreakIterator(utf16string.data(), length, locale);
+    return acquireLineBreakIterator(utf16string.data(), length, locale, mode, isCJK);
 }
 #endif

Modified: trunk/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp (133561 => 133562)


--- trunk/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp	2012-11-06 06:25:40 UTC (rev 133561)
+++ trunk/Source/WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp	2012-11-06 06:41:29 UTC (rev 133562)
@@ -194,7 +194,7 @@
 };
 
 static TextBreakIterator* setUpIterator(bool& createdIterator, TextBreakIterator*& iterator,
-    UBreakIteratorType type, const UChar* string, int length)
+    UBreakIteratorType type, const UChar* string, int length, LineBreakIteratorMode, bool)
 {
     if (!string)
         return 0;
@@ -254,17 +254,17 @@
 static bool createdLineBreakIterator = false;
 static TextBreakIterator* staticLineBreakIterator;
 
-TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&)
+TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&, LineBreakIteratorMode mode, bool isCJK)
 {
     TextBreakIterator* lineBreakIterator = 0;
     if (!createdLineBreakIterator || staticLineBreakIterator) {
-        setUpIterator(createdLineBreakIterator, staticLineBreakIterator, UBRK_LINE, string, length);
+        setUpIterator(createdLineBreakIterator, staticLineBreakIterator, UBRK_LINE, string, length, mode, isCJK);
         swap(staticLineBreakIterator, lineBreakIterator);
     }
 
     if (!lineBreakIterator) {
         bool createdNewLineBreakIterator = false;
-        setUpIterator(createdNewLineBreakIterator, lineBreakIterator, UBRK_LINE, string, length);
+        setUpIterator(createdNewLineBreakIterator, lineBreakIterator, UBRK_LINE, string, length, mode, isCJK);
     }
 
     return lineBreakIterator;

Modified: trunk/Source/WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp (133561 => 133562)


--- trunk/Source/WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp	2012-11-06 06:25:40 UTC (rev 133561)
+++ trunk/Source/WebCore/platform/text/wince/TextBreakIteratorWinCE.cpp	2012-11-06 06:41:29 UTC (rev 133562)
@@ -256,7 +256,7 @@
 
 static TextBreakIterator* staticLineBreakIterator;
 
-TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&)
+TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&, LineBreakIteratorMode, bool)
 {
     TextBreakIterator* lineBreakIterator = 0;
     if (staticLineBreakIterator) {

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to