[iOS] Clean up visible position comparisons in WebPage::requestDocumentEditingContext()

https://bugs.webkit.org/show_bug.cgi?id=213701

Reviewed by Geoffrey Garen.

Use std::min and std::max when the result needs to be copied instead of doing the comparison
by hand to make the code a tiny bit more clear. Also, don't copy a VisiblePosition when doing
the min/max in-place. Both of these things are unlikely to effect code generation. If they do,
the latter makes things a tiny bit more efficient.

* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::requestDocumentEditingContext):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Source/WebKit/ChangeLog

@@ -1,3 +1,18 @@
+2020-06-28  Daniel Bates  <[email protected]>
+
+        [iOS] Clean up visible position comparisons in WebPage::requestDocumentEditingContext()
+        https://bugs.webkit.org/show_bug.cgi?id=213701
+
+        Reviewed by Geoffrey Garen.
+
+        Use std::min and std::max when the result needs to be copied instead of doing the comparison
+        by hand to make the code a tiny bit more clear. Also, don't copy a VisiblePosition when doing
+        the min/max in-place. Both of these things are unlikely to effect code generation. If they do,
+        the latter makes things a tiny bit more efficient.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::requestDocumentEditingContext):
+
 2020-06-28  Youenn Fablet  <[email protected]>
 
         MediaRecorder stopRecorder() returns empty Blob after first use

Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -4179,8 +4179,8 @@ static VisiblePosition visiblePositionForPointInRootViewCoordinates(Frame& frame
     auto selectionRange = selection.toNormalizedRange();
     auto rangeOfInterest = makeRange(rangeOfInterestStart, rangeOfInterestEnd);
     if (selectionRange && rangesOverlap(rangeOfInterest.get(), createLiveRange(*selectionRange).ptr())) {
-        startOfRangeOfInterestInSelection = rangeOfInterestStart > selectionStart ? rangeOfInterestStart : selectionStart;
-        endOfRangeOfInterestInSelection = rangeOfInterestEnd < selectionEnd ? rangeOfInterestEnd : selectionEnd;
+        startOfRangeOfInterestInSelection = std::max(rangeOfInterestStart, selectionStart);
+        endOfRangeOfInterestInSelection = std::min(rangeOfInterestEnd, selectionEnd);
     } else {
         auto rootNode = makeRefPtr(rangeOfInterest->commonAncestorContainer());
         if (!rootNode) {
@@ -4221,12 +4221,14 @@ static VisiblePosition visiblePositionForPointInRootViewCoordinates(Frame& frame
         contextBeforeStart = rangeOfInterestStart;
         contextAfterEnd = rangeOfInterestEnd;
         if (wantsMarkedTextRects && compositionRange) {
-            // In the case where the client has requested marked text rects, additionally make sure that the
-            // context range encompasses the entire marked text range.
+            // In the case where the client has requested marked text rects make sure that the context
+            // range encompasses the entire marked text range so that we don't return a truncated result.
             auto compositionStart = compositionRange->startPosition();
             auto compositionEnd = compositionRange->endPosition();
-            contextBeforeStart = contextBeforeStart > compositionStart ? compositionStart : contextBeforeStart;
-            contextAfterEnd = contextAfterEnd < compositionEnd ? compositionEnd : contextAfterEnd;
+            if (contextBeforeStart > compositionStart)
+                contextBeforeStart = compositionStart;
+            if (contextAfterEnd < compositionEnd)
+                contextAfterEnd = compositionEnd;
         }
     }