Modified: trunk/Tools/ChangeLog (238240 => 238241)
--- trunk/Tools/ChangeLog 2018-11-15 20:28:07 UTC (rev 238240)
+++ trunk/Tools/ChangeLog 2018-11-15 20:32:38 UTC (rev 238241)
@@ -1,3 +1,14 @@
+2018-11-15 Timothy Hatcher <timo...@apple.com>
+
+ REGRESSION (r238212): WebKit.BackgroundColor* API test failures.
+ https://bugs.webkit.org/show_bug.cgi?id=191697
+ rdar://problem/46098570
+
+ Reviewed by Dean Jackson.
+
+ * TestWebKitAPI/Tests/mac/BackgroundColor.mm:
+ (TestWebKitAPI::TEST): Updated for new default background color.
+
2018-11-15 Jonathan Bedard <jbed...@apple.com>
webkitpy: Check for specific process instead of using data migrator (Follow-up fix)
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/BackgroundColor.mm (238240 => 238241)
--- trunk/Tools/TestWebKitAPI/Tests/mac/BackgroundColor.mm 2018-11-15 20:28:07 UTC (rev 238240)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/BackgroundColor.mm 2018-11-15 20:32:38 UTC (rev 238241)
@@ -34,17 +34,24 @@
namespace TestWebKitAPI {
+#if ENABLE(DARK_MODE_CSS)
+#define DEFAULT_BACKGROUND_COLOR [NSColor controlBackgroundColor]
+#else
+#define DEFAULT_BACKGROUND_COLOR [NSColor whiteColor]
+#endif
+
TEST(WebKit, BackgroundColorDefault)
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+ NSColor *defaultColor = DEFAULT_BACKGROUND_COLOR;
NSColor *backgroundColor = [webView _backgroundColor];
- EXPECT_EQ([NSColor whiteColor], backgroundColor);
+ EXPECT_EQ(defaultColor, backgroundColor);
// Load content so the layer is created.
[webView synchronouslyLoadHTMLString:@""];
- EXPECT_EQ(CGColorGetConstantColor(kCGColorWhite), [webView layer].backgroundColor);
+ EXPECT_TRUE(CGColorEqualToColor(defaultColor.CGColor, [webView layer].backgroundColor));
}
TEST(WebKit, BackgroundColorSystemColor)
@@ -51,15 +58,16 @@
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
- [webView _setBackgroundColor:[NSColor controlBackgroundColor]];
+ NSColor *systemColor = [NSColor textBackgroundColor];
+ [webView _setBackgroundColor:systemColor];
NSColor *backgroundColor = [webView _backgroundColor];
- EXPECT_EQ([NSColor controlBackgroundColor], backgroundColor);
+ EXPECT_EQ(systemColor, backgroundColor);
// Load content so the layer is created.
[webView synchronouslyLoadHTMLString:@""];
- EXPECT_TRUE(CGColorEqualToColor([NSColor controlBackgroundColor].CGColor, [webView layer].backgroundColor));
+ EXPECT_TRUE(CGColorEqualToColor(systemColor.CGColor, [webView layer].backgroundColor));
}
TEST(WebKit, BackgroundColorNil)
@@ -68,13 +76,14 @@
[webView _setBackgroundColor:nil];
+ NSColor *defaultColor = DEFAULT_BACKGROUND_COLOR;
NSColor *backgroundColor = [webView _backgroundColor];
- EXPECT_EQ([NSColor whiteColor], backgroundColor);
+ EXPECT_EQ(defaultColor, backgroundColor);
// Load content so the layer is created.
[webView synchronouslyLoadHTMLString:@""];
- EXPECT_EQ(CGColorGetConstantColor(kCGColorWhite), [webView layer].backgroundColor);
+ EXPECT_TRUE(CGColorEqualToColor(defaultColor.CGColor, [webView layer].backgroundColor));
}
TEST(WebKit, BackgroundColorNoDrawsBackground)
@@ -83,8 +92,9 @@
[webView _setDrawsBackground:NO];
+ NSColor *defaultColor = DEFAULT_BACKGROUND_COLOR;
NSColor *backgroundColor = [webView _backgroundColor];
- EXPECT_EQ([NSColor whiteColor], backgroundColor);
+ EXPECT_EQ(defaultColor, backgroundColor);
// Load content so the layer is created.
[webView synchronouslyLoadHTMLString:@""];
@@ -97,10 +107,10 @@
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
[webView _setDrawsBackground:NO];
- [webView _setBackgroundColor:[NSColor controlBackgroundColor]];
+ [webView _setBackgroundColor:[NSColor textBackgroundColor]];
NSColor *backgroundColor = [webView _backgroundColor];
- EXPECT_EQ([NSColor controlBackgroundColor], backgroundColor);
+ EXPECT_EQ([NSColor textBackgroundColor], backgroundColor);
// Load content so the layer is created.
[webView synchronouslyLoadHTMLString:@""];
