Title: [284843] trunk/Source/WebKit
- Revision
- 284843
- Author
- [email protected]
- Date
- 2021-10-25 16:10:41 -0700 (Mon, 25 Oct 2021)
Log Message
Rename a few variable and parameter names in WKContentViewInteraction.mm
https://bugs.webkit.org/show_bug.cgi?id=232275
Reviewed by Tim Horton.
The `ProceedWithTextSelectionInImage` enum flag was being stored in a variable named
`ProceedWithTextSelectionInImage` in a few places, likely due to mass renaming when upstreaming WebKit support
for Live Text. Rename this so that we use lowercase for these variable names.
No change in behavior.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _dragInteraction:prepareForSession:completion:]):
(-[WKContentView _doAfterPendingImageAnalysis:]):
(-[WKContentView _invokeAllActionsToPerformAfterPendingImageAnalysis:]):
(-[WKContentView _contextMenuInteraction:configurationForMenuAtLocation:completion:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (284842 => 284843)
--- trunk/Source/WebKit/ChangeLog 2021-10-25 23:06:45 UTC (rev 284842)
+++ trunk/Source/WebKit/ChangeLog 2021-10-25 23:10:41 UTC (rev 284843)
@@ -1,3 +1,22 @@
+2021-10-25 Wenson Hsieh <[email protected]>
+
+ Rename a few variable and parameter names in WKContentViewInteraction.mm
+ https://bugs.webkit.org/show_bug.cgi?id=232275
+
+ Reviewed by Tim Horton.
+
+ The `ProceedWithTextSelectionInImage` enum flag was being stored in a variable named
+ `ProceedWithTextSelectionInImage` in a few places, likely due to mass renaming when upstreaming WebKit support
+ for Live Text. Rename this so that we use lowercase for these variable names.
+
+ No change in behavior.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _dragInteraction:prepareForSession:completion:]):
+ (-[WKContentView _doAfterPendingImageAnalysis:]):
+ (-[WKContentView _invokeAllActionsToPerformAfterPendingImageAnalysis:]):
+ (-[WKContentView _contextMenuInteraction:configurationForMenuAtLocation:completion:]):
+
2021-10-25 Alex Christensen <[email protected]>
Use xpc_connection_copy_invalidation_reason where available for debugging daemon connection failures
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (284842 => 284843)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-10-25 23:06:45 UTC (rev 284842)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-10-25 23:10:41 UTC (rev 284843)
@@ -8860,9 +8860,9 @@
[self cleanUpDragSourceSessionState];
- auto prepareForSession = [weakSelf = WeakObjCPtr<WKContentView>(self), session = retainPtr(session), completion = makeBlockPtr(completion)] (WebKit::ProceedWithTextSelectionInImage ProceedWithTextSelectionInImage) {
+ auto prepareForSession = [weakSelf = WeakObjCPtr<WKContentView>(self), session = retainPtr(session), completion = makeBlockPtr(completion)] (WebKit::ProceedWithTextSelectionInImage proceedWithTextSelectionInImage) {
auto strongSelf = weakSelf.get();
- if (!strongSelf || ProceedWithTextSelectionInImage == WebKit::ProceedWithTextSelectionInImage::Yes)
+ if (!strongSelf || proceedWithTextSelectionInImage == WebKit::ProceedWithTextSelectionInImage::Yes)
return;
auto dragOrigin = [session locationInView:strongSelf.get()];
@@ -9821,7 +9821,7 @@
[_imageAnalysisDeferringGestureRecognizer endDeferral:shouldPreventGestures];
}
-- (void)_doAfterPendingImageAnalysis:(void(^)(WebKit::ProceedWithTextSelectionInImage ProceedWithTextSelectionInImage))block
+- (void)_doAfterPendingImageAnalysis:(void(^)(WebKit::ProceedWithTextSelectionInImage))block
{
if (self.hasPendingImageAnalysisRequest)
_actionsToPerformAfterPendingImageAnalysis.append(makeBlockPtr(block));
@@ -9829,12 +9829,12 @@
block(WebKit::ProceedWithTextSelectionInImage::No);
}
-- (void)_invokeAllActionsToPerformAfterPendingImageAnalysis:(WebKit::ProceedWithTextSelectionInImage)ProceedWithTextSelectionInImage
+- (void)_invokeAllActionsToPerformAfterPendingImageAnalysis:(WebKit::ProceedWithTextSelectionInImage)proceedWithTextSelectionInImage
{
_pendingImageAnalysisRequestIdentifier = std::nullopt;
_elementPendingImageAnalysis = std::nullopt;
for (auto block : std::exchange(_actionsToPerformAfterPendingImageAnalysis, { }))
- block(ProceedWithTextSelectionInImage);
+ block(proceedWithTextSelectionInImage);
}
#endif // ENABLE(IMAGE_ANALYSIS)
@@ -10860,9 +10860,9 @@
if (!self.webView.configuration._longPressActionsEnabled)
return completion(nil);
- auto getConfigurationAndContinue = [weakSelf = WeakObjCPtr<WKContentView>(self), interaction = retainPtr(interaction), completion = makeBlockPtr(completion), triggeredByImageAnalysisTimeout] (WebKit::ProceedWithTextSelectionInImage ProceedWithTextSelectionInImage) {
+ auto getConfigurationAndContinue = [weakSelf = WeakObjCPtr<WKContentView>(self), interaction = retainPtr(interaction), completion = makeBlockPtr(completion), triggeredByImageAnalysisTimeout] (WebKit::ProceedWithTextSelectionInImage proceedWithTextSelectionInImage) {
auto strongSelf = weakSelf.get();
- if (!strongSelf || ProceedWithTextSelectionInImage == WebKit::ProceedWithTextSelectionInImage::Yes) {
+ if (!strongSelf || proceedWithTextSelectionInImage == WebKit::ProceedWithTextSelectionInImage::Yes) {
completion(nil);
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
