Fix depth-ordering update #3486
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wdanilo
reviewed
May 26, 2022
| @@ -851,11 +851,22 @@ impl LayerDynamicShapeInstance { | |||
| // === Sublayers === | |||
| // ================= | |||
|
|
|||
| /// Unboxed callback. | |||
There was a problem hiding this comment.
I'd write here doc about what the callback does, not what this line is syntactically.
Comment on lines
860
to
862
| move || { | ||
| parent_depth_order_dirty.set(); | ||
| } |
wdanilo
approved these changes
May 27, 2022
| move || { | ||
| for sublayers in parents.borrow().iter() { | ||
| // It's safe to do it having parents borrowed, because the only possible callback called | ||
| // OnElementDepthOrderDirty, which don't borrow_mut at any point. |
There was a problem hiding this comment.
Please use the [`...`] syntax when referring to Rust entities.
jdunkerley
pushed a commit
that referenced
this pull request
May 31, 2022
There are two dirty flags in layers: depth_order_dirty and element_depth_order_dirty - one marking changed in Layer, second marking change in one of sublayers. The depth_order_dirty has a proper callback for setting element_depth_order_dirty of its parent. However, the latter did not propagate up. I fixed it by adding callback for element_depth_order_dirty which sets the depth_order_dirty of the parent. # Important Notes * The question to @wdanilo : is it possible, that I can propagate dirty directly to element_depth_order_dirty, without setting depth_order_dirty? As far as I understand the code, it would also work (and we would omit some unnecessary updates). * I tried to leave some logs, but I don't feel how to do that: the tooling I used was very specific, only the concrete ids of symbols and layers were logged, and I don't know how to generalize it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Description
There are two dirty flags in layers: depth_order_dirty and element_depth_order_dirty - one marking changed in Layer, second marking change in one of sublayers. The depth_order_dirty has a proper callback for setting element_depth_order_dirty of its parent. However, the latter did not propagate up.
I fixed it by adding callback for element_depth_order_dirty which sets the depth_order_dirty of the parent.
Important Notes
Checklist
Please include the following checklist in your PR:
Scala,
Java,
and
Rust
style guides.
[ ] Unit tests have been written where possible.- The code is a bit untestable due to high coupling../run.sh ide distand./run.sh ide watch.