Refactor caret painting logic #10049
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
mwyrzykowski
added
the
Layout and Rendering
|
EWS run on previous version of this PR (hash 624ed1e) |
rniwa
approved these changes
Feb 13, 2023
mwyrzykowski
force-pushed
the
eng/Refactor-caret-painting-logic
branch
from
624ed1e
to
711cc96
Compare
|
EWS run on previous version of this PR (hash 711cc96) |
mwyrzykowski
force-pushed
the
eng/Refactor-caret-painting-logic
branch
from
711cc96
to
56f0933
Compare
|
EWS run on previous version of this PR (hash 56f0933) |
mwyrzykowski
force-pushed
the
eng/Refactor-caret-painting-logic
branch
from
56f0933
to
796c63b
Compare
|
EWS run on previous version of this PR (hash 796c63b)
|
mwyrzykowski
force-pushed
the
eng/Refactor-caret-painting-logic
branch
from
796c63b
to
c2c4eee
Compare
|
EWS run on previous version of this PR (hash c2c4eee)
|
mwyrzykowski
force-pushed
the
eng/Refactor-caret-painting-logic
branch
from
c2c4eee
to
22c59ca
Compare
|
EWS run on previous version of this PR (hash 22c59ca)
|
mwyrzykowski
force-pushed
the
eng/Refactor-caret-painting-logic
branch
from
22c59ca
to
6d639cf
Compare
|
EWS run on previous version of this PR (hash 6d639cf) |
mwyrzykowski
force-pushed
the
eng/Refactor-caret-painting-logic
branch
from
6d639cf
to
4d456e9
Compare
|
EWS run on previous version of this PR (hash 4d456e9)
|
mwyrzykowski
commented
Feb 20, 2023
| @@ -1120,6 +1129,11 @@ void RenderBlock::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset) | |||
| if (pushedClip) | |||
| popContentsClip(paintInfo, phase, adjustedPaintOffset); | |||
|
|
|||
| if (paintInfo.phase == PaintPhase::Foreground && !renderCaretInsideContentsClip()) { | |||
There was a problem hiding this comment.
@smfr I want to render the caret outside of the RenderBlock / text field's clipping rectangle. Is there a better way to do this than ignoring the clipping rectangle? Should I paint the caret as part of a different paint phase?
pxlcoder
approved these changes
Feb 23, 2023
Comment on lines
1133
to
1134
| paintCaret(paintInfo, adjustedPaintOffset, CursorCaret); | ||
| paintCaret(paintInfo, adjustedPaintOffset, DragCaret); |
There was a problem hiding this comment.
Can we factor these two lines into a separate method, since it's duplicated below?
There was a problem hiding this comment.
Good idea, I'll make that change
mwyrzykowski
force-pushed
the
eng/Refactor-caret-painting-logic
branch
from
4d456e9
to
1832b98
Compare
|
EWS run on current version of this PR (hash 1832b98)
|
https://bugs.webkit.org/show_bug.cgi?id=252148 <radar://104975415> Reviewed by Ryosuke Niwa and Aditya Keerthi. Continue previous refactorings to the caret painting logic to allow some additional flexibility. * Source/WebCore/editing/FrameSelection.cpp: (WebCore::fillCaretRect): Pass not just the presentation properties but the entire animator to allow for additional flexibility. (WebCore::repaintCaretRectForLocalRect): (WebCore::repaintCaretForLocalRect): Allow the animator to influence the repaint rect. (WebCore::FrameSelection::invalidateCaretRect): (WebCore::CaretBase::invalidateCaretRect): (WebCore::FrameSelection::paintCaret): (WebCore::CaretBase::paintCaret const): (WebCore::DragCaretController::paintDragCaret const): * Source/WebCore/editing/FrameSelection.h: Pass the caret animator instead of just its properties. * Source/WebCore/rendering/RenderBlock.cpp: (WebCore::renderCaretInsideContentsClip): (WebCore::RenderBlock::paint): (WebCore::RenderBlock::paintObject): Allow rendering the caret outside the element's clipping rectangle. Canonical link: https://commits.webkit.org/260775@main
webkit-commit-queue
force-pushed
the
eng/Refactor-caret-painting-logic
branch
from
1832b98
to
e314f57
Compare
|
Committed 260775@main (e314f57): https://commits.webkit.org/260775@main Reviewed commits have been landed. Closing PR #10049 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
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.
e314f57
1832b98
🧪 mac-wk2🧪 mac-AS-debug-wk2🛠 watch