Skip to content

Ignore Dynamic Resource Opt out Preferences #10794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

Ignore Dynamic Resource Opt out Preferences #10794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/AppContextDefaultValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static partial void PopulateDefaultValuesPartial(string platformIdentifier, stri
LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.KeyboardNavigationFromHyperlinkInItemsControlIsNotRelativeToFocusedElementSwitchName, false);
LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.ItemAutomationPeerKeepsItsItemAliveSwitchName, false);
LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.DisableFluentThemeWindowBackdropSwitchName, false);
LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.DisableDynamicResourceOptimizationSwitchName, true);
LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.DisableDynamicResourceOptimizationSwitchName, false);

#pragma warning restore CS0436 // Type conflicts with imported type
}
Expand Down
126 changes: 30 additions & 96 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceDictionary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1785,33 +1785,11 @@ private object FetchResource(
DeferredResourceReference deferredResourceReference;
if (!IsThemeDictionary)
{
if (FrameworkAppContextSwitches.DisableDynamicResourceOptimization)
{
if (_ownerApps is not null)
{
deferredResourceReference = new DeferredAppResourceReference(this, resourceKey);
}
else
{
deferredResourceReference = new DeferredResourceReference(this, resourceKey);
}

// Cache the deferredResourceReference so that it can be validated
// in case of a dictionary change prior to its inflation
if (_weakDeferredResourceReferences is null)
{
_weakDeferredResourceReferences = new WeakReferenceList();
}

_weakDeferredResourceReferences.Add(deferredResourceReference, true /*SkipFind*/);
}
else
{
// Cache the deferredResourceReference so that it can be validated
// in case of a dictionary change prior to its inflation
deferredResourceReference = _ownerApps is not null ? new DeferredAppResourceReference(this, resourceKey) : new DeferredResourceReference(this, resourceKey);
GetOrCreateWeakReferenceList(resourceKey).Add(deferredResourceReference, true /*SkipFind*/);
}

// Cache the deferredResourceReference so that it can be validated
// in case of a dictionary change prior to its inflation
deferredResourceReference = _ownerApps is not null ? new DeferredAppResourceReference(this, resourceKey) : new DeferredResourceReference(this, resourceKey);
GetOrCreateWeakReferenceList(resourceKey).Add(deferredResourceReference, true /*SkipFind*/);
}
else
{
Expand Down Expand Up @@ -1842,17 +1820,10 @@ private WeakReferenceList GetOrCreateWeakReferenceList(object resourceKey)

internal void RemoveDeferredResourceReference(DeferredResourceReference deferredResourceReference)
{
if (FrameworkAppContextSwitches.DisableDynamicResourceOptimization)

if (this._weakDeferredResourceReferencesMap?.TryGetValue(deferredResourceReference.Key, out var weakDeferredResourceReferences) is true)
{
_weakDeferredResourceReferences?.Remove(deferredResourceReference);
}
else
{
//GetWeakReferenceList(deferredResourceReference.Key)?.Remove(deferredResourceReference);
if (this._weakDeferredResourceReferencesMap?.TryGetValue(deferredResourceReference.Key, out var weakDeferredResourceReferences) is true)
{
weakDeferredResourceReferences.Remove(deferredResourceReference);
}
weakDeferredResourceReferences.Remove(deferredResourceReference);
}
}

Expand All @@ -1862,52 +1833,33 @@ internal void RemoveDeferredResourceReference(DeferredResourceReference deferred
/// </summary>
private void ValidateDeferredResourceReferences(object resourceKey)
{
if (FrameworkAppContextSwitches.DisableDynamicResourceOptimization)

if (_weakDeferredResourceReferencesMap is null)
{
if (_weakDeferredResourceReferences != null)
{
foreach (Object o in _weakDeferredResourceReferences)
{
DeferredResourceReference deferredResourceReference = o as DeferredResourceReference;
if (deferredResourceReference != null && (resourceKey == null || Object.Equals(resourceKey, deferredResourceReference.Key)))
{
// This will inflate the deferred reference, causing it
// to be removed from the list. The list may also be
// purged of dead references.
deferredResourceReference.GetValue(BaseValueSourceInternal.Unknown);
}
}
}
return;
}
else
{
if (_weakDeferredResourceReferencesMap is null)
{
return;
}

if (resourceKey is null)
if (resourceKey is null)
{
foreach (var weakDeferredResourceReferences in _weakDeferredResourceReferencesMap.Values)
{
foreach (var weakDeferredResourceReferences in _weakDeferredResourceReferencesMap.Values)
foreach (var weakResourceReference in weakDeferredResourceReferences)
{
foreach (var weakResourceReference in weakDeferredResourceReferences)
{
DeferredResourceReference deferredResourceReference = weakResourceReference as DeferredResourceReference;
DeferredResourceReference deferredResourceReference = weakResourceReference as DeferredResourceReference;

Inflate(deferredResourceReference);
}
Inflate(deferredResourceReference);
}
}
else
}
else
{
if (_weakDeferredResourceReferencesMap.TryGetValue(resourceKey, out var weakDeferredResourceReferences))
{
if (_weakDeferredResourceReferencesMap.TryGetValue(resourceKey, out var weakDeferredResourceReferences))
foreach (var weakResourceReference in weakDeferredResourceReferences)
{
foreach (var weakResourceReference in weakDeferredResourceReferences)
{
DeferredResourceReference deferredResourceReference = weakResourceReference as DeferredResourceReference;
DeferredResourceReference deferredResourceReference = weakResourceReference as DeferredResourceReference;

Inflate(deferredResourceReference);
}
Inflate(deferredResourceReference);
}
}
}
Expand Down Expand Up @@ -2595,37 +2547,20 @@ private void CopyDeferredContentFrom(ResourceDictionary loadedRD)

private void MoveDeferredResourceReferencesFrom(ResourceDictionary loadedRD)
{
if (FrameworkAppContextSwitches.DisableDynamicResourceOptimization)
{
// move the list
_weakDeferredResourceReferences = loadedRD._weakDeferredResourceReferences;
// move the map and thus the lists
_weakDeferredResourceReferencesMap = loadedRD._weakDeferredResourceReferencesMap;

if (_weakDeferredResourceReferencesMap is not null)
{
// redirect each entry toward its new owner
if (_weakDeferredResourceReferences != null)
foreach (var weakDeferredResourceReferences in _weakDeferredResourceReferencesMap.Values)
{
foreach (DeferredResourceReference drr in _weakDeferredResourceReferences)
foreach (DeferredResourceReference drr in weakDeferredResourceReferences)
{
drr.Dictionary = this;
}
}
}
else
{
// move the map and thus the lists
_weakDeferredResourceReferencesMap = loadedRD._weakDeferredResourceReferencesMap;

if (_weakDeferredResourceReferencesMap is not null)
{
// redirect each entry toward its new owner
foreach (var weakDeferredResourceReferences in _weakDeferredResourceReferencesMap.Values)
{
foreach (DeferredResourceReference drr in weakDeferredResourceReferences)
{
drr.Dictionary = this;
}
}
}
}
}

#endregion PrivateMethods
Expand Down Expand Up @@ -2691,7 +2626,6 @@ private enum FallbackState
private WeakReferenceList _ownerFEs = null;
private WeakReferenceList _ownerFCEs = null;
private WeakReferenceList _ownerApps = null;
private WeakReferenceList _weakDeferredResourceReferences = null;
private Dictionary<object, WeakReferenceList> _weakDeferredResourceReferencesMap = null;
private ObservableCollection<ResourceDictionary> _mergedDictionaries = null;
private Uri _source = null;
Expand Down
17 changes: 5 additions & 12 deletions ...rosoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ResourceReferenceExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,18 +275,11 @@ private void InvalidateCacheValue()
WriteInternalState(InternalState.IsListeningForInflated, false);
}
}

if (FrameworkAppContextSwitches.DisableDynamicResourceOptimization)
{
deferredResourceReference.RemoveFromDictionary();
}
else
{
// This will inflate the deferred reference, causing it
// to be removed from the list. The list may also be
// purged of dead references.
deferredResourceReference.GetValue(BaseValueSourceInternal.Unknown);
}

// This will inflate the deferred reference, causing it
// to be removed from the list. The list may also be
// purged of dead references.
deferredResourceReference.GetValue(BaseValueSourceInternal.Unknown);
}

StopListeningForFreezableChanges(resource);
Expand Down