Title: [233775] trunk/Tools
- Revision
- 233775
- Author
- [email protected]
- Date
- 2018-07-12 11:37:47 -0700 (Thu, 12 Jul 2018)
Log Message
Make WebKit.LinkColorWithSystemAppearance work across system versions.
https://bugs.webkit.org/show_bug.cgi?id=187573
Reviewed by Wenson Hsieh.
* TestWebKitAPI/Tests/WebKitCocoa/SystemColors.mm:
(TestWebKitAPI.WebKit.LinkColorWithSystemAppearance): Dynamically generate the expected string.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (233774 => 233775)
--- trunk/Tools/ChangeLog 2018-07-12 18:35:27 UTC (rev 233774)
+++ trunk/Tools/ChangeLog 2018-07-12 18:37:47 UTC (rev 233775)
@@ -1,3 +1,13 @@
+2018-07-12 Timothy Hatcher <[email protected]>
+
+ Make WebKit.LinkColorWithSystemAppearance work across system versions.
+ https://bugs.webkit.org/show_bug.cgi?id=187573
+
+ Reviewed by Wenson Hsieh.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/SystemColors.mm:
+ (TestWebKitAPI.WebKit.LinkColorWithSystemAppearance): Dynamically generate the expected string.
+
2018-07-11 Carlos Garcia Campos <[email protected]>
[WPE] Pass the backend library name as command line parameter to the web process
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SystemColors.mm (233774 => 233775)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SystemColors.mm 2018-07-12 18:35:27 UTC (rev 233774)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/SystemColors.mm 2018-07-12 18:37:47 UTC (rev 233775)
@@ -32,6 +32,10 @@
#import <WebKit/WKWebViewPrivate.h>
#import <wtf/RetainPtr.h>
+#if PLATFORM(MAC)
+#import <pal/spi/cocoa/NSColorSPI.h>
+#endif
+
namespace TestWebKitAPI {
TEST(WebKit, LinkColor)
@@ -52,8 +56,16 @@
[webView synchronouslyLoadHTMLString:@"<a href>Test</a>"];
- NSString *linkColor = [webView stringByEvaluatingJavaScript:@"getComputedStyle(document.links[0]).color"];
- EXPECT_WK_STREQ("rgb(0, 104, 218)", linkColor);
+ NSColor *linkColor = [NSColor.linkColor colorUsingColorSpace:NSColorSpace.sRGBColorSpace];
+
+ CGFloat red = linkColor.redComponent * 255;
+ CGFloat green = linkColor.greenComponent * 255;
+ CGFloat blue = linkColor.blueComponent * 255;
+
+ NSString *expectedString = [NSString stringWithFormat:@"rgb(%.0f, %.0f, %.0f)", red, green, blue];
+
+ NSString *cssLinkColor = [webView stringByEvaluatingJavaScript:@"getComputedStyle(document.links[0]).color"];
+ EXPECT_WK_STREQ(expectedString.UTF8String, cssLinkColor);
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
