Skip to content

GitLab

T
tangled
Commit 67f59822 authored by jochen's avatar jochen Committed by Commit bot
Browse files
Options

Update gdb and lldb webkit macros after blink rename 

BUG=709930
R=dcheng@chromium.org,thakis@chromium.org,dpranke@chromium.org

Review-Url: https://codereview.chromium.org/2808813002
Cr-Commit-Position: refs/heads/master@{#463351}
parent 35113f63
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 57 deletions
third_party/WebKit/Tools/gdb/webkit.py
View file @ 67f59822
...@@ -110,25 +110,25 @@ class LCharStringPrinter(StringPrinter): ...@@ -110,25 +110,25 @@ class LCharStringPrinter(StringPrinter):
class WTFAtomicStringPrinter(StringPrinter): class WTFAtomicStringPrinter(StringPrinter):
"Print a WTF::AtomicString" "Print a WTF::AtomicString"
def to_string(self): def to_string(self):
return self.val['m_string'] return self.val['string_']
class WTFCStringPrinter(StringPrinter): class WTFCStringPrinter(StringPrinter):
"Print a WTF::CString" "Print a WTF::CString"
def to_string(self): def to_string(self):
# The CString holds a buffer, which is a refptr to a WTF::CStringBuffer. # The CString holds a buffer, which is a refptr to a WTF::CStringBuffer.
buf_ptr = self.val['m_buffer']['m_ptr'] buf_ptr = self.val['buffer_']['ptr_']
if not buf_ptr: if not buf_ptr:
return 0 return 0
data = (buf_ptr + 1).cast(gdb.lookup_type('char').pointer()) data = (buf_ptr + 1).cast(gdb.lookup_type('char').pointer())
length = self.val['m_buffer']['m_ptr']['m_length'] length = self.val['buffer_']['ptr_']['length_']
return ''.join([chr((data + i).dereference()) for i in range(length)]) return ''.join([chr((data + i).dereference()) for i in range(length)])
class WTFStringImplPrinter(StringPrinter): class WTFStringImplPrinter(StringPrinter):
"Print a WTF::StringImpl" "Print a WTF::StringImpl"
def get_length(self): def get_length(self):
return self.val['m_length'] return self.val['length_']
def to_string(self): def to_string(self):
chars_start = self.val.address + 1 chars_start = self.val.address + 1
...@@ -139,13 +139,13 @@ class WTFStringImplPrinter(StringPrinter): ...@@ -139,13 +139,13 @@ class WTFStringImplPrinter(StringPrinter):
self.get_length()) self.get_length())
def is_8bit(self): def is_8bit(self):
return self.val['m_is8Bit'] return self.val['is8_bit_']
class WTFStringPrinter(StringPrinter): class WTFStringPrinter(StringPrinter):
"Print a WTF::String" "Print a WTF::String"
def stringimpl_ptr(self): def stringimpl_ptr(self):
return self.val['m_impl']['m_ptr'] return self.val['impl_']['ptr_']
def get_length(self): def get_length(self):
if not self.stringimpl_ptr(): if not self.stringimpl_ptr():
...@@ -162,7 +162,7 @@ class WTFStringPrinter(StringPrinter): ...@@ -162,7 +162,7 @@ class WTFStringPrinter(StringPrinter):
class blinkKURLPrinter(StringPrinter): class blinkKURLPrinter(StringPrinter):
"Print a blink::KURL" "Print a blink::KURL"
def to_string(self): def to_string(self):
return WTFStringPrinter(self.val['m_string']).to_string() return WTFStringPrinter(self.val['string_']).to_string()
class blinkLayoutUnitPrinter: class blinkLayoutUnitPrinter:
...@@ -171,7 +171,7 @@ class blinkLayoutUnitPrinter: ...@@ -171,7 +171,7 @@ class blinkLayoutUnitPrinter:
self.val = val self.val = val
def to_string(self): def to_string(self):
return "%.14gpx" % (self.val['m_value'] / 64.0) return "%.14gpx" % (self.val['value_'] / 64.0)
class blinkLayoutSizePrinter: class blinkLayoutSizePrinter:
...@@ -180,7 +180,9 @@ class blinkLayoutSizePrinter: ...@@ -180,7 +180,9 @@ class blinkLayoutSizePrinter:
self.val = val self.val = val
def to_string(self): def to_string(self):
return 'LayoutSize(%s, %s)' % (blinkLayoutUnitPrinter(self.val['m_width']).to_string(), blinkLayoutUnitPrinter(self.val['m_height']).to_string()) return 'LayoutSize(%s, %s)' % (
blinkLayoutUnitPrinter(self.val['width_']).to_string(),
blinkLayoutUnitPrinter(self.val['height_']).to_string())
class blinkLayoutPointPrinter: class blinkLayoutPointPrinter:
...@@ -189,7 +191,9 @@ class blinkLayoutPointPrinter: ...@@ -189,7 +191,9 @@ class blinkLayoutPointPrinter:
self.val = val self.val = val
def to_string(self): def to_string(self):
return 'LayoutPoint(%s, %s)' % (blinkLayoutUnitPrinter(self.val['m_x']).to_string(), blinkLayoutUnitPrinter(self.val['m_y']).to_string()) return 'LayoutPoint(%s, %s)' % (
blinkLayoutUnitPrinter(self.val['x_']).to_string(),
blinkLayoutUnitPrinter(self.val['y_']).to_string())
class blinkQualifiedNamePrinter(StringPrinter): class blinkQualifiedNamePrinter(StringPrinter):
...@@ -199,11 +203,11 @@ class blinkQualifiedNamePrinter(StringPrinter): ...@@ -199,11 +203,11 @@ class blinkQualifiedNamePrinter(StringPrinter):
super(blinkQualifiedNamePrinter, self).__init__(val) super(blinkQualifiedNamePrinter, self).__init__(val)
self.prefix_length = 0 self.prefix_length = 0
self.length = 0 self.length = 0
if self.val['m_impl']: if self.val['impl_']:
self.prefix_printer = WTFStringPrinter( self.prefix_printer = WTFStringPrinter(
self.val['m_impl']['m_ptr']['m_prefix']['m_string']) self.val['impl_']['ptr_']['prefix_']['string_'])
self.local_name_printer = WTFStringPrinter( self.local_name_printer = WTFStringPrinter(
self.val['m_impl']['m_ptr']['m_localName']['m_string']) self.val['impl_']['ptr_']['local_name_']['string_'])
self.prefix_length = self.prefix_printer.get_length() self.prefix_length = self.prefix_printer.get_length()
if self.prefix_length > 0: if self.prefix_length > 0:
self.length = (self.prefix_length + 1 + self.length = (self.prefix_length + 1 +
...@@ -240,14 +244,14 @@ class BlinkLengthPrinter: ...@@ -240,14 +244,14 @@ class BlinkLengthPrinter:
self.val = val self.val = val
def to_string(self): def to_string(self):
ltype = self.val['m_type'] ltype = self.val['type_']
if self.val['m_isFloat']: if self.val['is_float_']:
val = self.val['m_floatValue'] val = self.val['float_value_']
else: else:
val = int(self.val['m_intValue']) val = int(self.val['int_value_'])
quirk = '' quirk = ''
if self.val['m_quirk']: if self.val['quirk_']:
quirk = ', quirk=true' quirk = ', quirk=true'
if ltype == 0: if ltype == 0:
...@@ -342,12 +346,12 @@ class WTFVectorPrinter: ...@@ -342,12 +346,12 @@ class WTFVectorPrinter:
self.val = val self.val = val
def children(self): def children(self):
start = self.val['m_buffer'] start = self.val['buffer_']
return self.Iterator(start, start + self.val['m_size']) return self.Iterator(start, start + self.val['size_'])
def to_string(self): def to_string(self):
return ('%s of length %d, capacity %d' return ('%s of length %d, capacity %d'
% ('WTF::Vector', self.val['m_size'], self.val['m_capacity'])) % ('WTF::Vector', self.val['size_'], self.val['capacity_']))
def display_hint(self): def display_hint(self):
return 'array' return 'array'
...@@ -371,7 +375,7 @@ class WTFRefOrOwnPtrPrinter: ...@@ -371,7 +375,7 @@ class WTFRefOrOwnPtrPrinter:
def to_string(self): def to_string(self):
type_without_param = re.sub(r'<.*>', '', self.val.type.name) type_without_param = re.sub(r'<.*>', '', self.val.type.name)
return '%s%s' % (type_without_param, typed_ptr(self.val['m_ptr'])) return '%s%s' % (type_without_param, typed_ptr(self.val['ptr_']))
class BlinkDataRefPrinter: class BlinkDataRefPrinter:
...@@ -380,7 +384,7 @@ class BlinkDataRefPrinter: ...@@ -380,7 +384,7 @@ class BlinkDataRefPrinter:
def to_string(self): def to_string(self):
return 'DataRef(%s)' % ( return 'DataRef(%s)' % (
WTFRefOrOwnPtrPrinter(self.val['m_data']).to_string()) WTFRefOrOwnPtrPrinter(self.val['data_']).to_string())
def add_pretty_printers(): def add_pretty_printers():
...@@ -452,8 +456,9 @@ class PrintPathToRootCommand(gdb.Command): ...@@ -452,8 +456,9 @@ class PrintPathToRootCommand(gdb.Command):
stack = [] stack = []
while val: while val:
stack.append([val, stack.append([val,
val.cast(element_type.pointer()).dereference()['m_tagName']]) val.cast(element_type.pointer()).dereference()[
val = val.dereference()['m_parent'] 'tag_name_']])
val = val.dereference()['parent_']
padding = '' padding = ''
while len(stack) > 0: while len(stack) > 0:
......
third_party/WebKit/Tools/lldb/lldb_webkit.py
View file @ 67f59822
...@@ -56,7 +56,7 @@ def WTFStringImpl_SummaryProvider(valobj, dict): ...@@ -56,7 +56,7 @@ def WTFStringImpl_SummaryProvider(valobj, dict):
def WTFAtomicString_SummaryProvider(valobj, dict): def WTFAtomicString_SummaryProvider(valobj, dict):
return WTFString_SummaryProvider(valobj.GetChildMemberWithName('m_string'), dict) return WTFString_SummaryProvider(valobj.GetChildMemberWithName('string_'), dict)
def WTFVector_SummaryProvider(valobj, dict): def WTFVector_SummaryProvider(valobj, dict):
...@@ -135,12 +135,14 @@ class WTFStringImplProvider: ...@@ -135,12 +135,14 @@ class WTFStringImplProvider:
self.valobj = valobj self.valobj = valobj
def get_length(self): def get_length(self):
return self.valobj.GetChildMemberWithName('m_length').GetValueAsUnsigned(0) return self.valobj.GetChildMemberWithName('length_').GetValueAsUnsigned(0)
def get_data8(self): def get_data8(self):
# FIXME: This should be the equivalent of reinterpret_cast<LChar*>(self.valobj + 1)
return self.valobj.GetChildAtIndex(2).GetChildMemberWithName('m_data8') return self.valobj.GetChildAtIndex(2).GetChildMemberWithName('m_data8')
def get_data16(self): def get_data16(self):
# FIXME: This should be the equivalent of reinterpret_cast<UChar*>(self.valobj + 1)
return self.valobj.GetChildAtIndex(2).GetChildMemberWithName('m_data16') return self.valobj.GetChildAtIndex(2).GetChildMemberWithName('m_data16')
def to_string(self): def to_string(self):
...@@ -150,9 +152,7 @@ class WTFStringImplProvider: ...@@ -150,9 +152,7 @@ class WTFStringImplProvider:
return ustring_to_string(self.get_data16(), error, self.get_length()) return ustring_to_string(self.get_data16(), error, self.get_length())
def is_8bit(self): def is_8bit(self):
# FIXME: find a way to access WTF::StringImpl::s_hashFlag8BitBuffer return self.valobj.GetChildMemberWithName('is8_bit_')
return bool(self.valobj.GetChildMemberWithName('m_hashAndFlags').GetValueAsUnsigned(0) \
& 1 << 6)
class WTFStringProvider: class WTFStringProvider:
...@@ -160,7 +160,7 @@ class WTFStringProvider: ...@@ -160,7 +160,7 @@ class WTFStringProvider:
self.valobj = valobj self.valobj = valobj
def stringimpl(self): def stringimpl(self):
impl_ptr = self.valobj.GetChildMemberWithName('m_impl').GetChildMemberWithName('m_ptr') impl_ptr = self.valobj.GetChildMemberWithName('impl_').GetChildMemberWithName('ptr_')
return WTFStringImplProvider(impl_ptr, dict) return WTFStringImplProvider(impl_ptr, dict)
def get_length(self): def get_length(self):
...@@ -182,7 +182,7 @@ class WebCoreLayoutUnitProvider: ...@@ -182,7 +182,7 @@ class WebCoreLayoutUnitProvider:
self.valobj = valobj self.valobj = valobj
def to_string(self): def to_string(self):
return "%gpx" % (self.valobj.GetChildMemberWithName('m_value').GetValueAsUnsigned(0) / 64.0) return "%gpx" % (self.valobj.GetChildMemberWithName('value_').GetValueAsUnsigned(0) / 64.0)
class WebCoreLayoutSizeProvider: class WebCoreLayoutSizeProvider:
...@@ -191,10 +191,10 @@ class WebCoreLayoutSizeProvider: ...@@ -191,10 +191,10 @@ class WebCoreLayoutSizeProvider:
self.valobj = valobj self.valobj = valobj
def get_width(self): def get_width(self):
return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('m_width'), dict).to_string() return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('width_'), dict).to_string()
def get_height(self): def get_height(self):
return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('m_height'), dict).to_string() return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('height_'), dict).to_string()
class WebCoreLayoutPointProvider: class WebCoreLayoutPointProvider:
...@@ -203,10 +203,10 @@ class WebCoreLayoutPointProvider: ...@@ -203,10 +203,10 @@ class WebCoreLayoutPointProvider:
self.valobj = valobj self.valobj = valobj
def get_x(self): def get_x(self):
return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('m_x'), dict).to_string() return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('x_'), dict).to_string()
def get_y(self): def get_y(self):
return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('m_y'), dict).to_string() return WebCoreLayoutUnitProvider(self.valobj.GetChildMemberWithName('y_'), dict).to_string()
class WTFVectorProvider: class WTFVectorProvider:
...@@ -218,20 +218,20 @@ class WTFVectorProvider: ...@@ -218,20 +218,20 @@ class WTFVectorProvider:
return self.size + 3 return self.size + 3
def get_child_index(self, name): def get_child_index(self, name):
if name == "m_size": if name == "size_":
return self.size return self.size
elif name == "m_capacity": elif name == "capacity_":
return self.size + 1 return self.size + 1
elif name == "m_buffer": elif name == "buffer_":
return self.size + 2 return self.size + 2
else: else:
return int(name.lstrip('[').rstrip(']')) return int(name.lstrip('[').rstrip(']'))
def get_child_at_index(self, index): def get_child_at_index(self, index):
if index == self.size: if index == self.size:
return self.valobj.GetChildMemberWithName("m_size") return self.valobj.GetChildMemberWithName("size_")
elif index == self.size + 1: elif index == self.size + 1:
return self.valobj.GetChildMemberWithName("m_capacity") return self.valobj.GetChildMemberWithName("capacity_")
elif index == self.size + 2: elif index == self.size + 2:
return self.buffer return self.buffer
elif index < self.size: elif index < self.size:
...@@ -242,9 +242,9 @@ class WTFVectorProvider: ...@@ -242,9 +242,9 @@ class WTFVectorProvider:
return None return None
def update(self): def update(self):
self.buffer = self.valobj.GetChildMemberWithName('m_buffer') self.buffer = self.valobj.GetChildMemberWithName('buffer_')
self.size = self.valobj.GetChildMemberWithName('m_size').GetValueAsUnsigned(0) self.size = self.valobj.GetChildMemberWithName('size_').GetValueAsUnsigned(0)
self.capacity = self.buffer.GetChildMemberWithName('m_capacity').GetValueAsUnsigned(0) self.capacity = self.buffer.GetChildMemberWithName('capacity_').GetValueAsUnsigned(0)
self.data_type = self.buffer.GetType().GetPointeeType() self.data_type = self.buffer.GetType().GetPointeeType()
self.data_size = self.data_type.GetByteSize() self.data_size = self.data_type.GetByteSize()
...@@ -261,41 +261,41 @@ class WTFHashTableProvider: ...@@ -261,41 +261,41 @@ class WTFHashTableProvider:
return self.tableSize() + 5 return self.tableSize() + 5
def get_child_index(self, name): def get_child_index(self, name):
if name == "m_table": if name == "table_":
return self.tableSize() return self.tableSize()
elif name == "m_tableSize": elif name == "table_size_":
return self.tableSize() + 1 return self.tableSize() + 1
elif name == "m_tableSizeMask": elif name == "table_size_mask_":
return self.tableSize() + 2 return self.tableSize() + 2
elif name == "m_keyCount": elif name == "key_count_":
return self.tableSize() + 3 return self.tableSize() + 3
elif name == "m_deletedCount": elif name == "deleted_count_":
return self.tableSize() + 4 return self.tableSize() + 4
else: else:
return int(name.lstrip('[').rstrip(']')) return int(name.lstrip('[').rstrip(']'))
def get_child_at_index(self, index): def get_child_at_index(self, index):
if index == self.tableSize(): if index == self.tableSize():
return self.valobj.GetChildMemberWithName('m_table') return self.valobj.GetChildMemberWithName('table_')
elif index == self.tableSize() + 1: elif index == self.tableSize() + 1:
return self.valobj.GetChildMemberWithName('m_tableSize') return self.valobj.GetChildMemberWithName('table_size_')
elif index == self.tableSize() + 2: elif index == self.tableSize() + 2:
return self.valobj.GetChildMemberWithName('m_tableSizeMask') return self.valobj.GetChildMemberWithName('table_size_mask_')
elif index == self.tableSize() + 3: elif index == self.tableSize() + 3:
return self.valobj.GetChildMemberWithName('m_keyCount') return self.valobj.GetChildMemberWithName('key_count_')
elif index == self.tableSize() + 4: elif index == self.tableSize() + 4:
return self.valobj.GetChildMemberWithName('m_deletedCount') return self.valobj.GetChildMemberWithName('deleted_count_')
elif index < self.tableSize(): elif index < self.tableSize():
table = self.valobj.GetChildMemberWithName('m_table') table = self.valobj.GetChildMemberWithName('table_')
return table.CreateChildAtOffset('[' + str(index) + ']', index * self.data_size, self.data_type) return table.CreateChildAtOffset('[' + str(index) + ']', index * self.data_size, self.data_type)
else: else:
return None return None
def tableSize(self): def tableSize(self):
return self.valobj.GetChildMemberWithName('m_tableSize').GetValueAsUnsigned(0) return self.valobj.GetChildMemberWithName('table_size_').GetValueAsUnsigned(0)
def keyCount(self): def keyCount(self):
return self.valobj.GetChildMemberWithName('m_keyCount').GetValueAsUnsigned(0) return self.valobj.GetChildMemberWithName('key_count_').GetValueAsUnsigned(0)
def update(self): def update(self):
self.data_type = self.valobj.GetType().GetTemplateArgumentType(0) self.data_type = self.valobj.GetType().GetTemplateArgumentType(0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment