Speculative 32-bit Mac build fix after r170402.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jun 2014 00:53:24 +0000 (00:53 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Jun 2014 00:53:24 +0000 (00:53 +0000)
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::advanceByCombiningCharacterSequence):

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

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/mac/ComplexTextController.cpp

index 90f8537f21ce851b664097a67b52baa6bd278628..3c507cc88ed213684d141e02ea000c52bb3b4dd9 100644 (file)
@@ -1,3 +1,10 @@
+2014-06-24  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Speculative 32-bit Mac build fix after r170402.
+
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::advanceByCombiningCharacterSequence):
+
 2014-06-24  Joseph Pecoraro  <pecoraro@apple.com>
 
         [iOS]: WK2 Inspector Node Highlighting
index 3cc44c201ecd1649e2c9bc2dc7d96c33f2d84dab..0811912a5b1ddacbb80283e36ac2bc92342b613c 100644 (file)
@@ -269,7 +269,8 @@ static bool advanceByCombiningCharacterSequence(const UChar*& iterator, const UC
     markCount = 0;
 
     unsigned i = 0;
-    U16_NEXT(iterator, i, end - iterator, baseCharacter);
+    unsigned remainingCharacters = end - iterator;
+    U16_NEXT(iterator, i, remainingCharacters, baseCharacter);
     iterator = iterator + i;
 
     if (U16_IS_SURROGATE(baseCharacter))