WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/RenderText.cpp

Index: third_party/WebKit/WebCore/rendering/RenderText.cpp
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderText.cpp	(revision 9391)
+++ third_party/WebKit/WebCore/rendering/RenderText.cpp	(working copy)
@@ -1165,6 +1165,15 @@
     if (result == TextBreakDone)
         result = current - 1;
 
+#ifdef BUILDING_ON_TIGER
+    // ICU 3.2 allows character breaks before a half-width Katakana voiced mark.
+    if (static_cast<unsigned>(result) < si->length()) {
+        UChar character = (*si)[result];
+        if (character == 0xFF9E || character == 0xFF9F)
+            --result;
+    }
+#endif
+
     return result;
 }
 
@@ -1279,6 +1288,15 @@
     if (result == TextBreakDone)
         result = current + 1;
 
+#ifdef BUILDING_ON_TIGER
+    // ICU 3.2 allows character breaks before a half-width Katakana voiced mark.
+    if (static_cast<unsigned>(result) < si->length()) {
+        UChar character = (*si)[result];
+        if (character == 0xFF9E || character == 0xFF9F)
+            ++result;
+    }
+#endif
+
     return result;
 }