Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 9e7af1080e15c9ada108a705e72d8c1377385904
https://github.com/WebKit/WebKit/commit/9e7af1080e15c9ada108a705e72d8c1377385904
Author: Etienne Segonzac <[email protected]>
Date: 2026-09-21 (Mon, 21 Sep 2026)
Changed paths:
A LayoutTests/spatial-css/environment-map-model-element-expected.txt
A LayoutTests/spatial-css/environment-map-model-element.html
A LayoutTests/spatial-css/environment-map-rule-off-expected.txt
A LayoutTests/spatial-css/environment-map-rule-off.html
A LayoutTests/spatial-css/environment-map-rule-parsing-expected.txt
A LayoutTests/spatial-css/environment-map-rule-parsing.html
M LayoutTests/spatial-css/resources/spatial-portal-utils.js
A LayoutTests/spatial-css/spatial-portal-environment-map-change-expected.txt
A LayoutTests/spatial-css/spatial-portal-environment-map-change.html
A LayoutTests/spatial-css/spatial-portal-environment-map-expected.txt
A
LayoutTests/spatial-css/spatial-portal-environment-map-media-query-expected.txt
A LayoutTests/spatial-css/spatial-portal-environment-map-media-query.html
A
LayoutTests/spatial-css/spatial-portal-environment-map-nested-model-ignored-expected.txt
A
LayoutTests/spatial-css/spatial-portal-environment-map-nested-model-ignored.html
A LayoutTests/spatial-css/spatial-portal-environment-map.html
M Source/WebCore/CMakeLists.txt
M Source/WebCore/DerivedSources-input.xcfilelist
M Source/WebCore/DerivedSources-output.xcfilelist
M Source/WebCore/DerivedSources.make
A Source/WebCore/Modules/model-element/EnvironmentMapLoader.cpp
A Source/WebCore/Modules/model-element/EnvironmentMapLoader.h
M Source/WebCore/Modules/model-element/HTMLModelElement.cpp
M Source/WebCore/Modules/model-element/HTMLModelElement.h
M Source/WebCore/Modules/model-element/ModelPlayer.cpp
M Source/WebCore/Modules/model-element/ModelPlayer.h
M Source/WebCore/Modules/model-element/SpatialPortalController.cpp
M Source/WebCore/Modules/model-element/SpatialPortalController.h
M Source/WebCore/Sources.txt
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
M Source/WebCore/bindings/js/WebCoreBuiltinNames.h
A Source/WebCore/css/CSSEnvironmentMapRule.cpp
A Source/WebCore/css/CSSEnvironmentMapRule.h
A Source/WebCore/css/CSSEnvironmentMapRule.idl
M Source/WebCore/css/CSSProperties.json
M Source/WebCore/css/CSSValueKeywords.in
M Source/WebCore/css/StyleRule.cpp
M Source/WebCore/css/StyleRule.h
M Source/WebCore/css/StyleRuleType.h
M Source/WebCore/css/StyleSheetContents.cpp
M Source/WebCore/css/parser/CSSAtRuleID.cpp
M Source/WebCore/css/parser/CSSAtRuleID.h
M Source/WebCore/css/parser/CSSParser.cpp
M Source/WebCore/css/parser/CSSParser.h
M Source/WebCore/css/parser/CSSPropertyParser.cpp
M Source/WebCore/css/parser/CSSSupportsParser.cpp
M Source/WebCore/css/scripts/process-css-properties.py
M Source/WebCore/inspector/InspectorStyleSheet.cpp
M Source/WebCore/rendering/RenderBox.cpp
M Source/WebCore/rendering/RenderModel.cpp
M Source/WebCore/style/RuleSet.cpp
M Source/WebCore/style/RuleSet.h
M Source/WebCore/style/RuleSetBuilder.cpp
M Source/WebCore/testing/Internals.cpp
M Source/WebCore/testing/Internals.h
M Source/WebCore/testing/Internals.idl
M Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.h
M Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.messages.in
M Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.mm
M Source/WebKit/WebKitSwift/RealityKit/WKRKEntity.h
M Source/WebKit/WebKitSwift/RealityKit/WKRKEntity.swift
M Source/WebKit/WebProcess/Model/ModelProcessModelPlayer.cpp
M Source/WebKit/WebProcess/Model/ModelProcessModelPlayer.h
M Source/WebKit/WebProcess/Model/WebModelPlayer.h
M Source/WebKit/WebProcess/Model/WebModelPlayer.mm
Log Message:
-----------
Add initial `@environment-map` support for Spatial Portals
https://bugs.webkit.org/show_bug.cgi?id=324583
<rdar://182292380>
Reviewed by Mike Wyrzykowski and Tim Nguyen.
Introduce the at-rule to declare environment maps and wire it to Spatial
Portals and Model Elements (when SpatialPortalEnabled is on).
https://webkit.github.io/explainers/css-spatial/Overview.html#environment-map-references
Tests: spatial-css/environment-map-model-element.html
spatial-css/environment-map-rule-off.html
spatial-css/environment-map-rule-parsing.html
spatial-css/spatial-portal-environment-map-change.html
spatial-css/spatial-portal-environment-map-media-query.html
spatial-css/spatial-portal-environment-map-nested-model-ignored.html
spatial-css/spatial-portal-environment-map.html
* LayoutTests/spatial-css/environment-map-model-element-expected.txt: Added.
* LayoutTests/spatial-css/environment-map-model-element.html: Added.
* LayoutTests/spatial-css/environment-map-rule-off-expected.txt: Added.
* LayoutTests/spatial-css/environment-map-rule-off.html: Added.
* LayoutTests/spatial-css/environment-map-rule-parsing-expected.txt: Added.
* LayoutTests/spatial-css/environment-map-rule-parsing.html: Added.
* LayoutTests/spatial-css/resources/spatial-portal-utils.js:
* LayoutTests/spatial-css/spatial-portal-environment-map-change-expected.txt:
Added.
* LayoutTests/spatial-css/spatial-portal-environment-map-change.html: Added.
* LayoutTests/spatial-css/spatial-portal-environment-map-expected.txt: Added.
*
LayoutTests/spatial-css/spatial-portal-environment-map-media-query-expected.txt:
Added.
* LayoutTests/spatial-css/spatial-portal-environment-map-media-query.html:
Added.
*
LayoutTests/spatial-css/spatial-portal-environment-map-nested-model-ignored-expected.txt:
Added.
*
LayoutTests/spatial-css/spatial-portal-environment-map-nested-model-ignored.html:
Added.
* LayoutTests/spatial-css/spatial-portal-environment-map.html: Added.
Add new tests covering this feature.
* Source/WebCore/CMakeLists.txt:
* Source/WebCore/DerivedSources-input.xcfilelist:
* Source/WebCore/DerivedSources-output.xcfilelist:
* Source/WebCore/DerivedSources.make:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
Add thew new files to the build.
* Source/WebCore/Modules/model-element/EnvironmentMapLoader.cpp: Added.
(WebCore::resolvedEnvironmentMapURL):
(WebCore::createEnvironmentMapResourceRequest):
(WebCore::EnvironmentMapLoader::~EnvironmentMapLoader):
(WebCore::EnvironmentMapLoader::load):
(WebCore::EnvironmentMapLoader::cancel):
(WebCore::EnvironmentMapLoader::clearResource):
(WebCore::EnvironmentMapLoader::complete):
(WebCore::EnvironmentMapLoader::dataReceived):
(WebCore::EnvironmentMapLoader::notifyFinished):
* Source/WebCore/Modules/model-element/EnvironmentMapLoader.h: Added.
Extract the environment map loading code so it can be shared between the
SpatialPortalController and the HTMLModelElement.
* Source/WebCore/Modules/model-element/HTMLModelElement.cpp:
(WebCore::HTMLModelElement::~HTMLModelElement):
(WebCore::HTMLModelElement::spatialPortalContextDidChange):
(WebCore::HTMLModelElement::dataReceived):
(WebCore::HTMLModelElement::notifyFinished):
(WebCore::HTMLModelElement::didFinishEnvironmentMapLoading):
(WebCore::HTMLModelElement::createModelPlayer):
(WebCore::HTMLModelElement::reloadModelPlayer):
(WebCore::HTMLModelElement::setEffectiveEnvironmentMap):
(WebCore::environmentMapKindForURL):
(WebCore::HTMLModelElement::updateEnvironmentMap):
(WebCore::HTMLModelElement::environmentMapStyleDidChange):
(WebCore::HTMLModelElement::effectiveEnvironmentMapForTesting const):
(WebCore::HTMLModelElement::environmentMapRequestResource):
(WebCore::HTMLModelElement::environmentMapResetAndReject):
(WebCore::HTMLModelElement::environmentMapDidLoad):
(WebCore::HTMLModelElement::setEnvironmentMap): Deleted.
(WebCore::HTMLModelElement::environmentMapResourceFinished): Deleted.
* Source/WebCore/Modules/model-element/HTMLModelElement.h:
Use thew new EnvironmentMapLoader.
Add support for the `environment-map` CSS property.
* Source/WebCore/Modules/model-element/ModelPlayer.cpp:
(WebCore::ModelPlayer::setEnvironmentMap):
(WebCore::ModelPlayer::disableEnvironmentMap):
(WebCore::ModelPlayer::enableSystemEnvironmentMap):
(WebCore::ModelPlayer::environmentMapForTesting const):
* Source/WebCore/Modules/model-element/ModelPlayer.h:
Extend the ModelPlayer interface to cover all the environment map
scenario and introduce some testing facilities.
* Source/WebCore/Modules/model-element/SpatialPortalController.cpp:
(WebCore::SpatialPortalController::prepareForRemoval):
(WebCore::SpatialPortalController::ensureModelPlayer):
(WebCore::SpatialPortalController::environmentMapStyleDidChange):
(WebCore::SpatialPortalController::updateEnvironmentMap):
(WebCore::SpatialPortalController::startEnvironmentMapLoad):
(WebCore::SpatialPortalController::environmentMapDidLoad):
(WebCore::SpatialPortalController::pushEnvironmentMapToPlayer const):
(WebCore::SpatialPortalController::effectiveEnvironmentMapForTesting const):
* Source/WebCore/Modules/model-element/SpatialPortalController.h:
Add support for the `environment-map` CSS property, using the
EnvironmentMapLoader.
* Source/WebCore/bindings/js/WebCoreBuiltinNames.h:
* Source/WebCore/css/CSSEnvironmentMapRule.cpp: Added.
(WebCore::toEnvironmentMapFormat):
(WebCore::StyleRuleEnvironmentMap::StyleRuleEnvironmentMap):
(WebCore::StyleRuleEnvironmentMap::create):
(WebCore::CSSEnvironmentMapRule::create):
(WebCore::CSSEnvironmentMapRule::CSSEnvironmentMapRule):
(WebCore::CSSEnvironmentMapRule::name const):
(WebCore::CSSEnvironmentMapRule::format const):
(WebCore::CSSEnvironmentMapRule::src const):
(WebCore::CSSEnvironmentMapRule::cssText const):
(WebCore::CSSEnvironmentMapRule::reattach):
(WebCore::StyleRuleEnvironmentMap::copy const):
* Source/WebCore/css/CSSEnvironmentMapRule.h: Added.
(isType):
* Source/WebCore/css/CSSEnvironmentMapRule.idl: Added.
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/css/CSSValueKeywords.in:
* Source/WebCore/css/StyleRule.cpp:
(WebCore::StyleRuleBase::visitDerived):
(WebCore::StyleRuleBase::createCSSOMWrapper const):
* Source/WebCore/css/StyleRule.h:
(WebCore::StyleRuleBase::isEnvironmentMapRule const):
* Source/WebCore/css/StyleRuleType.h:
* Source/WebCore/css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::traverseSubresources const):
(WebCore::StyleSheetContents::mayDependOnBaseURL const):
* Source/WebCore/css/parser/CSSAtRuleID.cpp:
(WebCore::cssAtRuleID):
* Source/WebCore/css/parser/CSSAtRuleID.h:
* Source/WebCore/css/parser/CSSParser.cpp:
(WebCore::CSSParser::consumeAtRule):
(WebCore::CSSParser::consumeEnvironmentMapRule):
(WebCore::ruleDoesNotAllowImportant):
* Source/WebCore/css/parser/CSSParser.h:
* Source/WebCore/css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::parseValue):
(WebCore::consumeEnvironmentMapDescriptor):
* Source/WebCore/css/parser/CSSSupportsParser.cpp:
(WebCore::CSSSupportsParser::consumeSupportsAtRuleFunction):
* Source/WebCore/inspector/InspectorStyleSheet.cpp:
(WebCore::flatteningStrategyForStyleRuleType):
* Source/WebCore/style/RuleSet.cpp:
(WebCore::Style::RuleSet::environmentMapRuleForName const):
* Source/WebCore/style/RuleSet.h:
* Source/WebCore/style/RuleSetBuilder.cpp:
(WebCore::Style::RuleSetBuilder::addChildRule):
(WebCore::Style::RuleSetBuilder::addMutatingRulesToResolver):
Add the support for the `@environment-map` at-rule.
* Source/WebCore/css/scripts/process-css-properties.py:
(GenerationContext.generate_property_id_switch_function_bool):
Fix a small issue with the generation script since both `@font-face` and
`@environment-map` use an `src` property.
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::notifyEnvironmentMapStyleDidChange):
(WebCore::updateSpatialPortalController):
(WebCore::RenderBox::styleDidChange):
* Source/WebCore/rendering/RenderModel.cpp:
(WebCore::RenderModel::styleDidChange):
Reconfigure the model / portal when the style changes.
* Source/WebCore/testing/Internals.cpp:
(WebCore::Internals::effectiveEnvironmentMap):
* Source/WebCore/testing/Internals.h:
* Source/WebCore/testing/Internals.idl:
Expose the test only method used to inspect environment maps.
* Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.h:
* Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.messages.in:
* Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.mm:
(WebKit::ModelProcessModelPlayerProxy::didFinishLoading):
(WebKit::ModelProcessModelPlayerProxy::setEnvironmentMapData):
(WebKit::ModelProcessModelPlayerProxy::disableEnvironmentMap):
(WebKit::ModelProcessModelPlayerProxy::enableSystemEnvironmentMap):
(WebKit::ModelProcessModelPlayerProxy::environmentMapTargetEntity const):
(WebKit::ModelProcessModelPlayerProxy::applyEnvironmentMapDataAndRelease):
(WebKit::ModelProcessModelPlayerProxy::applyDefaultIBL):
(WebKit::ModelProcessModelPlayerProxy::removeIBL):
(WebKit::ModelProcessModelPlayerProxy::captureStateForReload):
(WebKit::ModelProcessModelPlayerProxy::setEnvironmentMap): Deleted.
* Source/WebKit/WebProcess/Model/ModelProcessModelPlayer.cpp:
(WebKit::ModelProcessModelPlayer::setEnvironmentMap):
(WebKit::ModelProcessModelPlayer::environmentMapForTesting const):
(WebKit::ModelProcessModelPlayer::disableEnvironmentMap):
(WebKit::ModelProcessModelPlayer::enableSystemEnvironmentMap):
* Source/WebKit/WebProcess/Model/ModelProcessModelPlayer.h:
* Source/WebKit/WebProcess/Model/WebModelPlayer.h:
* Source/WebKit/WebProcess/Model/WebModelPlayer.mm:
(WebKit::WebModelPlayer::notifyClientDidFinishLoading):
(WebKit::WebModelPlayer::setEnvironmentMap):
Implement the new Environment Map methods for the ModelProcess
ModelPlayer.
- Removing all IBL (for `environment-map: none`)
- Explicitly switching to the system one (for `environment-map: auto`)
- Switching to a custom one with a simple fade
* Source/WebKit/WebKitSwift/RealityKit/WKRKEntity.h:
* Source/WebKit/WebKitSwift/RealityKit/WKRKEntity.swift:
(EnvironmentMapTransition.entity):
(EnvironmentMapTransition.elapsed):
(EnvironmentMapTransition.nearestEndpoint):
(EnvironmentMapTransition.begin):
(EnvironmentMapTransition.tick(_:)):
(EnvironmentMapTransition.fraction):
(WKRKEntity.imageBasedLight):
(WKRKEntity.displayedEnvironment):
(WKRKEntity.environmentMapTransition):
(WKRKEntity.environmentMapTransitionSubscription):
(WKRKEntity.resizedImage(from:)):
(WKRKEntity.setImageBasedLightSource(_:)):
(WKRKEntity.applyIBL(_:)):
(WKRKEntity.endEnvironmentMapTransition):
(WKRKEntity.startEnvironmentMapTransition(_:to:)):
(WKRKEntity.environmentMapTransitionDidFinish(to:)):
(WKRKEntity.applyIBLData(_:attributionHandler:)):
(WKRKEntity.removeIBL):
(WKRKEntity.resizedImage(_:)): Deleted.
In order to switch IBL without glitch, switch from a
`VirtualEnvironmentProbeComponent` to a `ImageBasedLightComponent`
+ `ImageBasedLightReceiverComponent` combo.
Make the image resizing async and concurrent to help with the glitches.
Canonical link: https://commits.webkit.org/321518@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
