Title: [170411] trunk/Source/WebCore
Revision
170411
Author
rn...@webkit.org
Date
2014-06-24 17:53:24 -0700 (Tue, 24 Jun 2014)

Log Message

Speculative 32-bit Mac build fix after r170402.

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (170410 => 170411)


--- trunk/Source/WebCore/ChangeLog	2014-06-25 00:36:53 UTC (rev 170410)
+++ trunk/Source/WebCore/ChangeLog	2014-06-25 00:53:24 UTC (rev 170411)
@@ -1,3 +1,10 @@
+2014-06-24  Ryosuke Niwa  <rn...@webkit.org>
+
+        Speculative 32-bit Mac build fix after r170402.
+
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::advanceByCombiningCharacterSequence):
+
 2014-06-24  Joseph Pecoraro  <pecor...@apple.com>
 
         [iOS]: WK2 Inspector Node Highlighting

Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (170410 => 170411)


--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp	2014-06-25 00:36:53 UTC (rev 170410)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp	2014-06-25 00:53:24 UTC (rev 170411)
@@ -269,7 +269,8 @@
     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))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to