Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: c0d5482e12f00b4dfb45eeadafe5ae738891cdc0
https://github.com/WebKit/WebKit/commit/c0d5482e12f00b4dfb45eeadafe5ae738891cdc0
Author: Ada Chan <[email protected]>
Date: 2025-06-30 (Mon, 30 Jun 2025)
Changed paths:
M Source/WebKit/ModelProcess/ModelConnectionToWebProcess.cpp
M Source/WebKit/ModelProcess/ModelConnectionToWebProcess.h
M Source/WebKit/ModelProcess/ModelProcess.cpp
M Source/WebKit/ModelProcess/ModelProcess.h
M Source/WebKit/ModelProcess/ModelProcessCreationParameters.h
M Source/WebKit/ModelProcess/ModelProcessCreationParameters.serialization.in
M Source/WebKit/ModelProcess/ModelProcessModelPlayerManagerProxy.cpp
M Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.h
M Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.mm
M Source/WebKit/UIProcess/Model/cocoa/ModelProcessProxyCocoa.mm
M Source/WebKit/WebKitSwift/RealityKit/WKRKEntity.h
M Source/WebKit/WebKitSwift/RealityKit/WKRKEntity.swift
Log Message:
-----------
[Model Element] Enforce a default memory limit on entity loads
https://bugs.webkit.org/show_bug.cgi?id=295167
rdar://145610624
Reviewed by Mike Wyrzykowski.
Specify enforceMemoryConstraints and memoryLimit in load options when loading
the model entities. The default memory limit that ModelProcessModelPlayerProxy
uses is 100MB. For testing/debugging purposes, this memory limit can be
overridden with the WebKitDebugModelEntityMemoryLimit runtime default.
* Source/WebKit/ModelProcess/ModelConnectionToWebProcess.cpp:
(WebKit::ModelConnectionToWebProcess::debugEntityMemoryLimit const):
* Source/WebKit/ModelProcess/ModelConnectionToWebProcess.h:
* Source/WebKit/ModelProcess/ModelProcess.cpp:
(WebKit::ModelProcess::initializeModelProcess):
Store the entity memory limit from the model process creation parameters.
* Source/WebKit/ModelProcess/ModelProcess.h:
* Source/WebKit/ModelProcess/ModelProcessCreationParameters.h:
* Source/WebKit/ModelProcess/ModelProcessCreationParameters.serialization.in:
* Source/WebKit/ModelProcess/ModelProcessModelPlayerManagerProxy.cpp:
(WebKit::ModelProcessModelPlayerManagerProxy::createModelPlayer):
* Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.h:
* Source/WebKit/ModelProcess/cocoa/ModelProcessModelPlayerProxy.mm:
(WebKit::RKModelLoaderUSD::load):
Pass the entity memory limit to -[WKRKEntity loadFromData:...]. If no
memory limit is specified, pass in 0 to tell WKRKEntity to load without limit.
(WebKit::loadREModelUsingRKUSDLoader):
(WebKit::ModelProcessModelPlayerProxy::create):
(WebKit::ModelProcessModelPlayerProxy::ModelProcessModelPlayerProxy):
(WebKit::ModelProcessModelPlayerProxy::load):
Pass the entity memory limit to loadREModelUsingRKUSDLoader(). If no memory
limit is set, pass in the default which is 100MB.
* Source/WebKit/UIProcess/Model/cocoa/ModelProcessProxyCocoa.mm:
(WebKit::ModelProcessProxy::updateModelProcessCreationParameters):
* Source/WebKit/WebKitSwift/RealityKit/WKRKEntity.h:
* Source/WebKit/WebKitSwift/RealityKit/WKRKEntity.swift:
(WKRKEntity.load(from:withAttributionTaskID:entityMemoryLimit:)):
(WKRKEntity.load(from:withAttributionTaskID:)): Deleted.
Canonical link: https://commits.webkit.org/296796@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
