Changeset 248980 in webkit
- Timestamp:
- Aug 21, 2019 5:23:15 PM (5 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r248979 r248980 1 2019-08-21 Ryan Haddad <ryanhaddad@apple.com> 2 3 Unreviewed, rolling out r248970. 4 5 Caused 6 lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFOptionSetProvider_empty 7 to fail. 8 9 Reverted changeset: 10 11 "[lldb-webkit] OptionSet summary shows size 0 sometimes for 12 non-empty set" 13 https://bugs.webkit.org/show_bug.cgi?id=200742 14 https://trac.webkit.org/changeset/248970 15 1 16 2019-08-21 Jonathan Bedard <jbedard@apple.com> 2 17 -
trunk/Tools/lldb/lldb_webkit.py
r248970 r248980 736 736 def __init__(self, valobj, internal_dict): 737 737 self.valobj = valobj 738 self._elements = []739 738 self.update() 740 739 … … 752 751 pass 753 752 754 # Subclasses can override this to provide the index that corresponds to the specified name.755 # If this method is overridden then it is also expected that _get_child_at_index() will be756 # overridden to provide the value for the index returned by this method. Note that the757 # returned index must be greater than or equal to self.size in order to avoid breaking758 # printing of synthetic children.759 def _get_child_index(self, name):760 return None761 762 # Subclasses can override this to provide the SBValue for the specified index. It is only763 # meaningful to override this method if _get_child_index() is also overridden.764 def _get_child_at_index(self, index):765 return None766 767 @property768 def size(self):769 return len(self._elements)770 771 # LLDB overrides772 753 def has_children(self): 773 754 return bool(self._elements) … … 777 758 778 759 def get_child_index(self, name): 779 return self._get_child_index(name) 760 try: 761 return int(name.lstrip('[').rstrip(']')) 762 except: 763 return None 780 764 781 765 def get_child_at_index(self, index): … … 785 769 (name, value) = self._elements[index] 786 770 return self.valobj.CreateValueFromExpression(name, str(value)) 787 return self._get_child_at_index(index)771 return None 788 772 789 773 def update(self): 790 774 self._update() 775 776 self._elements = [] 777 self.size = 0 791 778 792 779 enumerator_value_to_name_map = self._enumerator_value_to_name_map() … … 807 794 bitmask = bitmask & (bitmask - 1) # Turn off the rightmost set bit. 808 795 self._elements = elements 796 self.size = len(elements) 797 809 798 810 799 class WTFOptionSetProvider(FlagEnumerationProvider): … … 823 812 def _update(self): 824 813 self.storage = self.valobj.GetChildMemberWithName('m_storage') # May be an invalid value. 825 826 def _get_child_index(self, name):827 if name == 'm_storage':828 return self.size829 return None830 831 def _get_child_at_index(self, index):832 if index == self.size:833 return self.storage834 return None835 814 836 815
Note: See TracChangeset
for help on using the changeset viewer.