Title: [127821] trunk/Source/WTF
- Revision
- 127821
- Author
- msab...@apple.com
- Date
- 2012-09-06 21:48:23 -0700 (Thu, 06 Sep 2012)
Log Message
StringBuilder::toAtomicString() can create an 16 bit string with 8 bit contents
https://bugs.webkit.org/show_bug.cgi?id=96029
Reviewed by Benjamin Poulain.
Added 8 bit path when creating an AtomicString from a partial 8 bit buffer.
* wtf/text/StringBuilder.h:
(WTF::StringBuilder::toAtomicString):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (127820 => 127821)
--- trunk/Source/WTF/ChangeLog 2012-09-07 04:39:50 UTC (rev 127820)
+++ trunk/Source/WTF/ChangeLog 2012-09-07 04:48:23 UTC (rev 127821)
@@ -1,5 +1,17 @@
2012-09-06 Michael Saboff <msab...@apple.com>
+ StringBuilder::toAtomicString() can create an 16 bit string with 8 bit contents
+ https://bugs.webkit.org/show_bug.cgi?id=96029
+
+ Reviewed by Benjamin Poulain.
+
+ Added 8 bit path when creating an AtomicString from a partial 8 bit buffer.
+
+ * wtf/text/StringBuilder.h:
+ (WTF::StringBuilder::toAtomicString):
+
+2012-09-06 Michael Saboff <msab...@apple.com>
+
16 bit JSRopeString up converts an 8 bit fibers to 16 bits during resolution
https://bugs.webkit.org/show_bug.cgi?id=95810
Modified: trunk/Source/WTF/wtf/text/StringBuilder.h (127820 => 127821)
--- trunk/Source/WTF/wtf/text/StringBuilder.h 2012-09-07 04:39:50 UTC (rev 127820)
+++ trunk/Source/WTF/wtf/text/StringBuilder.h 2012-09-07 04:48:23 UTC (rev 127821)
@@ -154,8 +154,11 @@
return AtomicString();
// If the buffer is sufficiently over-allocated, make a new AtomicString from a copy so its buffer is not so large.
- if (canShrink())
- return AtomicString(characters(), length());
+ if (canShrink()) {
+ if (is8Bit())
+ return AtomicString(characters8(), length());
+ return AtomicString(characters16(), length());
+ }
if (!m_string.isNull())
return AtomicString(m_string);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
