advanceByCombiningCharacterSequence() can be simplified

https://bugs.webkit.org/show_bug.cgi?id=133591

Reviewed by Dean Jackson.

Use U16_NEXT() because it already does what we're trying to do.

No new tests because there is no behavior change.

* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::advanceByCombiningCharacterSequence):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@170402 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 338b4f55cb09ad841aa02173afeb4bc479e3c22e..9676d1f3325b13706fe3dbde3de400df20106d83 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2014-06-24  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        advanceByCombiningCharacterSequence() can be simplified
+        https://bugs.webkit.org/show_bug.cgi?id=133591
+
+        Reviewed by Dean Jackson.
+
+        Use U16_NEXT() because it already does what we're trying to do.
+
+        No new tests because there is no behavior change.
+
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::advanceByCombiningCharacterSequence):
+
 2014-06-24  Brady Eidson  <beidson@apple.com>
 
         Enable GAMEPAD in the Mac build, but disabled at runtime.

diff --git a/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp b/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
index 42a971c6452b5b659703a7f8ee968aff482f81b3..3cc44c201ecd1649e2c9bc2dc7d96c33f2d84dab 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
+++ b/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
@@ -268,18 +268,12 @@ static bool advanceByCombiningCharacterSequence(const UChar*& iterator, const UC
 
     markCount = 0;
 
-    baseCharacter = *iterator++;
-
-    if (U16_IS_SURROGATE(baseCharacter)) {
-        if (!U16_IS_LEAD(baseCharacter))
-            return false;
-        if (iterator == end)
-            return false;
-        UChar trail = *iterator++;
-        if (!U16_IS_TRAIL(trail))
-            return false;
-        baseCharacter = U16_GET_SUPPLEMENTARY(baseCharacter, trail);
-    }
+    unsigned i = 0;
+    U16_NEXT(iterator, i, end - iterator, baseCharacter);
+    iterator = iterator + i;
+
+    if (U16_IS_SURROGATE(baseCharacter))
+        return false;
 
     // Consume marks.
     while (iterator < end) {