-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
Use a separate animation ID from the session ID in all cases, including initial animation. #30009
Merged
webkit-commit-queue
merged 1 commit into
WebKit:main
from
megangardner:eng/Use-a-seperate-animation-ID-from-the-session-ID-in-all-cases-including-initial-animation-
Jun 25, 2024
+160
β133
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
Contributor
megangardner
added
the
WebKit Misc.
For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore).
label
Jun 20, 2024
EWS run on previous version of this PR (hash 77a0607) |
megangardner
requested review from
hortont424,
whsieh,
pxlcoder,
rr-codes and
aprotyas
June 20, 2024 18:24
rr-codes
reviewed
Jun 20, 2024
rr-codes
reviewed
Jun 20, 2024
Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.mm
Outdated
Show resolved
Hide resolved
rr-codes
reviewed
Jun 20, 2024
rr-codes
reviewed
Jun 20, 2024
Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.mm
Outdated
Show resolved
Hide resolved
rr-codes
reviewed
Jun 20, 2024
Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.mm
Outdated
Show resolved
Hide resolved
rr-codes
reviewed
Jun 20, 2024
Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.mm
Outdated
Show resolved
Hide resolved
Typo in commit title: |
megangardner
force-pushed
the
eng/Use-a-seperate-animation-ID-from-the-session-ID-in-all-cases-including-initial-animation-
branch
from
June 20, 2024 19:48
77a0607
to
7b837a2
Compare
EWS run on previous version of this PR (hash 7b837a2) |
rr-codes
reviewed
Jun 20, 2024
rr-codes
reviewed
Jun 20, 2024
Source/WebKit/WebKitSwift/TextAnimation/TextAnimationManager.swift
Outdated
Show resolved
Hide resolved
rr-codes
reviewed
Jun 20, 2024
Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.mm
Outdated
Show resolved
Hide resolved
rr-codes
reviewed
Jun 20, 2024
Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.h
Outdated
Show resolved
Hide resolved
rr-codes
approved these changes
Jun 20, 2024
megangardner
changed the title
Use a seperate animation ID from the session ID in all cases, including initial animation.
Use a separate animation ID from the session ID in all cases, including initial animation.
Jun 20, 2024
megangardner
force-pushed
the
eng/Use-a-seperate-animation-ID-from-the-session-ID-in-all-cases-including-initial-animation-
branch
from
June 20, 2024 23:34
7b837a2
to
f87eafe
Compare
EWS run on previous version of this PR (hash f87eafe) |
megangardner
added
safe-merge-queue
Applied to automatically send a pull-request to merge-queue after passing EWS checks
merge-queue
Applied to send a pull request to merge-queue
and removed
safe-merge-queue
Applied to automatically send a pull-request to merge-queue after passing EWS checks
merge-queue
Applied to send a pull request to merge-queue
labels
Jun 20, 2024
megangardner
force-pushed
the
eng/Use-a-seperate-animation-ID-from-the-session-ID-in-all-cases-including-initial-animation-
branch
from
June 24, 2024 22:54
f87eafe
to
0f4399f
Compare
EWS run on current version of this PR (hash 0f4399f) |
webkit-commit-queue
added
merging-blocked
Applied to prevent a change from being merged
and removed
merge-queue
Applied to send a pull request to merge-queue
labels
Jun 25, 2024
megangardner
added
unsafe-merge-queue
Applied to send a pull request to merge-queue, but skip building and testing
and removed
merging-blocked
Applied to prevent a change from being merged
labels
Jun 25, 2024
β¦ng initial animation. https://bugs.webkit.org/show_bug.cgi?id=275700 rdar://130217887 Reviewed by Richard Robinson. Perviously, I was using the sessionUUID for the first animation. This has made it difficult to write clean and compartmentalized code, and caused issues where the wrong UUID was used. This patch separated these into two separate concepts, and added mapping storage in the animation controller. I also clean up some of the naming for the clean up code, and generally make the code easier to understand. * Source/WebCore/page/ChromeClient.h: (WebCore::ChromeClient::removeTextAnimationForAnimationID): (WebCore::ChromeClient::removeTransparentMarkersForSessionID): (WebCore::ChromeClient::removeInitialTextAnimation): (WebCore::ChromeClient::addInitialTextAnimation): (WebCore::ChromeClient::removeTextAnimationForID): Deleted. (WebCore::ChromeClient::cleanUpTextAnimationsForSessionID): Deleted. * Source/WebCore/page/writing-tools/WritingToolsController.mm: (WebCore::WritingToolsController::didBeginWritingToolsSession): (WebCore::WritingToolsController::proofreadingSessionDidReceiveSuggestions): (WebCore::WritingToolsController::compositionSessionDidReceiveTextWithReplacementRange): (WebCore::WritingToolsController::didEndWritingToolsSession): * Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _addTextAnimationForAnimationID:withData:]): (-[WKWebView _removeTextAnimationForAnimationID:]): (-[WKWebView didBeginWritingToolsSession:contexts:]): (-[WKWebView _enableSourceTextAnimationAfterElementWithID:]): (-[WKWebView _enableFinalTextAnimationForElementWithID:]): (-[WKWebView _disableTextAnimationWithUUID:]): (-[WKWebView _addTextAnimationTypeForID:withData:]): Deleted. (-[WKWebView _removeTextAnimationForID:]): Deleted. (-[WKWebView beginWritingToolsAnimationForSessionWithUUID:]): Deleted. (-[WKWebView endWritingToolsAnimationForSessionWithUUID:]): Deleted. * Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h: * Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h: * Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm: (WebKit::PageClientImplCocoa::addTextAnimationForAnimationID): (WebKit::PageClientImplCocoa::removeTextAnimationForAnimationID): (WebKit::PageClientImplCocoa::addTextAnimationTypeForID): Deleted. (WebKit::PageClientImplCocoa::removeTextAnimationForID): Deleted. * Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm: (WebKit::WebPageProxy::addTextAnimationForAnimationID): (WebKit::WebPageProxy::removeTextAnimationForAnimationID): (WebKit::WebPageProxy::addTextAnimationTypeForID): Deleted. (WebKit::WebPageProxy::removeTextAnimationForID): Deleted. * Source/WebKit/UIProcess/PageClient.h: * Source/WebKit/UIProcess/WKSTextAnimationManager.h: * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/UIProcess/WebPageProxy.messages.in: * Source/WebKit/UIProcess/ios/WKContentViewInteraction.h: * Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView addTextAnimationForAnimationID:withStyleType:]): (-[WKContentView removeTextAnimationForAnimationID:]): (-[WKContentView addTextAnimationTypeForID:withStyleType:]): Deleted. (-[WKContentView removeTextAnimationForID:]): Deleted. * Source/WebKit/UIProcess/mac/WKTextAnimationManager.h: * Source/WebKit/UIProcess/mac/WKTextAnimationManager.mm: (-[WKTextAnimationManager addTextAnimationForAnimationID:withData:]): (-[WKTextAnimationManager removeTextAnimationForAnimationID:]): (-[WKTextAnimationManager restoreTextAnimationType]): (-[WKTextAnimationManager addTextAnimationTypeForID:withData:]): Deleted. (-[WKTextAnimationManager removeTextAnimationForID:]): Deleted. * Source/WebKit/UIProcess/mac/WebViewImpl.h: * Source/WebKit/UIProcess/mac/WebViewImpl.mm: (WebKit::WebViewImpl::addTextAnimationForAnimationID): (WebKit::WebViewImpl::removeTextAnimationForAnimationID): (WebKit::WebViewImpl::addTextAnimationTypeForID): Deleted. (WebKit::WebViewImpl::removeTextAnimationForID): Deleted. * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebKitSwift/TextAnimation/TextAnimationManager.swift: (beginEffect(for:style:)): (endEffect(for:)): * Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp: (WebKit::WebChromeClient::removeTextAnimationForAnimationID): (WebKit::WebChromeClient::removeTransparentMarkersForSessionID): (WebKit::WebChromeClient::removeInitialTextAnimation): (WebKit::WebChromeClient::addInitialTextAnimation): (WebKit::WebChromeClient::removeTextAnimationForID): Deleted. (WebKit::WebChromeClient::cleanUpTextAnimationsForSessionID): Deleted. * Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h: * Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.h: Renamed from Source/WebKit/WebProcess/WebPage/TextAnimationController.h. * Source/WebKit/WebProcess/WebPage/Cocoa/TextAnimationController.mm: (WebKit::TextAnimationController::contextRangeForTextAnimationID const): (WebKit::TextAnimationController::removeTransparentMarkersForSessionID): (WebKit::TextAnimationController::removeInitialTextAnimation): (WebKit::TextAnimationController::addInitialTextAnimation): (WebKit::TextAnimationController::addSourceTextAnimation): (WebKit::TextAnimationController::addDestinationTextAnimation): (WebKit::TextAnimationController::updateUnderlyingTextVisibilityForTextAnimationID): (WebKit::TextAnimationController::createTextIndicatorForTextAnimationID): (WebKit::TextAnimationController::contextRangeForTextAnimationType const): Deleted. (WebKit::TextAnimationController::cleanUpTextAnimationsForSessionID): Deleted. * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::addTextAnimationForAnimationID): (WebKit::WebPage::removeTextAnimationForAnimationID): (WebKit::WebPage::removeTransparentMarkersForSessionID): (WebKit::WebPage::removeInitialTextAnimation): (WebKit::WebPage::addInitialTextAnimation): (WebKit::WebPage::addTextAnimationTypeForID): Deleted. (WebKit::WebPage::removeTextAnimationForID): Deleted. (WebKit::WebPage::cleanUpTextAnimationsForSessionID): Deleted. * Source/WebKit/WebProcess/WebPage/WebPage.h: Canonical link: https://commits.webkit.org/280319@main
webkit-commit-queue
force-pushed
the
eng/Use-a-seperate-animation-ID-from-the-session-ID-in-all-cases-including-initial-animation-
branch
from
June 25, 2024 05:38
0f4399f
to
c5c0cb2
Compare
Committed 280319@main (c5c0cb2): https://commits.webkit.org/280319@main Reviewed commits have been landed. Closing PR #30009 and removing active labels. |
webkit-commit-queue
removed
the
unsafe-merge-queue
Applied to send a pull request to merge-queue, but skip building and testing
label
Jun 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
WebKit Misc.
For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore).
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.
c5c0cb2
0f4399f