Adjust cursor animator properties #12705
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 6792f39) |
mwyrzykowski
force-pushed
the
eng/Adjust-cursor-animator-properties
branch
from
6792f39
to
f12168a
Compare
|
EWS run on previous version of this PR (hash f12168a)
|
webkit-ews-buildbot
added
the
merging-blocked
mwyrzykowski
removed
the
merging-blocked
mwyrzykowski
force-pushed
the
eng/Adjust-cursor-animator-properties
branch
from
f12168a
to
cdd54a9
Compare
|
EWS run on previous version of this PR (hash cdd54a9) |
webkit-ews-buildbot
added
the
merging-blocked
mwyrzykowski
removed
the
merging-blocked
mwyrzykowski
force-pushed
the
eng/Adjust-cursor-animator-properties
branch
from
cdd54a9
to
b123980
Compare
|
EWS run on previous version of this PR (hash b123980) |
pxlcoder
approved these changes
Apr 18, 2023
Comment on lines
36
to
50
| Alternate | ||
| }; | ||
|
|
||
| enum class CaretAnimatorStopReason : uint8_t { | ||
| Default, | ||
| CaretRectChanged, | ||
| }; |
There was a problem hiding this comment.
Slightly strange to see this before the forward declarations. Would you mind moving these enums below line 50?
Comment on lines
79
to
80
| { | ||
| if (!m_isActive) |
There was a problem hiding this comment.
Should probably move this into the implementation file.
| @@ -91,7 +96,9 @@ class CaretAnimator { | |||
| PresentationProperties presentationProperties() const { return m_presentationProperties; } | |||
| virtual void paint(const Node&, GraphicsContext&, const FloatRect&, const Color&, const LayoutPoint&) const; | |||
| virtual LayoutRect repaintCaretRectForLocalRect(LayoutRect) const; | |||
| #if defined(__has_include) && __has_include(<WebKitAdditions/RenderBlockAdditions.h>) | |||
There was a problem hiding this comment.
Probably want a FIXME + bug, so we can remember to remove this #if?
There was a problem hiding this comment.
Good idea, I added a FIXME with a bug
mwyrzykowski
force-pushed
the
eng/Adjust-cursor-animator-properties
branch
from
b123980
to
5536906
Compare
|
EWS run on current version of this PR (hash 5536906) |
webkit-commit-queue
force-pushed
the
eng/Adjust-cursor-animator-properties
branch
from
5536906
to
98107fc
Compare
https://bugs.webkit.org/show_bug.cgi?id=255399 <radar://107662722> Reviewed by Aditya Keerthi. This patch allows suspending the blink state of the cursor from the UI process, moves logic from an static internal function to a virtual function, and corrects an issue where the caret does not start animating after a transition. This also removes CaretAnimator::addLine which is no longer used. * Source/WebCore/editing/FrameSelection.cpp: (WebCore::CaretBase::paintCaret const): (WebCore::FrameSelection::caretAnimatorInvalidated): Ensure animator starts animating after a caret transition. (WebCore::FrameSelection::updateAppearance): With CaretAnimator's stop function virtual, send the reason for why the stop was issued. * Source/WebCore/platform/CaretAnimator.cpp: (WebCore::CaretAnimator::adjustedClipRect const): Allow specific animator's to override the clip rectangle. * Source/WebCore/platform/CaretAnimator.h: (WebCore::CaretAnimator::stop): Allow for a reason to be used in determining stop behavior. (WebCore::CaretAnimator::addLine const): Deleted. This is no longer needed. * Source/WebCore/rendering/RenderBlock.cpp: (WebCore::RenderBlock::paint): (WebCore::RenderBlock::paintObject): Revert previously added changes. (WebCore::renderCaretInsideContentsClip): Deleted. This is no longer used, instead CaretAnimator has a virtual member function to control the clip rectangle. * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::setCaretBlinkingSuspended): * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::setCaretBlinkingSuspended): * Source/WebKit/WebProcess/WebPage/WebPage.h: * Source/WebKit/WebProcess/WebPage/WebPage.messages.in: Allow blink to be suspended from the UI process. Canonical link: https://commits.webkit.org/263083@main
webkit-commit-queue
force-pushed
the
eng/Adjust-cursor-animator-properties
branch
from
98107fc
to
cebe6cd
Compare
|
Committed 263083@main (cebe6cd): https://commits.webkit.org/263083@main Reviewed commits have been landed. Closing PR #12705 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.
cebe6cd
5536906
🧪 api-mac🧪 gtk-wk2🧪 mac-wk2