8000 Rename RemoteLayerTreeTransaction::LayerProperties::keyPathsOfAnimati… · WebKit/WebKit@23ed9c1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 23ed9c1

Browse files
graoutsgraouts
committed
Rename RemoteLayerTreeTransaction::LayerProperties::keyPathsOfAnimationsToRemove
https://bugs.webkit.org/show_bug.cgi?id=250642 Reviewed by Simon Fraser. These aren't key paths in the sense a key path is provided to an API such as `-[CAKeyframeAnimation animationWithKeyPath:]` but rather keys as used in `-[CALayer addAnimation:forKey:]`. * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm: (WebKit::RemoteLayerTreePropertyApplier::applyPropertiesToLayer): * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm: (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties): (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode const): (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode): (WebKit::dumpChangedLayers): * Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.cpp: (WebKit::PlatformCALayerRemote::didCommit): (WebKit::PlatformCALayerRemote::removeAnimationForKey): Canonical link: https://commits.webkit.org/258937@main
1 parent 8562f15 commit 23ed9c1

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

‎Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static void updateCustomAppearance(CALayer *layer, GraphicsLayer::CustomAppearan
262262
PlatformCAFilters::setFiltersOnLayer(layer, properties.filters ? *properties.filters : FilterOperations());
263263

264264
if (properties.changedProperties & RemoteLayerTreeTransaction::AnimationsChanged)
265-
PlatformCAAnimationRemote::updateLayerAnimations(layer, layerTreeHost, properties.addedAnimations, properties.keyPathsOfAnimationsToRemove);
265+
PlatformCAAnimationRemote::updateLayerAnimations(layer, layerTreeHost, properties.addedAnimations, properties.keysOfAnimationsToRemove);
266266

267267
if (properties.changedProperties & RemoteLayerTreeTransaction::AntialiasesEdgesChanged)
268268
layer.edgeAntialiasingMask = properties.antialiasesEdges ? (kCALayerLeftEdge | kCALayerRightEdge | kCALayerBottomEdge | kCALayerTopEdge) : 0;

‎Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class RemoteLayerTreeTransaction {
157157
Vector<WebCore::GraphicsLayer::PlatformLayerID> children;
158158

159159
Vector<std::pair<String, PlatformCAAnimationRemote::Properties>> addedAnimations;
160-
HashSet<String> keyPathsOfAnimationsToRemove;
160+
HashSet<String> keysOfAnimationsToRemove;
161161

162162
WebCore::FloatPoint3D position;
163163
WebCore::FloatPoint3D anchorPoint { 0.5, 0.5, 0 };

‎Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreeTransaction.mm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
, name(other.name)
112112
, children(other.children)
113113
, addedAnimations(other.addedAnimations)
114-
, keyPathsOfAnimationsToRemove(other.keyPathsOfAnimationsToRemove)
114+
, keysOfAnimationsToRemove(other.keysOfAnimationsToRemove)
115115
, position(other.position)
116116
, anchorPoint(other.anchorPoint)
117117
, bounds(other.bounds)
@@ -178,7 +178,7 @@
178178

179179
if (changedProperties & AnimationsChanged) {
180180
encoder << addedAnimations;
181-
encoder << keyPathsOfAnimationsToRemove;
181+
encoder << keysOfAnimationsToRemove;
182182
}
183183

184184
if (changedProperties & PositionChanged)
@@ -333,7 +333,7 @@
333333
if (!decoder.decode(result.addedAnimations))
334334
return false;
335335

336-
if (!decoder.decode(result.keyPathsOfAnimationsToRemove))
336+
if (!decoder.decode(result.keysOfAnimationsToRemove))
337337
return false;
338338
}
339339

@@ -957,7 +957,7 @@ static void dumpChangedLayers(TextStream& ts, const RemoteLayerTreeTransaction::
957957
for (const auto& keyAnimationPair : layerProperties.addedAnimations)
958958
ts.dumpProperty("animation " + keyAnimationPair.first, keyAnimationPair.second);
959959

960-
for (const auto& name : layerProperties.keyPathsOfAnimationsToRemove)
960+
for (const auto& name : layerProperties.keysOfAnimationsToRemove)
961961
ts.dumpProperty("removed animation", name);
962962
}
963963

‎Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemote.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ void PlatformCALayerRemote::recursiveBuildTransaction(RemoteLayerTreeContext& co
213213
void PlatformCALayerRemote::didCommit()
214214
{
215215
m_properties.addedAnimations.clear();
216-
m_properties.keyPathsOfAnimationsToRemove.clear();
216+
m_properties.keysOfAnimationsToRemove.clear();
217217
m_properties.resetChangedProperties();
218218
}
219219

@@ -420,7 +420,7 @@ void PlatformCALayerRemote::removeAnimationForKey(const String& key)
420420
return pair.first == key;
421421
});
422422
}
423-
m_properties.keyPathsOfAnimationsToRemove.add(key);
423+
m_properties.keysOfAnimationsToRemove.add(key);
424424
m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::AnimationsChanged);
425425
}
426426

0 commit comments

Comments
 (0)
0