Diff
Modified: trunk/Tools/ChangeLog (234062 => 234063)
--- trunk/Tools/ChangeLog 2018-07-20 19:57:37 UTC (rev 234062)
+++ trunk/Tools/ChangeLog 2018-07-20 21:03:37 UTC (rev 234063)
@@ -1,5 +1,20 @@
2018-07-20 Dean Jackson <[email protected]>
+ Accidentally checked in the wrong version of these files.
+
+ * lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj:
+ * lldb/lldbWebKitTester/main.cpp:
+ (testSummaryProviders):
+ * lldb/lldb_webkit_unittest.py:
+ (TestSummaryProviders.serial_test_WTFVectorProvider_vector_size_and_capacity):
+ (TestSummaryProviders.serial_test_WebCoreColorProvider_invalid_color): Deleted.
+ (TestSummaryProviders.serial_test_WebCoreColorProvider_extended_color): Deleted.
+ (TestSummaryProviders.serial_test_WebCoreColorProvider_rgb_color): Deleted.
+ (TestSummaryProviders.serial_test_WebCoreColorProvider_rgba_color): Deleted.
+ (TestSummaryProviders.serial_test_WebCoreColorProvider_semantic_color): Deleted.
+
+2018-07-20 Dean Jackson <[email protected]>
+
Provide an lldb type summary for WebCore::Color
https://bugs.webkit.org/show_bug.cgi?id=187776
Modified: trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj (234062 => 234063)
--- trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj 2018-07-20 19:57:37 UTC (rev 234062)
+++ trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj 2018-07-20 21:03:37 UTC (rev 234063)
@@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */
0FC1C35420E5391E001E9FB0 /* DumpClassLayoutTesting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC1C35320E5391E001E9FB0 /* DumpClassLayoutTesting.cpp */; };
- 3156A19320FEEE3200CA3BA3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3156A19220FEEE3200CA3BA3 /* WebKit.framework */; };
7CB6844B1AFA7978002B305C /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CB6844A1AFA7978002B305C /* main.cpp */; };
CE6C3AFF20C0B17B003E33D8 /* libWTF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6C3AFE20C0B17B003E33D8 /* libWTF.a */; };
CE6C3B0120C0C444003E33D8 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6C3B0020C0C443003E33D8 /* libicucore.dylib */; };
@@ -29,7 +28,6 @@
/* Begin PBXFileReference section */
0FC1C35320E5391E001E9FB0 /* DumpClassLayoutTesting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DumpClassLayoutTesting.cpp; sourceTree = "<group>"; };
0FC1C35520E53932001E9FB0 /* DumpClassLayoutTesting.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DumpClassLayoutTesting.h; sourceTree = "<group>"; };
- 3156A19220FEEE3200CA3BA3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = WebKit.framework; sourceTree = "<group>"; };
7C2227511AFC4D9C008C3338 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
7C2227521AFC4D9C008C3338 /* lldbWebKitTester.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = lldbWebKitTester.xcconfig; sourceTree = "<group>"; };
7C2227531AFC4D9C008C3338 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
@@ -46,7 +44,6 @@
files = (
CE6C3B0120C0C444003E33D8 /* libicucore.dylib in Frameworks */,
CE6C3AFF20C0B17B003E33D8 /* libWTF.a in Frameworks */,
- 3156A19320FEEE3200CA3BA3 /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -96,7 +93,6 @@
children = (
CE6C3B0020C0C443003E33D8 /* libicucore.dylib */,
CE6C3AFE20C0B17B003E33D8 /* libWTF.a */,
- 3156A19220FEEE3200CA3BA3 /* WebKit.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Modified: trunk/Tools/lldb/lldbWebKitTester/main.cpp (234062 => 234063)
--- trunk/Tools/lldb/lldbWebKitTester/main.cpp 2018-07-20 19:57:37 UTC (rev 234062)
+++ trunk/Tools/lldb/lldbWebKitTester/main.cpp 2018-07-20 21:03:37 UTC (rev 234063)
@@ -23,10 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define WEBCORE_EXPORT
-
#include "DumpClassLayoutTesting.h"
-#include <WebCore/Color.h>
#include <stdio.h>
#include <wtf/text/StringBuilder.h>
#include <wtf/text/WTFString.h>
@@ -64,12 +61,6 @@
aVectorWithOneItem.reserveCapacity(16);
aVectorWithOneItem.append(1);
- auto invalidColor = WebCore::Color { };
- auto rgbColor = WebCore::Color { 255, 128, 64 };
- auto rgbaColor = WebCore::Color { 255, 128, 64, 128 };
- auto extendedColor = WebCore::Color { 0.1, 0.2, 0.3, 0.4, WebCore::ColorSpaceDisplayP3 };
- auto semanticColor = WebCore::Color { WebCore::makeRGBA(255, 255, 255, 255), WebCore::Color::Semantic };
-
breakForTestingSummaryProviders();
}
Modified: trunk/Tools/lldb/lldb_webkit_unittest.py (234062 => 234063)
--- trunk/Tools/lldb/lldb_webkit_unittest.py 2018-07-20 19:57:37 UTC (rev 234062)
+++ trunk/Tools/lldb/lldb_webkit_unittest.py 2018-07-20 21:03:37 UTC (rev 234063)
@@ -152,30 +152,3 @@
self.assertIsNotNone(variable)
summary = lldb_webkit.WTFVector_SummaryProvider(variable, {})
self.assertEqual(summary, "{ size = 1, capacity = 16 }")
-
- # MARK: WebCoreColor_SummaryProvider test cases
-
- def serial_test_WebCoreColorProvider_invalid_color(self):
- variable = self._sbFrame.FindVariable('invalidColor')
- summary = lldb_webkit.WebCoreColorProvider_SummaryProvider(variable, {})
- self.assertEqual(summary, "{ invalid }")
-
- def serial_test_WebCoreColorProvider_extended_color(self):
- variable = self._sbFrame.FindVariable('extendedColor')
- summary = lldb_webkit.WebCoreColorProvider_SummaryProvider(variable, {})
- self.assertEqual(summary, "{ color(display-p3 0.10 0.20 0.30 / 0.40) }")
-
- def serial_test_WebCoreColorProvider_rgb_color(self):
- variable = self._sbFrame.FindVariable('rgbColor')
- summary = lldb_webkit.WebCoreColorProvider_SummaryProvider(variable, {})
- self.assertEqual(summary, "{ rgba(255, 128, 64, 1.00) }")
-
- def serial_test_WebCoreColorProvider_rgba_color(self):
- variable = self._sbFrame.FindVariable('rgbaColor')
- summary = lldb_webkit.WebCoreColorProvider_SummaryProvider(variable, {})
- self.assertEqual(summary, "{ rgba(255, 128, 64, 0.50) }")
-
- def serial_test_WebCoreColorProvider_semantic_color(self):
- variable = self._sbFrame.FindVariable('semanticColor')
- summary = lldb_webkit.WebCoreColorProvider_SummaryProvider(variable, {})
- self.assertEqual(summary, "{ rgba(255, 255, 255, 1.00) semantic }")
