Title: [128345] trunk/Source/WebCore
Revision
128345
Author
msab...@apple.com
Date
2012-09-12 12:02:39 -0700 (Wed, 12 Sep 2012)

Log Message

Build fixed for http://trac.webkit.org/changeset/128243

Unreviewed build fix.

Change UnicodeString::extract for gcc based on ICU fix described in
http://bugs.icu-project.org/trac/ticket/8197.

* icu/unicode/unistr.h:
(UnicodeString::extract):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (128344 => 128345)


--- trunk/Source/WebCore/ChangeLog	2012-09-12 18:49:25 UTC (rev 128344)
+++ trunk/Source/WebCore/ChangeLog	2012-09-12 19:02:39 UTC (rev 128345)
@@ -1,3 +1,15 @@
+2012-09-12  Michael Saboff  <msab...@apple.com>
+
+        Build fixed for http://trac.webkit.org/changeset/128243
+
+        Unreviewed build fix.
+
+        Change UnicodeString::extract for gcc based on ICU fix described in
+        http://bugs.icu-project.org/trac/ticket/8197.
+
+        * icu/unicode/unistr.h:
+        (UnicodeString::extract):
+
 2012-09-12  Christopher Cameron  <ccame...@chromium.org>
 
         [chromium] Evict textures through the texture manager instead of the resource provider

Modified: trunk/Source/WebCore/icu/unicode/unistr.h (128344 => 128345)


--- trunk/Source/WebCore/icu/unicode/unistr.h	2012-09-12 18:49:25 UTC (rev 128344)
+++ trunk/Source/WebCore/icu/unicode/unistr.h	2012-09-12 19:02:39 UTC (rev 128345)
@@ -4086,15 +4086,9 @@
 
 {
   // This dstSize value will be checked explicitly
-#if defined(__GNUC__)
-  // Ticket #7039: Clip length to the maximum valid length to the end of addressable memory given the starting address
-  // This is only an issue when using GCC and certain optimizations are turned on.
-  return extract(start, _length, dst, dst!=0 ? ((dst >= (char*)((size_t)-1) - UINT32_MAX) ? (((char*)UINT32_MAX) - dst) : UINT32_MAX) : 0, codepage);
-#else
+  // Removed #if defined(__GNUC__) per ICU defect http://bugs.icu-project.org/trac/ticket/8197
   return extract(start, _length, dst, dst!=0 ? 0xffffffff : 0, codepage);
-#endif
 }
-
 #endif
 
 inline void
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to