REGRESSION(306364@main): Form fields in PDFs in dark mode are not readable

aprotyas · aprotyas · commit 8a4cbc9596bb · 2026-02-27T01:39:25.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=308793 rdar://171198060 Reviewed by Richard Robinson. After 306364@main, PDF annotation elements respect light/dark color scheme, but we also respect the text annotation's font color. Since PDF content is ordinarily for light mode, the prescribed annotation font color is dark, which clashes with our text annotation's dark background color (in dark mode). To fix this issue, we simply opt out of dark mode adaptations for PDF annotations. Tests: TestWebKitAPI.UnifiedPDF.TextAnnotationBackgroundColorDoesNotAdaptToColorScheme * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginBase.mm: (WebKit::PDFPluginBase::annotationStyle const): * Tools/TestWebKitAPI/PlatformUtilities.h: * Tools/TestWebKitAPI/Tests/WebKitCocoa/UnifiedPDFTests.mm: (TestWebKitAPI::UNIFIED_PDF_TEST): * Tools/TestWebKitAPI/cocoa/PlatformUtilitiesCocoa.mm: (TestWebKitAPI::Util::toSTD): Canonical link: https://commits.webkit.org/308330@main
diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginBase.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginBase.mm
@@ -1580,6 +1580,7 @@ static void verboseLog(PDFIncrementalLoader* incrementalLoader, std::optional<ui
     ".annotation {"
     "    position: absolute;"
     "    pointer-events: auto;"
+    "    color-scheme: only light;"
     "}"
     ""
     "textarea.annotation { "
diff --git a/Tools/TestWebKitAPI/PlatformUtilities.h b/Tools/TestWebKitAPI/PlatformUtilities.h
@@ -64,6 +64,7 @@ ALWAYS_INLINE std::string toSTD(const String& string) { return toSTD(string.utf8
 
 #if USE(FOUNDATION)
 std::string toSTD(NSString *);
+std::string toSTD(RetainPtr<NSString>);
 bool jsonMatchesExpectedValues(NSString *jsonString, NSDictionary *expected);
 #ifdef __OBJC__
 void waitForConditionWithLogging(std::function<bool()>&&, NSTimeInterval loggingTimeout, NSString *message, ...) NS_FORMAT_FUNCTION(3, 4);
diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/UnifiedPDFTests.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/UnifiedPDFTests.mm
@@ -49,6 +49,7 @@
 #import "WKWebViewForTestingImmediateActions.h"
 #import <WebCore/Color.h>
 #import <WebCore/ColorSerialization.h>
+#import <WebCore/IntPoint.h>
 #import <WebCore/WebEvent.h>
 #import <WebKit/WKNavigationDelegatePrivate.h>
 #import <WebKit/WKPreferencesPrivate.h>
@@ -371,6 +372,46 @@ void pressKey(auto key, unsigned short code, Seconds duration = 200_ms)
     EXPECT_EQ(colorsBeforeHover, colorsAfterHover);
 }
 
+UNIFIED_PDF_TEST(TextAnnotationBackgroundColorDoesNotAdaptToColorScheme)
+{
+    RetainPtr webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 600, 600) configuration:configurationForWebViewTestingUnifiedPDF().get() addToWindow:YES]);
+    RetainPtr request = [NSURLRequest requestWithURL:[NSBundle.test_resourcesBundle URLForResource:@"textInput" withExtension:@"pdf"]];
+    [webView synchronouslyLoadRequest:request.get()];
+    [[webView window] makeFirstResponder:webView.get()];
+    [[webView window] makeKeyAndOrderFront:nil];
+    [[webView window] orderFrontRegardless];
+
+    auto evaluateAnnotationBackgroundColor = [&webView] {
+        static constexpr WebCore::IntPoint annotationPoint { 200, 200 };
+        [webView mouseMoveToPoint:annotationPoint withFlags:0];
+        [webView sendClickAtPoint:annotationPoint];
+        [webView waitForPendingMouseEvents];
+        [webView waitForNextPresentationUpdate];
+
+        RetainPtr backgroundColor = [webView stringByEvaluatingJavaScript:@"getComputedStyle(document.querySelector('#annotationContainer > input')).backgroundColor"];
+
+        static constexpr WebCore::IntPoint blankPoint { 50, 50 };
+        [webView mouseMoveToPoint:blankPoint withFlags:0];
+        [webView sendClickAtPoint:blankPoint];
+        [webView waitForPendingMouseEvents];
+        [webView waitForNextPresentationUpdate];
+
+        return backgroundColor;
+    };
+
+    [webView forceLightMode];
+    [webView waitForNextPresentationUpdate];
+
+    RetainPtr lightModeColor = evaluateAnnotationBackgroundColor();
+
+    [webView forceDarkMode];
+    [webView waitForNextPresentationUpdate];
+
+    RetainPtr darkModeColor = evaluateAnnotationBackgroundColor();
+
+    EXPECT_WK_STREQ(lightModeColor, darkModeColor);
+}
+
 #endif // PLATFORM(MAC)
 
 #if ENABLE(PDF_HUD)
diff --git a/Tools/TestWebKitAPI/cocoa/PlatformUtilitiesCocoa.mm b/Tools/TestWebKitAPI/cocoa/PlatformUtilitiesCocoa.mm
@@ -64,6 +64,11 @@
     return std::string(buffer.get(), stringLength);
 }
 
+std::string toSTD(RetainPtr<NSString> string)
+{
+    return toSTD(string.get());
+}
+
 bool jsonMatchesExpectedValues(NSString *jsonString, NSDictionary *expected)
 {
     NSError *error = nil;

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,11 @@`
`64`	`64`	`return std::string(buffer.get(), stringLength);`
`65`	`65`	`}`
`66`	`66`
	`67`	`+std::string toSTD(RetainPtr<NSString> string)`
	`68`	`+{`
	`69`	`+ return toSTD(string.get());`
	`70`	`+}`
	`71`	`+`
`67`	`72`	`bool jsonMatchesExpectedValues(NSString jsonString, NSDictionary expected)`
`68`	`73`	`{`
`69`	`74`	`NSError *error = nil;`