Changeset 102083 in webkit

Timestamp:

Dec 5, 2011, 6:07:23 PM (15 years ago)

Author:

kubo@profusion.mobi

Message:

webkit.py: Really fix the printing of StringImpl now that 8-bit strings are present.
​https://bugs.webkit.org/show_bug.cgi?id=73878

Reviewed by Tony Chang.

r98624 turned StringImpl::m_data into StringImpl::{m_data8,m_data16}.
r98785 made webkit.py always use m_data16, which does not work when
the string is an 8-bit string (such as KURL::string()).

I was not able to directly call StringImpl::is8Bit() in the Python
code, so I just reproduced the implementation there.

• gdb/webkit.py:

(WTFStringPrinter.is_8bit): Reproduced StringImpl::is8Bit().
(WTFStringPrinter.to_string):
(JSCUStringPrinter.is_8bit): Reproduced StringImpl::is8Bit().
(JSCUStringPrinter.to_string):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gdb/webkit.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-05  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        webkit.py: Really fix the printing of StringImpl now that 8-bit strings are present.
+        https://bugs.webkit.org/show_bug.cgi?id=73878
+
+        Reviewed by Tony Chang.
+
+        r98624 turned StringImpl::m_data into StringImpl::{m_data8,m_data16}.
+        r98785 made webkit.py always use m_data16, which does not work when
+        the string is an 8-bit string (such as KURL::string()).
+
+        I was not able to directly call StringImpl::is8Bit() in the Python
+        code, so I just reproduced the implementation there.
+
+        * gdb/webkit.py:
+        (WTFStringPrinter.is_8bit): Reproduced StringImpl::is8Bit().
+        (WTFStringPrinter.to_string):
+        (JSCUStringPrinter.is_8bit): Reproduced StringImpl::is8Bit().
+        (JSCUStringPrinter.to_string):
+
 2011-12-05  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/gdb/webkit.py

@@ -108 +108 @@
         return self.val['m_impl']['m_ptr']['m_length']
 
+    def is_8bit(self):
+        return self.val['m_impl']['m_ptr']['m_hashAndFlags'] & self.val['m_impl']['m_ptr']['s_hashFlag8BitBuffer']
+
     def to_string(self):
         if self.get_length() == 0:
             return '(null)'
 
-        return ustring_to_string(self.val['m_impl']['m_ptr']['m_data16'],
+        if self.is_8bit():
+            data_member = 'm_data8'
+        else:
+            data_member = 'm_data16'
+
+        return ustring_to_string(self.val['m_impl']['m_ptr'][data_member],
                                  self.get_length())
 
@@ -123 +131 @@
         return self.val['m_impl']['m_ptr']['m_length']
 
+    def is_8bit(self):
+        return self.val['m_impl']['m_ptr']['m_hashAndFlags'] & self.val['m_impl']['m_ptr']['s_hashFlag8BitBuffer']
+
     def to_string(self):
         if self.get_length() == 0:
             return ''
 
-        return ustring_to_string(self.val['m_impl']['m_ptr']['m_data16'],
+        if self.is_8bit():
+            data_member = 'm_data8'
+        else:
+            data_member = 'm_data16'
+
+        return ustring_to_string(self.val['m_impl']['m_ptr'][data_member],
                                  self.get_length())