haikuwebkit/LayoutTests/css-dark-mode/color-scheme-meta.html

137 lines
4.2 KiB
HTML
Raw Permalink Normal View History

Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<style>
#test1 {
color: text;
}
</style>
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
<meta id="meta" name="color-scheme" content="light">
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
<div id="test1"></div>
<script>
function test_prop(id, prop, expected) {
assert_equals(window.getComputedStyle(document.getElementById(id)).getPropertyValue(prop).trim(), expected);
}
function test_color_is_white(id) {
test_prop("test1", "color", "rgb(255, 255, 255)");
}
function test_color_is_black(id) {
test_prop("test1", "color", "rgb(0, 0, 0)");
}
test(function() {
// The semantic text color should be black.
test_color_is_black("test1");
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Element colors are correct in light color scheme with only light color scheme");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
if (window.internals)
internals.settings.setUseDarkAppearance(true);
}, "Dark color scheme enabled");
test(function() {
// The semantic text color should be black, and not change.
test_color_is_black("test1");
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Element colors are correct in dark color scheme with only light color scheme");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
if (window.internals)
internals.settings.setUseDarkAppearance(false);
}, "Light color scheme enabled");
test(function() {
document.getElementById("meta").content = "light dark";
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Color schemes changed to light and dark");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
// The semantic text color should be black.
test_color_is_black("test1");
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Element colors are correct in light color scheme with light and dark color scheme");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
if (window.internals)
internals.settings.setUseDarkAppearance(true);
}, "Dark color scheme enabled 2");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
// The semantic text color should be white.
test_color_is_white("test1");
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Element colors are correct in dark color scheme with light and dark color scheme");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
if (window.internals)
internals.settings.setUseDarkAppearance(false);
}, "Light color scheme enabled 2");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
document.getElementById("meta").content = "dark";
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Color schemes changed to dark");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
// The semantic text color should be white.
test_color_is_white("test1");
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Element colors are correct in light color scheme with only dark color scheme");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
if (window.internals)
internals.settings.setUseDarkAppearance(true);
}, "Dark color scheme enabled 3");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
// The semantic text color should be white still.
test_color_is_white("test1");
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Element colors are correct in dark color scheme with only dark color scheme");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
document.getElementById("meta").content = "\tlight foo ";
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Color schemes changed to light and a bogus value");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
// The semantic text color should be black again.
test_color_is_black("test1");
}, "Element colors are correct in dark color scheme with only light color scheme 2");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
document.getElementById("meta").content = "";
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Color schemes changed to empty value");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
// The semantic text color should be black still.
test_color_is_black("test1");
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Element colors are correct in dark color scheme with implicit light color scheme");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
document.getElementById("meta").content = " light,dark ";
}, "Color schemes changed to light,dark");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
// The semantic text color should be black now.
test_color_is_black("test1");
}, "Element colors are in light color scheme since comma is not an allowed seperator");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
document.getElementById("meta").content = "foo\vdark ";
}, "Color schemes changed to foo\\vdark");
test(function() {
// The semantic text color should be black still.
test_color_is_black("test1");
}, "Element colors are in light color scheme since vertical tab is not an allowed seperator");
test(function() {
document.getElementById("meta").content = " foo\ndark";
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Color schemes changed to a bogus value and dark");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
test(function() {
// The semantic text color should be white still.
test_color_is_white("test1");
Rename `supported-color-schemes` to `color-scheme`. https://bugs.webkit.org/show_bug.cgi?id=197016 rdar://problem/49980259 Reviewed by Simon Fraser. Source/WebCore: Changed `supported-color-schemes` to `color-scheme` to follow the spec changes being tracked by: https://github.com/w3c/csswg-drafts/issues/3807 The old `supported-color-schemes` is now an alias of `color-scheme` for compatibility. Tests: css-dark-mode/color-scheme-css-parse.html css-dark-mode/color-scheme-css.html css-dark-mode/color-scheme-meta.html css-dark-mode/color-scheme-priority.html css-dark-mode/color-scheme-scrollbar.html css-dark-mode/older-syntax/supported-color-schemes-css.html css-dark-mode/older-syntax/supported-color-schemes-meta.html css-dark-mode/older-systems/color-scheme-css.html css-dark-mode/older-systems/color-scheme-meta.html * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyinStyle): * css/CSSProperties.json: * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::updateColorScheme): (WebCore::StyleBuilderConverter::convertColorScheme): (WebCore::StyleBuilderConverter::updateSupportedColorSchemes): Deleted. (WebCore::StyleBuilderConverter::convertSupportedColorSchemes): Deleted. * css/StyleBuilderCustom.h: (WebCore::StyleBuilderCustom::applyValueColorScheme): (WebCore::StyleBuilderCustom::applyValueSupportedColorSchemes): Deleted. * css/StyleResolver.cpp: (WebCore::StyleResolver::applyMatchedProperties): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeColorScheme): (WebCore::CSSPropertyParser::parseSingleValue): (WebCore::consumeSupportedColorSchemes): Deleted. * dom/Document.cpp: (WebCore::processColorSchemeString): (WebCore::Document::processColorScheme): (WebCore::Document::useDarkAppearance const): (WebCore::processColorSchemes): Deleted. (WebCore::Document::processSupportedColorSchemes): Deleted. * dom/Document.h: * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): * page/FrameView.cpp: (WebCore::FrameView::rendererForColorScheme const): (WebCore::FrameView::useDarkAppearance const): (WebCore::FrameView::styleColorOptions const): (WebCore::FrameView::rendererForSupportedColorSchemes const): Deleted. * page/FrameView.h: * rendering/style/RenderStyle.cpp: (WebCore::rareInheritedDataChangeRequiresRepaint): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::colorScheme const): (WebCore::RenderStyle::setHasExplicitlySetColorScheme): (WebCore::RenderStyle::hasExplicitlySetColorScheme const): (WebCore::RenderStyle::setColorScheme): (WebCore::RenderStyle::initialColorScheme): (WebCore::RenderStyle::NonInheritedFlags::operator== const): (WebCore::RenderStyle::supportedColorSchemes const): Deleted. (WebCore::RenderStyle::setHasExplicitlySetSupportedColorSchemes): Deleted. (WebCore::RenderStyle::hasExplicitlySetSupportedColorSchemes const): Deleted. (WebCore::RenderStyle::setSupportedColorSchemes): Deleted. (WebCore::RenderStyle::initialSupportedColorSchemes): Deleted. * rendering/style/RenderStyleConstants.h: * rendering/style/StyleColorScheme.h: Renamed from Source/WebCore/rendering/style/StyleSupportedColorSchemes.h. (WebCore::StyleColorScheme::StyleColorScheme): (WebCore::StyleColorScheme::operator== const): (WebCore::StyleColorScheme::operator!= const): (WebCore::StyleColorScheme::isAuto const): (WebCore::StyleColorScheme::isOnly const): (WebCore::StyleColorScheme::colorScheme const): (WebCore::StyleColorScheme::add): (WebCore::StyleColorScheme::contains const): (WebCore::StyleColorScheme::setAllowsTransformations): (WebCore::StyleColorScheme::allowsTransformations const): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Source/WebInspectorUI: * UserInterface/Views/Main.css: (:root): LayoutTests: * css-dark-mode/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/color-scheme-parse-expected.txt: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes-expected.txt. * css-dark-mode/color-scheme-parse.html: Renamed from LayoutTests/css-dark-mode/parse-supported-color-schemes.html. * css-dark-mode/color-scheme-priority-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority-expected.txt. * css-dark-mode/color-scheme-priority.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-priority.html. * css-dark-mode/color-scheme-scrollbar-expected.txt: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar-expected.txt. * css-dark-mode/color-scheme-scrollbar.html: Renamed from LayoutTests/css-dark-mode/supported-color-schemes-scrollbar.html. * css-dark-mode/older-syntax/supported-color-schemes-css-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-css.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes-css.html. * css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt: Copied from LayoutTests/css-dark-mode/supported-color-schemes-expected.txt. * css-dark-mode/older-syntax/supported-color-schemes-meta.html: Copied from LayoutTests/css-dark-mode/supported-color-schemes.html. * css-dark-mode/older-systems/color-scheme-css-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css-expected.txt * css-dark-mode/older-systems/color-scheme-css.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-css.html. * css-dark-mode/older-systems/color-scheme-meta-expected.txt: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes-expected.txt. * css-dark-mode/older-systems/color-scheme-meta.html: Renamed from LayoutTests/css-dark-mode/older-systems/supported-color-schemes.html. * fast/css/style-enumerate-properties.html: Updated property count. Canonical link: https://commits.webkit.org/211294@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-04-17 23:15:01 +00:00
}, "Element colors are correct in dark color scheme with dark color scheme");
Add <meta name="supported-color-schemes"> to control what color schemes the page supports https://bugs.webkit.org/show_bug.cgi?id=190526 rdar://problem/45230140 Reviewed by Dean Jackson. Source/WebCore: Test: css-dark-mode/supported-color-schemes.html * dom/Document.cpp: (WebCore::isColorSchemeSeparator): Added. (WebCore::processColorSchemes): Added. (WebCore::Document::processSupportedColorSchemes): Added. (WebCore::Document::useDarkAppearance const): Take system appearance and document's suppoerted color shcemes into account. * dom/Document.h: * editing/cocoa/WebContentReaderCocoa.mm: (WebCore::createFragment): Update use of LocalDefaultSystemAppearance. * html/HTMLMetaElement.cpp: (WebCore::HTMLMetaElement::process): Added supported-color-schemes behind runtime feature check. * inspector/InspectorOverlay.cpp: (WebCore::InspectorOverlay::paint): Update use of LocalDefaultSystemAppearance. * platform/mac/DragImageMac.mm: (WebCore::createDragImageForLink): Update use of LocalDefaultSystemAppearance. * platform/mac/LocalDefaultSystemAppearance.h: * platform/mac/LocalDefaultSystemAppearance.mm: (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Drop the need for useSystemAppearance. This is accounted for in Document::useDarkAppearance. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::paint): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::paintContents): Update use of LocalDefaultSystemAppearance. * rendering/RenderTheme.cpp: (WebCore::RenderTheme::paint): Use document instead of page. * rendering/RenderThemeCocoa.mm: (WebCore::RenderThemeCocoa::drawLineForDocumentMarker): Update use of LocalDefaultSystemAppearance. * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::documentViewFor const): Update use of LocalDefaultSystemAppearance. (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::transformSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::supportsSelectionForegroundColors const): Ditto. (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): Ditto. (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const): Ditto. (WebCore::RenderThemeMac::colorCache const): Ditto. (WebCore::RenderThemeMac::systemColor const): Ditto. (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary): Ditto. (WebCore::RenderThemeMac::paintSliderThumb): Ditto. (WebCore::RenderThemeMac::usingDarkAppearance const): No need to limit to macOS here. * svg/graphics/SVGImage.cpp: (WebCore::SVGImage::draw): Update use of LocalDefaultSystemAppearance. Source/WebKit: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView drawRect:]): Update use of LocalDefaultSystemAppearance. * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. * WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect): Ditto. Source/WebKitLegacy/mac: * WebCoreSupport/WebEditorClient.mm: (_WebCreateFragment): Update use of LocalDefaultSystemAppearance. LayoutTests: * css-dark-mode/supported-color-schemes-expected.txt: Added. * css-dark-mode/supported-color-schemes.html: Added. Canonical link: https://commits.webkit.org/205575@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-16 21:53:55 +00:00
</script>