Changeset 234040 in webkit


Ignore:
Timestamp:
Jul 20, 2018 8:44:44 AM (6 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r233943, r233988, r234004, and
r234012.
​https://bugs.webkit.org/show_bug.cgi?id=187856

webkitpy tests are failing to build lldbWebKitTester
(Requested by ryanhaddad on #webkit).

Reverted changesets:

"Provide an lldb type summary for WebCore::Color"
​https://bugs.webkit.org/show_bug.cgi?id=187776
​https://trac.webkit.org/changeset/233943

"Provide an lldb type summary for WebCore::Color"
​https://bugs.webkit.org/show_bug.cgi?id=187776
​https://trac.webkit.org/changeset/233988

"Provide an lldb type summary for WebCore::Color"
​https://bugs.webkit.org/show_bug.cgi?id=187776
​https://trac.webkit.org/changeset/234004

"Provide an lldb type summary for WebCore::Color"
​https://bugs.webkit.org/show_bug.cgi?id=187776
​https://trac.webkit.org/changeset/234012

Location:
trunk/Tools
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r234038 r234040  
     12018-07-20  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r233943, r233988, r234004, and
     4        r234012.
     5        https://bugs.webkit.org/show_bug.cgi?id=187856
     6
     7        webkitpy tests are failing to build lldbWebKitTester
     8        (Requested by ryanhaddad on #webkit).
     9
     10        Reverted changesets:
     11
     12        "Provide an lldb type summary for WebCore::Color"
     13        https://bugs.webkit.org/show_bug.cgi?id=187776
     14        https://trac.webkit.org/changeset/233943
     15
     16        "Provide an lldb type summary for WebCore::Color"
     17        https://bugs.webkit.org/show_bug.cgi?id=187776
     18        https://trac.webkit.org/changeset/233988
     19
     20        "Provide an lldb type summary for WebCore::Color"
     21        https://bugs.webkit.org/show_bug.cgi?id=187776
     22        https://trac.webkit.org/changeset/234004
     23
     24        "Provide an lldb type summary for WebCore::Color"
     25        https://bugs.webkit.org/show_bug.cgi?id=187776
     26        https://trac.webkit.org/changeset/234012
     27
    1282018-07-20  Philippe Normand  <pnormand@igalia.com>
    229

  • trunk/Tools/Scripts/build-lldbwebkittester

    r234012 r234040  
    6565buildProjectOrDie("Source/bmalloc", "bmalloc");
    6666buildProjectOrDie("Source/WTF", "WTF");
    67 buildProjectOrDie("Source/WebCore", "WebCore");
    68 buildProjectOrDie("Source/WebKit", "WebKit");
    6967buildProjectOrDie("Tools/lldb/lldbWebKitTester", "lldbWebKitTester");
    7068

  • trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig

    r234004 r234040  
    115115SDKROOT = macosx.internal;
    116116
    117 FRAMEWORK_SEARCH_PATHS = $(inherited) ${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/Frameworks;
    118 
    119117OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
    120118OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);

  • trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj

    r234004 r234040  
    99/* Begin PBXBuildFile section */
    1010                0FC1C35420E5391E001E9FB0 /* DumpClassLayoutTesting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC1C35320E5391E001E9FB0 /* DumpClassLayoutTesting.cpp */; };
    11                 3156A19521012D1E00CA3BA3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3156A19421012D1E00CA3BA3 /* WebKit.framework */; };
    1211                7CB6844B1AFA7978002B305C /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CB6844A1AFA7978002B305C /* main.cpp */; };
    1312                CE6C3AFF20C0B17B003E33D8 /* libWTF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6C3AFE20C0B17B003E33D8 /* libWTF.a */; };
    … …  
    3029                0FC1C35320E5391E001E9FB0 /* DumpClassLayoutTesting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DumpClassLayoutTesting.cpp; sourceTree = "<group>"; };
    3130                0FC1C35520E53932001E9FB0 /* DumpClassLayoutTesting.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DumpClassLayoutTesting.h; sourceTree = "<group>"; };
    32                 3156A19421012D1E00CA3BA3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    3331                7C2227511AFC4D9C008C3338 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
    3432                7C2227521AFC4D9C008C3338 /* lldbWebKitTester.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = lldbWebKitTester.xcconfig; sourceTree = "<group>"; };
    … …  
    4543                        buildActionMask = 2147483647;
    4644                        files = (
    47                                 3156A19521012D1E00CA3BA3 /* WebKit.framework in Frameworks */,
    4845                                CE6C3B0120C0C444003E33D8 /* libicucore.dylib in Frameworks */,
    4946                                CE6C3AFF20C0B17B003E33D8 /* libWTF.a in Frameworks */,
    … …  
    9592                        isa = PBXGroup;
    9693                        children = (
    97                                 3156A19421012D1E00CA3BA3 /* WebKit.framework */,
    9894                                CE6C3B0020C0C443003E33D8 /* libicucore.dylib */,
    9995                                CE6C3AFE20C0B17B003E33D8 /* libWTF.a */,

  • trunk/Tools/lldb/lldbWebKitTester/main.cpp

    r233943 r234040  
    2424 */
    2525
    26 #define WEBCORE_EXPORT
    27 
    2826#include "DumpClassLayoutTesting.h"
    2927#include <stdio.h>
    30 #include <WebCore/Color.h>
    3128#include <wtf/text/StringBuilder.h>
    3229#include <wtf/text/WTFString.h>
    … …  
    6562    aVectorWithOneItem.append(1);
    6663
    67     auto invalidColor = WebCore::Color { };
    68     auto rgbColor = WebCore::Color { 255, 128, 64 };
    69     auto rgbaColor = WebCore::Color { 255, 128, 64, 128 };
    70     auto extendedColor = WebCore::Color { 0.1, 0.2, 0.3, 0.4, WebCore::ColorSpaceDisplayP3 };
    71     auto semanticColor = WebCore::Color { WebCore::makeRGBA(255, 255, 255, 255), WebCore::Color::Semantic };
    72 
    7364    breakForTestingSummaryProviders();
    7465}

  • trunk/Tools/lldb/lldb_webkit.py

    r233943 r234040  
    4545    debugger.HandleCommand('type synthetic add -x "WTF::Vector<.+>$" --python-class lldb_webkit.WTFVectorProvider')
    4646    debugger.HandleCommand('type synthetic add -x "WTF::HashTable<.+>$" --python-class lldb_webkit.WTFHashTableProvider')
    47     debugger.HandleCommand('type summary add -F lldb_webkit.WebCoreColor_SummaryProvider WebCore::Color')
    4847    debugger.HandleCommand('type summary add -F lldb_webkit.WebCoreLayoutUnit_SummaryProvider WebCore::LayoutUnit')
    4948    debugger.HandleCommand('type summary add -F lldb_webkit.WebCoreLayoutSize_SummaryProvider WebCore::LayoutSize')
    … …  
    9897
    9998
    100 def WebCoreColor_SummaryProvider(valobj, dict):
    101     provider = WebCoreColorProvider(valobj, dict)
    102     return "{ %s }" % provider.to_string()
    103 
    104 
    10599def WebCoreURL_SummaryProvider(valobj, dict):
    106100    provider = WebCoreURLProvider(valobj, dict)
    … …  
    314308            return u""
    315309        return impl.to_string()
    316 
    317 
    318 class WebCoreColorProvider:
    319     "Print a WebCore::Color"
    320     def __init__(self, valobj, dict):
    321         self.valobj = valobj
    322 
    323     def _is_extended(self, rgba_and_flags):
    324         return not bool(rgba_and_flags & 0x1)
    325 
    326     def _is_valid(self, rgba_and_flags):
    327         # Assumes not extended.
    328         return bool(rgba_and_flags & 0x2)
    329 
    330     def _is_semantic(self, rgba_and_flags):
    331         # Assumes not extended.
    332         return bool(rgba_and_flags & 0x4)
    333 
    334     def _to_string_extended(self):
    335         extended_color = self.valobj.GetChildMemberWithName('m_colorData').GetChildMemberWithName('extendedColor').Dereference()
    336         profile = extended_color.GetChildMemberWithName('m_colorSpace').GetValue()
    337         if profile == 'ColorSpaceSRGB':
    338             profile = 'srgb'
    339         elif profile == 'ColorSpaceDisplayP3':
    340             profile = 'display-p3'
    341         else:
    342             profile = 'unknown'
    343         red = float(extended_color.GetChildMemberWithName('m_red').GetValue())
    344         green = float(extended_color.GetChildMemberWithName('m_green').GetValue())
    345         blue = float(extended_color.GetChildMemberWithName('m_blue').GetValue())
    346         alpha = float(extended_color.GetChildMemberWithName('m_alpha').GetValue())
    347         return "color(%s %1.2f %1.2f %1.2f / %1.2f)" % (profile, red, green, blue, alpha)
    348 
    349     def to_string(self):
    350         rgba_and_flags = self.valobj.GetChildMemberWithName('m_colorData').GetChildMemberWithName('rgbaAndFlags').GetValueAsUnsigned(0)
    351 
    352         if self._is_extended(rgba_and_flags):
    353             return self._to_string_extended()
    354 
    355         if not self._is_valid(rgba_and_flags):
    356             return 'invalid'
    357 
    358         color = rgba_and_flags >> 32
    359         red = (color >> 16) & 0xFF
    360         green = (color >> 8) & 0xFF
    361         blue = color & 0xFF
    362         alpha = ((color >> 24) & 0xFF) / 255.0
    363 
    364         semantic = ' semantic' if self._is_semantic(rgba_and_flags) else ""
    365 
    366         result = 'rgba(%d, %d, %d, %1.2f)%s' % (red, green, blue, alpha, semantic)
    367         return result
    368310
    369311

  • trunk/Tools/lldb/lldb_webkit_unittest.py

    r233943 r234040  
    153153        summary = lldb_webkit.WTFVector_SummaryProvider(variable, {})
    154154        self.assertEqual(summary, "{ size = 1, capacity = 16 }")
    155 
    156     # MARK: WebCoreColor_SummaryProvider test cases
    157 
    158     def serial_test_WebCoreColorProvider_invalid_color(self):
    159         variable = self._sbFrame.FindVariable('invalidColor');
    160         summary = lldb_webkit.WebCoreColor_SummaryProvider(variable, {})
    161         self.assertEqual(summary, "{ invalid }")
    162 
    163     def serial_test_WebCoreColorProvider_extended_color(self):
    164         variable = self._sbFrame.FindVariable('extendedColor');
    165         summary = lldb_webkit.WebCoreColor_SummaryProvider(variable, {})
    166         self.assertEqual(summary, "{ color(display-p3 0.10 0.20 0.30 / 0.40) }")
    167 
    168     def serial_test_WebCoreColorProvider_rgb_color(self):
    169         variable = self._sbFrame.FindVariable('rgbColor');
    170         summary = lldb_webkit.WebCoreColor_SummaryProvider(variable, {})
    171         self.assertEqual(summary, "{ rgba(255, 128, 64, 1.00) }")
    172 
    173     def serial_test_WebCoreColorProvider_rgba_color(self):
    174         variable = self._sbFrame.FindVariable('rgbaColor');
    175         summary = lldb_webkit.WebCoreColor_SummaryProvider(variable, {})
    176         self.assertEqual(summary, "{ rgba(255, 128, 64, 0.50) }")
    177 
    178     def serial_test_WebCoreColorProvider_semantic_color(self):
    179         variable = self._sbFrame.FindVariable('semanticColor');
    180         summary = lldb_webkit.WebCoreColor_SummaryProvider(variable, {})
    181         self.assertEqual(summary, "{ rgba(255, 255, 255, 1.00) semantic }")
    182 
Note: See TracChangeset for help on using the changeset viewer.