WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/RenderText.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 1147 matching lines @@
 {
     StringImpl* si = m_text.get();
     TextBreakIterator* iterator = characterBreakIterator(si->characters(), si->length());
     if (!iterator)
         return current - 1;
 
     long result = textBreakPreceding(iterator, current);
     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;
 }
 
 #define HANGUL_CHOSEONG_START (0x1100)
 #define HANGUL_CHOSEONG_END (0x115F)
 #define HANGUL_JUNGSEONG_START (0x1160)
 #define HANGUL_JUNGSEONG_END (0x11A2)
 #define HANGUL_JONGSEONG_START (0x11A8)
 #define HANGUL_JONGSEONG_END (0x11F9)
 #define HANGUL_SYLLABLE_START (0xAC00)
@@ skipping 94 matching lines @@
 {
     StringImpl* si = m_text.get();
     TextBreakIterator* iterator = characterBreakIterator(si->characters(), si->length());
     if (!iterator)
         return current + 1;
 
     long result = textBreakFollowing(iterator, current);
     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;
 }
 
 #ifndef NDEBUG
 
 void RenderText::checkConsistency() const
 {
 #ifdef CHECK_CONSISTENCY
     const InlineTextBox* prev = 0;
     for (const InlineTextBox* child = m_firstTextBox; child != 0; child = child->nextTextBox()) {
         ASSERT(child->object() == this);
         ASSERT(child->prevTextBox() == prev);
         prev = child;
     }
     ASSERT(prev == m_lastTextBox);
 #endif
 }
 
 #endif
 
 } // namespace WebCore