Bug 1554998 - fix conflict resolution. a=bustage-fix
authorJulien Cristau <jcristau@mozilla.com>
Fri, 31 May 2019 19:11:04 +0200
changeset 536605 76bfda75e9aae3b3384eb11e6718ca7d39d3c3cf
parent 536604 96f529152295d6551c17f7d7f70eeaa578e375b2
child 536606 1a9fa6e119d1b687695248a64d9d68356e511aed
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1554998
milestone68.0
Bug 1554998 - fix conflict resolution. a=bustage-fix
intl/lwbrk/LineBreaker.cpp
--- a/intl/lwbrk/LineBreaker.cpp
+++ b/intl/lwbrk/LineBreaker.cpp
@@ -980,23 +980,18 @@ void LineBreaker::GetJISx4051Breaks(cons
       cl = ContextualAnalysis(cur > 0 ? aChars[cur - 1] : U_NULL, ch,
                               cur + 1 < aLength ? aChars[cur + 1] : U_NULL,
                               state);
     } else {
       if (ch == U_EQUAL) state.NotifySeenEqualsSign();
       state.NotifyNonHyphenCharacter(ch);
       cl = GetClass(ch);
     }
-<<<<<<< local
     if (aWordBreak == LineBreaker::kWordBreak_BreakAll &&
-        (cl == CLASS_CHARACTER || cl == CLASS_CLOSE)) {
-=======
-    if (aWordBreak == WordBreak::BreakAll &&
         (cl == CLASS_CHARACTER || cl == CLASS_CLOSE || cl == CLASS_NUMERIC)) {
->>>>>>> graft
       auto cls = GetLineBreakClass(ch);
       // Don't need to check additional Japanese/Korean classes in 8-bit
       if (cls == U_LB_ALPHABETIC || cls == U_LB_NUMERIC ||
           cls == U_LB_COMPLEX_CONTEXT) {
         cl = CLASS_BREAKABLE;
       }
     }