Changeset 284843 in webkit

Timestamp:

Oct 25, 2021, 4:10:41 PM (5 years ago)

Author:

Wenson Hsieh

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:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-25  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        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  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -8861 +8861 @@
     [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;
 
@@ -9822 +9822 @@
 }
 
-- (void)_doAfterPendingImageAnalysis:(void(^)(WebKit::ProceedWithTextSelectionInImage ProceedWithTextSelectionInImage))block
+- (void)_doAfterPendingImageAnalysis:(void(^)(WebKit::ProceedWithTextSelectionInImage))block
 {
     if (self.hasPendingImageAnalysisRequest)
@@ -9830 +9830 @@
 }
 
-- (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);
 }
 
@@ -10861 +10861 @@
         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;