Changeset 266017 in webkit

Timestamp:

Aug 21, 2020, 3:49:16 PM (5 years ago)

Author:

Simon Fraser

Message:

Fix the Color/ExtendedColor lldb data provider
​https://bugs.webkit.org/show_bug.cgi?id=215735

Reviewed by Darin Adler.

Fix the data provider for Color after Color and ExtendedColor internals changed.

• lldb/lldb_webkit.py:

(WebCoreColorProvider._to_string_extended):
(WebCoreColorProvider.to_string):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• lldb/lldb_webkit.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-08-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix the Color/ExtendedColor lldb data provider
+        https://bugs.webkit.org/show_bug.cgi?id=215735
+
+        Reviewed by Darin Adler.
+
+        Fix the data provider for Color after Color and ExtendedColor internals changed.
+
+        * lldb/lldb_webkit.py:
+        (WebCoreColorProvider._to_string_extended):
+        (WebCoreColorProvider.to_string):
+
 2020-08-21  Lauro Moura  <lmoura@igalia.com>
 

trunk/Tools/lldb/lldb_webkit.py

@@ -468 +468 @@
         extended_color = self.valobj.GetChildMemberWithName('m_colorData').GetChildMemberWithName('extendedColor').Dereference()
         profile = extended_color.GetChildMemberWithName('m_colorSpace').GetValue()
-        if profile == 'ColorSpaceSRGB':
+        if profile == 'SRGB':
             profile = 'srgb'
-        elif profile == 'ColorSpaceDisplayP3':
+        elif profile == 'LinearRGB':
+            profile = 'linear-rgb'
+        elif profile == 'DisplayP3':
             profile = 'display-p3'
         else:
             profile = 'unknown'
-        red = float(extended_color.GetChildMemberWithName('m_red').GetValue())
-        green = float(extended_color.GetChildMemberWithName('m_green').GetValue())
-        blue = float(extended_color.GetChildMemberWithName('m_blue').GetValue())
-        alpha = float(extended_color.GetChildMemberWithName('m_alpha').GetValue())
+
+        color_components = extended_color.GetChildMemberWithName('m_components')
+        std_array_elems = color_components.GetChildMemberWithName('components').GetChildMemberWithName('__elems_')
+
+        red = float(std_array_elems.GetChildAtIndex(0).GetValue())
+        green = float(std_array_elems.GetChildAtIndex(1).GetValue())
+        blue = float(std_array_elems.GetChildAtIndex(2).GetValue())
+        alpha = float(std_array_elems.GetChildAtIndex(3).GetValue())
         return "color(%s %1.2f %1.2f %1.2f / %1.2f)" % (profile, red, green, blue, alpha)
 
     def to_string(self):
-        rgba_and_flags = self.valobj.GetChildMemberWithName('m_colorData').GetChildMemberWithName('rgbaAndFlags').GetValueAsUnsigned(0)
+        rgba_and_flags = self.valobj.GetChildMemberWithName('m_colorData').GetChildMemberWithName('inlineColorAndFlags').GetValueAsUnsigned(0)
 
         if self._is_extended(rgba_and_flags):