Diff
Modified: trunk/Source/WebKit/ChangeLog (271968 => 271969)
--- trunk/Source/WebKit/ChangeLog 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/ChangeLog 2021-01-27 20:10:32 UTC (rev 271969)
@@ -1,3 +1,43 @@
+2021-01-27 Devin Rousso <[email protected]>
+
+ [iOS] expose existing macOS-only `-[WKWebView _pageExtendedBackgroundColor]` SPI
+ https://bugs.webkit.org/show_bug.cgi?id=221015
+ <rdar://problem/73636453>
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::didCommitLayerTree):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::pageExtendedBackgroundColorDidChange):
+ * UIProcess/PageClient.h:
+ (WebKit::PageClient::pageExtendedBackgroundColorWillChange): Added.
+ (WebKit::PageClient::pageExtendedBackgroundColorDidChange): Added.
+ * UIProcess/Cocoa/PageClientImplCocoa.h:
+ * UIProcess/Cocoa/PageClientImplCocoa.mm:
+ (WebKit::PageClientImplCocoa::pageExtendedBackgroundColorWillChange): Added.
+ (WebKit::PageClientImplCocoa::pageExtendedBackgroundColorDidChange): Added.
+ Add support for ObjC KVO of `-[WKWebView _themeColor]`.
+
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::pageExtendedBackgroundColorDidChange): Added.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::willCommitLayerTree):
+ (WebKit::WebPage::flushPendingPageExtendedBackgroundColorChange): Added.
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::pageExtendedBackgroundColorDidChange const):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::updateRendering):
+ On macOS, instead of messaging the UIProcess as soon as changes happen, keep a flag of
+ whether the `pageExtendedBackgroundColor` has changed and use it when updating rendering so
+ that change messages are kept in sync (e.g. modifying `<meta name="theme-color" content="...">`).
+
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _pageExtendedBackgroundColor]): Added.
+ * UIProcess/API/mac/WKWebViewMac.mm:
+ (-[WKWebView _pageExtendedBackgroundColor]): Deleted.
+
2021-01-27 Per Arne <[email protected]>
[macOS] Remove CFPBS access in the WebContent process
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (271968 => 271969)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-01-27 20:10:32 UTC (rev 271969)
@@ -2796,6 +2796,14 @@
return WebCore::platformColor(themeColor);
}
+- (CocoaColor *)_pageExtendedBackgroundColor
+{
+ auto pageExtendedBackgroundColor = _page->pageExtendedBackgroundColor();
+ if (!pageExtendedBackgroundColor.isValid())
+ return nil;
+ return WebCore::platformColor(pageExtendedBackgroundColor);
+}
+
- (id <_WKInputDelegate>)_inputDelegate
{
return _inputDelegate.getAutoreleased();
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (271968 => 271969)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2021-01-27 20:10:32 UTC (rev 271969)
@@ -377,6 +377,12 @@
@property (nonatomic, readonly) NSColor *_themeColor WK_API_AVAILABLE(macos(WK_MAC_TBA));
#endif
+#if TARGET_OS_IPHONE
+@property (nonatomic, readonly) UIColor *_pageExtendedBackgroundColor WK_API_AVAILABLE(ios(WK_IOS_TBA));
+#else
+@property (nonatomic, readonly) NSColor *_pageExtendedBackgroundColor;
+#endif
+
@end
#if TARGET_OS_IPHONE
@@ -523,7 +529,6 @@
@property (nonatomic, readonly) _WKRectEdge _pinnedState WK_API_AVAILABLE(macos(10.13.4));
@property (nonatomic, setter=_setRubberBandingEnabled:) _WKRectEdge _rubberBandingEnabled WK_API_AVAILABLE(macos(10.13.4));
-@property (readonly) NSColor *_pageExtendedBackgroundColor;
@property (nonatomic, setter=_setBackgroundColor:) NSColor *_backgroundColor WK_API_AVAILABLE(macos(10.14));
@property (nonatomic, copy, setter=_setUnderlayColor:) NSColor *_underlayColor WK_API_AVAILABLE(macos(10.13.4));
Modified: trunk/Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm (271968 => 271969)
--- trunk/Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/UIProcess/API/mac/WKWebViewMac.mm 2021-01-27 20:10:32 UTC (rev 271969)
@@ -1285,11 +1285,6 @@
_impl->setRubberBandingEnabled(state);
}
-- (NSColor *)_pageExtendedBackgroundColor
-{
- return _impl->pageExtendedBackgroundColor();
-}
-
- (NSColor *)_backgroundColor
{
return _impl->backgroundColor();
Modified: trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h (271968 => 271969)
--- trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h 2021-01-27 20:10:32 UTC (rev 271969)
@@ -51,6 +51,8 @@
void themeColorWillChange() final;
void themeColorDidChange() final;
+ void pageExtendedBackgroundColorWillChange() final;
+ void pageExtendedBackgroundColorDidChange() final;
void isPlayingAudioWillChange() final;
void isPlayingAudioDidChange() final;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm (271968 => 271969)
--- trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm 2021-01-27 20:10:32 UTC (rev 271969)
@@ -54,6 +54,16 @@
[m_webView didChangeValueForKey:@"_themeColor"];
}
+void PageClientImplCocoa::pageExtendedBackgroundColorWillChange()
+{
+ [m_webView willChangeValueForKey:@"_pageExtendedBackgroundColor"];
+}
+
+void PageClientImplCocoa::pageExtendedBackgroundColorDidChange()
+{
+ [m_webView didChangeValueForKey:@"_pageExtendedBackgroundColor"];
+}
+
void PageClientImplCocoa::isPlayingAudioWillChange()
{
[m_webView willChangeValueForKey:NSStringFromSelector(@selector(_isPlayingAudio))];
Modified: trunk/Source/WebKit/UIProcess/PageClient.h (271968 => 271969)
--- trunk/Source/WebKit/UIProcess/PageClient.h 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/UIProcess/PageClient.h 2021-01-27 20:10:32 UTC (rev 271969)
@@ -494,6 +494,8 @@
virtual void themeColorWillChange() { }
virtual void themeColorDidChange() { }
+ virtual void pageExtendedBackgroundColorWillChange() { }
+ virtual void pageExtendedBackgroundColorDidChange() { }
virtual void didChangeBackgroundColor() = 0;
virtual void isPlayingAudioWillChange() = 0;
virtual void isPlayingAudioDidChange() = 0;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (271968 => 271969)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-01-27 20:10:32 UTC (rev 271969)
@@ -8427,9 +8427,14 @@
pageClient().themeColorDidChange();
}
-void WebPageProxy::pageExtendedBackgroundColorDidChange(const Color& backgroundColor)
+void WebPageProxy::pageExtendedBackgroundColorDidChange(const Color& pageExtendedBackgroundColor)
{
- m_pageExtendedBackgroundColor = backgroundColor;
+ if (m_pageExtendedBackgroundColor == pageExtendedBackgroundColor)
+ return;
+
+ pageClient().pageExtendedBackgroundColorWillChange();
+ m_pageExtendedBackgroundColor = pageExtendedBackgroundColor;
+ pageClient().pageExtendedBackgroundColorDidChange();
}
#if ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (271968 => 271969)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2021-01-27 20:10:32 UTC (rev 271969)
@@ -336,7 +336,7 @@
void WebPageProxy::didCommitLayerTree(const WebKit::RemoteLayerTreeTransaction& layerTreeTransaction)
{
themeColorChanged(layerTreeTransaction.themeColor());
- m_pageExtendedBackgroundColor = layerTreeTransaction.pageExtendedBackgroundColor();
+ pageExtendedBackgroundColorDidChange(layerTreeTransaction.pageExtendedBackgroundColor());
if (!m_hasReceivedLayerTreeTransactionAfterDidCommitLoad) {
if (layerTreeTransaction.transactionID() >= m_firstLayerTreeTransactionIdAfterDidCommitLoad) {
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (271968 => 271969)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2021-01-27 20:10:32 UTC (rev 271969)
@@ -1144,13 +1144,9 @@
m_page.themeColorChanged();
}
-void WebChromeClient::pageExtendedBackgroundColorDidChange(Color backgroundColor) const
+void WebChromeClient::pageExtendedBackgroundColorDidChange(Color /* backgroundColor */) const
{
-#if PLATFORM(MAC)
- m_page.send(Messages::WebPageProxy::PageExtendedBackgroundColorDidChange(backgroundColor));
-#else
- UNUSED_PARAM(backgroundColor);
-#endif
+ m_page.pageExtendedBackgroundColorDidChange();
}
void WebChromeClient::wheelEventHandlersChanged(bool hasHandlers)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (271968 => 271969)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-01-27 20:10:32 UTC (rev 271969)
@@ -3937,6 +3937,7 @@
layerTransaction.setScrollPosition(frameView->scrollPosition());
m_pendingThemeColorChange = false;
+ m_pendingPageExtendedBackgroundColorChange = false;
if (m_hasPendingEditorStateUpdate) {
layerTransaction.setEditorState(editorState());
@@ -6277,6 +6278,16 @@
send(Messages::WebPageProxy::ThemeColorChanged(m_page->themeColor()));
}
+void WebPage::flushPendingPageExtendedBackgroundColorChange()
+{
+ if (!m_pendingPageExtendedBackgroundColorChange)
+ return;
+
+ m_pendingPageExtendedBackgroundColorChange = false;
+
+ send(Messages::WebPageProxy::PageExtendedBackgroundColorDidChange(m_page->pageExtendedBackgroundColor()));
+}
+
void WebPage::flushPendingEditorStateUpdate()
{
if (!m_hasPendingEditorStateUpdate)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (271968 => 271969)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-01-27 20:10:32 UTC (rev 271969)
@@ -1218,6 +1218,9 @@
void themeColorChanged() { m_pendingThemeColorChange = true; }
void flushPendingThemeColorChange();
+ void pageExtendedBackgroundColorDidChange() { m_pendingPageExtendedBackgroundColorChange = true; }
+ void flushPendingPageExtendedBackgroundColorChange();
+
void flushPendingEditorStateUpdate();
#if ENABLE(RESOURCE_LOAD_STATISTICS)
@@ -2035,6 +2038,7 @@
RefPtr<WebCore::Element> m_recentlyBlurredElement;
bool m_hasPendingInputContextUpdateAfterBlurringAndRefocusingElement { false };
bool m_pendingThemeColorChange { false };
+ bool m_pendingPageExtendedBackgroundColorChange { false };
bool m_hasPendingEditorStateUpdate { false };
#if ENABLE(IOS_TOUCH_EVENTS)
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (271968 => 271969)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2021-01-27 20:10:32 UTC (rev 271969)
@@ -447,6 +447,7 @@
m_webPage.updateRendering();
m_webPage.flushPendingThemeColorChange();
+ m_webPage.flushPendingPageExtendedBackgroundColorChange();
m_webPage.flushPendingEditorStateUpdate();
m_webPage.flushPendingIntrinsicContentSizeUpdate();
Modified: trunk/Tools/ChangeLog (271968 => 271969)
--- trunk/Tools/ChangeLog 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Tools/ChangeLog 2021-01-27 20:10:32 UTC (rev 271969)
@@ -1,3 +1,20 @@
+2021-01-27 Devin Rousso <[email protected]>
+
+ [iOS] expose existing macOS-only `-[WKWebView _pageExtendedBackgroundColor]` SPI
+ https://bugs.webkit.org/show_bug.cgi?id=221015
+ <rdar://problem/73636453>
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/PageExtendedBackgroundColor.mm: Added.
+ (TEST.PageExtendedBackgroundColor.OnLoad):
+ (TEST.PageExtendedBackgroundColor.MultipleTags):
+ (-[WKWebViewPageExtendedBackgroundColorObserver initWithWebView:]):
+ (-[WKWebViewPageExtendedBackgroundColorObserver observeValueForKeyPath:ofObject:change:context:]):
+ (TEST.PageExtendedBackgroundColor.KVO):
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+
2021-01-27 Alicia Boya García <[email protected]>
[GTK] run-gtk-tests: Crashing and non-existent tests should not count as a pass
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (271968 => 271969)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-01-27 19:20:27 UTC (rev 271968)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-01-27 20:10:32 UTC (rev 271969)
@@ -51,9 +51,9 @@
07492B3B1DF8B14C00633DE1 /* EnumerateMediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07492B3A1DF8AE2D00633DE1 /* EnumerateMediaDevices.cpp */; };
07492B3C1DF8B86600633DE1 /* enumerateMediaDevices.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 07492B391DF8ADA400633DE1 /* enumerateMediaDevices.html */; };
074994421EA5034B000DA44E /* getUserMedia.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 4A410F4D19AF7BEF002EBAB5 /* getUserMedia.html */; };
- 074994521EA5034B000DA44E /* getUserMedia2.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 41BAF4E225AC9DB800D82F32 /* getUserMedia2.html */; };
074994421EA5034B000DA44F /* ondevicechange.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 4A410F4D19AF7BEF002EBAB6 /* ondevicechange.html */; };
074994421EA5034B000DA45E /* getUserMediaAudioVideoCapture.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 4A410F4D19AF7BEF002EBAC5 /* getUserMediaAudioVideoCapture.html */; };
+ 074994521EA5034B000DA44E /* getUserMedia2.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 41BAF4E225AC9DB800D82F32 /* getUserMedia2.html */; };
076E507F1F4513D6006E9F5A /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 076E507E1F45031E006E9F5A /* Logging.cpp */; };
077A5AF3230638A600A7105C /* AccessibilityTestPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0746645822FF630500E3451A /* AccessibilityTestPlugin.mm */; };
0799C3491EBA2D7B003B7532 /* UserMediaDisabled.mm in Sources */ = {isa = PBXBuildFile; fileRef = 07EDEFAC1EB9400C00D43292 /* UserMediaDisabled.mm */; };
@@ -843,6 +843,7 @@
93F56DA91E5F919D003EDE84 /* WKWebViewSnapshot.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93F56DA81E5F9181003EDE84 /* WKWebViewSnapshot.mm */; };
93F7E86F14DC8E5C00C84A99 /* NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F7E86E14DC8E5B00C84A99 /* NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp */; };
950E4CC1252E75240071659F /* iOSStylusSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = 950E4CC0252E75230071659F /* iOSStylusSupport.mm */; };
+ 953ABB3525C0D682004C8B73 /* PageExtendedBackgroundColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 953ABB3425C0D681004C8B73 /* PageExtendedBackgroundColor.mm */; };
95A524952581A10D00461FE9 /* HTMLMetaThemeColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95A524942581A10D00461FE9 /* HTMLMetaThemeColor.mm */; };
95B6B3B7251EBF2F00FC4382 /* MediaDocument.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95B6B3B6251EBF2F00FC4382 /* MediaDocument.mm */; };
9984FACC1CFFAF60008D198C /* WKWebViewTextInput.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */; };
@@ -1430,7 +1431,6 @@
1A7E8B3618120B2F00AEB74A /* FragmentNavigation.html in Copy Resources */,
F47728991E4AE3C1007ABF6A /* full-page-contenteditable.html in Copy Resources */,
F4E0A28B211E4A2B00AF7C7F /* full-page-dropzone.html in Copy Resources */,
- CDB4776225568E2700FF5D2A /* full-screen-scroll-position.html in Copy Resources */,
F4F405BC1D4C0D1C007A9707 /* full-size-autoplaying-video-with-audio.html in Copy Resources */,
CD78E11E1DB7EE2A0014A2DE /* FullscreenDelegate.html in Copy Resources */,
3FBD1B4A1D3D66AB00E6D6FA /* FullscreenLayoutConstraints.html in Copy Resources */,
@@ -2485,6 +2485,7 @@
93F7E86B14DC8E4D00C84A99 /* NewFirstVisuallyNonEmptyLayoutFrames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewFirstVisuallyNonEmptyLayoutFrames.cpp; sourceTree = "<group>"; };
93F7E86E14DC8E5B00C84A99 /* NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewFirstVisuallyNonEmptyLayoutFrames_Bundle.cpp; sourceTree = "<group>"; };
950E4CC0252E75230071659F /* iOSStylusSupport.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = iOSStylusSupport.mm; sourceTree = "<group>"; };
+ 953ABB3425C0D681004C8B73 /* PageExtendedBackgroundColor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageExtendedBackgroundColor.mm; sourceTree = "<group>"; };
95A524942581A10D00461FE9 /* HTMLMetaThemeColor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HTMLMetaThemeColor.mm; sourceTree = "<group>"; };
95B6B3B6251EBF2F00FC4382 /* MediaDocument.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaDocument.mm; sourceTree = "<group>"; };
9984FACA1CFFAEEE008D198C /* WKWebViewTextInput.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewTextInput.mm; sourceTree = "<group>"; };
@@ -3375,6 +3376,7 @@
CEA6CF2219CCF5BD0064F5A7 /* OpenAndCloseWindow.mm */,
CEBCA12E1E3A660100C73293 /* OverrideContentSecurityPolicy.mm */,
2DA2586E225C67DC00B45C1C /* OverrideViewportArguments.mm */,
+ 953ABB3425C0D681004C8B73 /* PageExtendedBackgroundColor.mm */,
2D3CA3A4221DF2390088E803 /* PageOverlayPlugin.mm */,
51242CDA237B791E00EED9C1 /* PageZoom.mm */,
F44C79FB20F9E50C0014478C /* ParserYieldTokenPlugIn.mm */,
@@ -3832,7 +3834,6 @@
F43E3BC020DADB8000A4E7ED /* fixed-nav-bar.html */,
93575C551D30366E000D604D /* focus-inputs.html */,
F46128D8211E496300D9FADB /* full-page-dropzone.html */,
- CDB477612556894B00FF5D2A /* full-screen-scroll-position.html */,
F4F405BA1D4C0CF8007A9707 /* full-size-autoplaying-video-with-audio.html */,
CD78E11B1DB7EA360014A2DE /* FullscreenDelegate.html */,
3FBD1B491D39D1DB00E6D6FA /* FullscreenLayoutConstraints.html */,
@@ -5281,7 +5282,6 @@
CD78E11D1DB7EA660014A2DE /* FullscreenDelegate.mm in Sources */,
CDB213BD24EF522800FDE301 /* FullscreenFocus.mm in Sources */,
CDE77D2525A6591C00D4115E /* FullscreenPointerLeave.mm in Sources */,
- CDB477602556886800FF5D2A /* FullScreenScrollPosition.mm in Sources */,
CDBFCC451A9FF45300A7B691 /* FullscreenZoomInitialFrame.mm in Sources */,
83DB79691EF63B3C00BFA5E5 /* Function.cpp in Sources */,
7CCE7EF81A411AE600447C4C /* Geolocation.cpp in Sources */,
@@ -5464,6 +5464,7 @@
518C1153205B0504001FF4AE /* ProcessSwapOnNavigation.mm in Sources */,
FEC2A85624CEB65F00ADBC35 /* PropertySlot.cpp in Sources */,
7C83E0C11D0A652F00FEBCF3 /* ProvisionalURLNotChange.mm in Sources */,
+ 953ABB3525C0D682004C8B73 /* PageExtendedBackgroundColor.mm in Sources */,
5CFACF65226FD2DC0056C7D0 /* Proxy.mm in Sources */,
041A1E34216FFDBC00789E0A /* PublicSuffix.cpp in Sources */,
7C83E0C21D0A653500FEBCF3 /* QuickLook.mm in Sources */,
Added: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PageExtendedBackgroundColor.mm (0 => 271969)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PageExtendedBackgroundColor.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PageExtendedBackgroundColor.mm 2021-01-27 20:10:32 UTC (rev 271969)
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#import "CocoaColor.h"
+#import "TestCocoa.h"
+#import "TestWKWebView.h"
+#import <WebKit/WKWebViewPrivate.h>
+#import <wtf/RetainPtr.h>
+
+#define EXPECT_NSSTRING_EQ(expected, actual) \
+ EXPECT_TRUE([actual isKindOfClass:[NSString class]]); \
+ EXPECT_WK_STREQ(expected, (NSString *)actual);
+
+constexpr CGFloat whiteColorComponents[4] = { 1, 1, 1, 1 };
+constexpr CGFloat redColorComponents[4] = { 1, 0, 0, 1 };
+constexpr CGFloat blueColorComponents[4] = { 0, 0, 1, 1 };
+
+TEST(PageExtendedBackgroundColor, OnLoad)
+{
+ auto sRGBColorSpace = adoptCF(CGColorSpaceCreateWithName(kCGColorSpaceSRGB));
+ auto whiteColor = adoptCF(CGColorCreate(sRGBColorSpace.get(), whiteColorComponents));
+ auto redColor = adoptCF(CGColorCreate(sRGBColorSpace.get(), redColorComponents));
+
+ auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+ EXPECT_TRUE(![webView _pageExtendedBackgroundColor]);
+
+ [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:@"<style> body { background-color: red; } </style>"];
+
+ EXPECT_TRUE(CGColorEqualToColor([webView _pageExtendedBackgroundColor].CGColor, redColor.get()));
+
+ [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:@"<style> body { not-background-color: red; } </style>"];
+
+ EXPECT_TRUE(CGColorEqualToColor([webView _pageExtendedBackgroundColor].CGColor, whiteColor.get()));
+}
+
+TEST(PageExtendedBackgroundColor, MultipleStyles)
+{
+ auto sRGBColorSpace = adoptCF(CGColorSpaceCreateWithName(kCGColorSpaceSRGB));
+ auto blueColor = adoptCF(CGColorCreate(sRGBColorSpace.get(), blueColorComponents));
+
+ auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+ EXPECT_TRUE(![webView _pageExtendedBackgroundColor]);
+
+ [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:@"<style> body { background-color: red; } body { background-color: blue; } </style>"];
+
+ EXPECT_TRUE(CGColorEqualToColor([webView _pageExtendedBackgroundColor].CGColor, blueColor.get()));
+}
+
+@interface WKWebViewPageExtendedBackgroundColorObserver : NSObject
+
+- (instancetype)initWithWebView:(WKWebView *)webView;
+
+@property (nonatomic, readonly) WKWebView *webView;
+@property (nonatomic, copy) NSString *state;
+
+@end
+
+@implementation WKWebViewPageExtendedBackgroundColorObserver
+
+- (instancetype)initWithWebView:(WKWebView *)webView
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _state = @"before-init";
+
+ _webView = webView;
+ [_webView addObserver:self forKeyPath:@"_pageExtendedBackgroundColor" options:NSKeyValueObservingOptionInitial context:nil];
+
+ return self;
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ if ([_state isEqualToString:@"before-init"]) {
+ _state = @"after-init";
+ return;
+ }
+
+ if ([_state isEqualToString:@"before-load"]) {
+ _state = @"after-load";
+ return;
+ }
+
+ if ([_state isEqualToString:@"before-css-class-added"]) {
+ _state = @"after-css-class-added";
+ return;
+ }
+
+ if ([_state isEqualToString:@"before-css-class-changed"]) {
+ _state = @"after-css-class-changed";
+ return;
+ }
+
+ if ([_state isEqualToString:@"before-css-class-removed"]) {
+ _state = @"after-css-class-removed";
+ return;
+ }
+
+ RELEASE_ASSERT_NOT_REACHED();
+}
+
+@end
+
+TEST(PageExtendedBackgroundColor, KVO)
+{
+ auto sRGBColorSpace = adoptCF(CGColorSpaceCreateWithName(kCGColorSpaceSRGB));
+ auto whiteColor = adoptCF(CGColorCreate(sRGBColorSpace.get(), whiteColorComponents));
+ auto redColor = adoptCF(CGColorCreate(sRGBColorSpace.get(), redColorComponents));
+ auto blueColor = adoptCF(CGColorCreate(sRGBColorSpace.get(), blueColorComponents));
+
+ auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+ auto themeColorObserver = adoptNS([[WKWebViewPageExtendedBackgroundColorObserver alloc] initWithWebView:webView.get()]);
+ EXPECT_NSSTRING_EQ("after-init", [themeColorObserver state]);
+ EXPECT_TRUE(![webView _pageExtendedBackgroundColor]);
+
+ [themeColorObserver setState:@"before-load"];
+ [webView synchronouslyLoadHTMLStringAndWaitUntilAllImmediateChildFramesPaint:@"<style> body.red { background-color: red; } body.blue { background-color: blue; } </style>"];
+ EXPECT_NSSTRING_EQ("after-load", [themeColorObserver state]);
+ EXPECT_TRUE(CGColorEqualToColor([webView _pageExtendedBackgroundColor].CGColor, whiteColor.get()));
+
+ [themeColorObserver setState:@"before-css-class-added"];
+ [webView objectByEvaluatingJavaScript:@"document.body.className = 'red'"];
+ [webView waitForNextPresentationUpdate];
+ EXPECT_NSSTRING_EQ("after-css-class-added", [themeColorObserver state]);
+ EXPECT_TRUE(CGColorEqualToColor([webView _pageExtendedBackgroundColor].CGColor, redColor.get()));
+
+ [themeColorObserver setState:@"before-css-class-changed"];
+ [webView objectByEvaluatingJavaScript:@"document.body.className = 'blue'"];
+ [webView waitForNextPresentationUpdate];
+ EXPECT_NSSTRING_EQ("after-css-class-changed", [themeColorObserver state]);
+ EXPECT_TRUE(CGColorEqualToColor([webView _pageExtendedBackgroundColor].CGColor, blueColor.get()));
+
+ [themeColorObserver setState:@"before-css-class-removed"];
+ [webView objectByEvaluatingJavaScript:@"document.body.className = ''"];
+ [webView waitForNextPresentationUpdate];
+ EXPECT_NSSTRING_EQ("after-css-class-removed", [themeColorObserver state]);
+ EXPECT_TRUE(CGColorEqualToColor([webView _pageExtendedBackgroundColor].CGColor, whiteColor.get()));
+}
