Changeset 238241 in webkit

Timestamp:

Nov 15, 2018 12:32:38 PM (5 years ago)

Author:

timothy@apple.com

Message:

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/mac/BackgroundColor.mm (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-15  Timothy Hatcher  <timothy@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  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/mac/BackgroundColor.mm

@@ -35 +35 @@
 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));
 }
 
@@ -52 +59 @@
     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));
 }
 
@@ -69 +77 @@
     [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));
 }
 
@@ -84 +93 @@
     [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.
@@ -98 +108 @@
 
     [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.