Changeset 250913 in webkit

Timestamp:

Oct 9, 2019 9:29:12 AM (5 years ago)

Author:

aestes@apple.com

Message:

[iOS] Remove redundant uses of USE(UIKIT_EDITING)
​https://bugs.webkit.org/show_bug.cgi?id=202717

Reviewed by Anders Carlsson.

Source/WebCore:

• page/ios/FrameIOS.mm:

(WebCore::Frame::qualifyingNodeAtViewportLocation):
(WebCore::Frame::approximateNodeAtViewportLocationLegacy):

Source/WebKitLegacy/ios:

• WebCoreSupport/WebVisiblePosition.mm:

(-[DOMNode startPosition]):
(-[DOMNode endPosition]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/ios/FrameIOS.mm (modified) (6 diffs)
• WebKitLegacy/ios/ChangeLog (modified) (1 diff)
• WebKitLegacy/ios/WebCoreSupport/WebVisiblePosition.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-09  Andy Estes  <aestes@apple.com>
+
+        [iOS] Remove redundant uses of USE(UIKIT_EDITING)
+        https://bugs.webkit.org/show_bug.cgi?id=202717
+
+        Reviewed by Anders Carlsson.
+
+        * page/ios/FrameIOS.mm:
+        (WebCore::Frame::qualifyingNodeAtViewportLocation):
+        (WebCore::Frame::approximateNodeAtViewportLocationLegacy):
+
 2019-10-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/ios/FrameIOS.mm

@@ -269 +269 @@
 Node* Frame::qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, const NodeQualifier& nodeQualifierFunction, ShouldApproximate shouldApproximate, ShouldFindRootEditableElement shouldFindRootEditableElement)
 {
-#if !USE(UIKIT_EDITING)
-    UNUSED_PARAM(shouldFindRootEditableElement);
-#endif
-
     adjustedViewportLocation = viewportLocation;
 
@@ -286 +282 @@
     Node* approximateNode = nodeQualifierFunction(candidateInfo, 0, 0);
 
-#if USE(UIKIT_EDITING)
     if (shouldFindRootEditableElement == ShouldFindRootEditableElement::Yes && approximateNode && approximateNode->isContentEditable()) {
         // If we are in editable content, we look for the root editable element.
@@ -294 +289 @@
             shouldApproximate = ShouldApproximate::No;
     }
-#endif
-
 
     float scale = page() ? page()->pageScaleFactor() : 1;
@@ -371 +364 @@
         IntPoint p = m_view->contentsToWindow(bestPoint);
         adjustedViewportLocation = p;
-#if USE(UIKIT_EDITING)
         if (shouldFindRootEditableElement == ShouldFindRootEditableElement::Yes && approximateNode->isContentEditable()) {
             // When in editable content, look for the root editable node again,
@@ -377 +369 @@
             approximateNode = approximateNode->rootEditableElement();
         }
-#endif
     }
 
@@ -411 +402 @@
             // We only accept pointer nodes before reaching the body tag.
             if (node->hasTagName(HTMLNames::bodyTag)) {
-#if USE(UIKIT_EDITING)
                 // Make sure we cover the case of an empty editable body.
                 if (!pointerCursorNode && node->isContentEditable())
                     pointerCursorNode = node;
-#endif
                 bodyHasBeenReached = true;
                 pointerCursorStillValid = false;

trunk/Source/WebKitLegacy/ios/ChangeLog

@@ +1 @@
+2019-10-09  Andy Estes  <aestes@apple.com>
+
+        [iOS] Remove redundant uses of USE(UIKIT_EDITING)
+        https://bugs.webkit.org/show_bug.cgi?id=202717
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/WebVisiblePosition.mm:
+        (-[DOMNode startPosition]):
+        (-[DOMNode endPosition]):
+
 2019-08-23  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebVisiblePosition.mm

@@ -541 +541 @@
 - (WebVisiblePosition *)startPosition
 {
-#if USE(UIKIT_EDITING)
     // When in editable content, we need to calculate the startPosition from the beginning of the
     // editable area.
@@ -549 +548 @@
         return [WebVisiblePosition _wrapVisiblePosition:startOfEditableContent(vp)];
     }
-#endif
     return [[self rangeOfContents] startPosition];
 }
@@ -555 +553 @@
 - (WebVisiblePosition *)endPosition
 {
-#if USE(UIKIT_EDITING)
     // When in editable content, we need to calculate the endPosition from the end of the
     // editable area.
@@ -563 +560 @@
         return [WebVisiblePosition _wrapVisiblePosition:endOfEditableContent(vp)];
     }
-#endif
     return [[self rangeOfContents] endPosition];
 }