From: Steve Block <steveblock@google.com>
Date: Tue, 2 Feb 2010 18:31:32 +0000 (+0000)
Subject: Merge webkit.org at r54127 : Fix merge conflict in break_lines.cpp
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9436923afbaf725afc7f71307ebc992c0c7ee1fa;p=android-x86%2Fexternal-webkit.git

Merge webkit.org at r54127 : Fix merge conflict in break_lines.cpp

See http://trac.webkit.org/changeset/53839

Change-Id: I123e8296c4b6bcfa4abd70ef67f9db14275bdf4c
---

diff --git a/WebCore/rendering/break_lines.cpp b/WebCore/rendering/break_lines.cpp
index bbd86eba0..4b6c0aada 100644
--- a/WebCore/rendering/break_lines.cpp
+++ b/WebCore/rendering/break_lines.cpp
@@ -70,22 +70,19 @@ static inline bool shouldBreakAfter(UChar ch, UChar nextCh)
         // For a question mark preceding a non-ASCII characters, defer to the Unicode algorithm by returning false.
         // For ASCII characters, use a lookup table for enhanced speed and for compatibility with Internet Explorer. 
         case '?':
-<<<<<<< HEAD
-#ifdef ANDROID_LAYOUT
-        // as '/' is used in uri which is always long, we would like to break it
-        case '/':
-#endif
-=======
             return nextCh < internetExplorerLineBreaksAfterQuestionMarkTableSize && internetExplorerLineBreaksAfterQuestionMarkTable[nextCh];
         // Internet Explorer always allows breaking after a hyphen.
         case '-':
->>>>>>> webkit.org at r54127
         case softHyphen:
         // FIXME: cases for ideographicComma and ideographicFullStop are a workaround for an issue in Unicode 5.0
         // which is likely to be resolved in Unicode 5.1 <http://bugs.webkit.org/show_bug.cgi?id=17411>.
         // We may want to remove or conditionalize this workaround at some point.
         case ideographicComma:
         case ideographicFullStop:
+#ifdef ANDROID_LAYOUT
+        // as '/' is used in uri which is always long, we would like to break it
+        case '/':
+#endif
             return true;
         default:
             return false;