Changeset 282215 in webkit

Timestamp:

Sep 9, 2021, 8:53:49 AM (5 years ago)

Author:

Wenson Hsieh

Message:

Unreviewed, fix the Mac Catalyst build after r282191
​https://bugs.webkit.org/show_bug.cgi?id=230037

• WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm:

Update some logic that's guarded by ENABLE(PLATFORM_DRIVEN_TEXT_CHECKING) to use "->" for accessing methods on
Ref and CheckedRef, rather than ".".

(WebKit::TextCheckingControllerProxy::rangeAndOffsetRelativeToSelection):
(WebKit::TextCheckingControllerProxy::replaceRelativeToSelection):
(WebKit::TextCheckingControllerProxy::removeAnnotationRelativeToSelection):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-09-09  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Unreviewed, fix the Mac Catalyst build after r282191
+        https://bugs.webkit.org/show_bug.cgi?id=230037
+
+        * WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm:
+
+        Update some logic that's guarded by ENABLE(PLATFORM_DRIVEN_TEXT_CHECKING) to use "->" for accessing methods on
+        Ref and CheckedRef, rather than ".".
+
+        (WebKit::TextCheckingControllerProxy::rangeAndOffsetRelativeToSelection):
+        (WebKit::TextCheckingControllerProxy::replaceRelativeToSelection):
+        (WebKit::TextCheckingControllerProxy::removeAnnotationRelativeToSelection):
+
 2021-09-09  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm

@@ -74 +74 @@
 std::optional<TextCheckingControllerProxy::RangeAndOffset> TextCheckingControllerProxy::rangeAndOffsetRelativeToSelection(int64_t offset, uint64_t length)
 {
-    auto& frameSelection = CheckedRef(m_page.corePage()->focusController()).focusedOrMainFrame().selection();
+    auto& frameSelection = CheckedRef(m_page.corePage()->focusController())->focusedOrMainFrame().selection();
     auto selection = frameSelection.selection();
 
@@ -98 +98 @@
 {
     Ref frame = CheckedRef(m_page.corePage()->focusController())->focusedOrMainFrame();
-    FrameSelection frameSelection = frame.selection();
+    auto& frameSelection = frame->selection();
     RefPtr root = frameSelection.rootEditableElementOrDocumentElement();
     if (!root)
@@ -108 +108 @@
     auto locationInRoot = rangeAndOffset->locationInRoot;
 
-    auto& markers = frame.document()->markers();
+    auto& markers = frame->document()->markers();
     markers.removeMarkers(rangeAndOffset->range, relevantMarkerTypes());
 
@@ -115 +115 @@
             bool restoreSelection = frameSelection.selection().isRange();
 
-            frame.editor().replaceRangeForSpellChecking(rangeAndOffsetOfReplacement->range, [[annotatedString.string string] substringWithRange:NSMakeRange(relativeReplacementLocation, relativeReplacementLength + [annotatedString.string length] - length)]);
+            frame->editor().replaceRangeForSpellChecking(rangeAndOffsetOfReplacement->range, [[annotatedString.string string] substringWithRange:NSMakeRange(relativeReplacementLocation, relativeReplacementLength + [annotatedString.string length] - length)]);
 
             if (restoreSelection) {
@@ -156 +156 @@
     auto removeCoreSpellingMarkers = annotation == "NSSpellingState";
     auto types = removeCoreSpellingMarkers ? relevantMarkerTypes() : WebCore::DocumentMarker::PlatformTextChecking;
-    RefPtr document = CheckedRef(m_page.corePage()->focusController()).focusedOrMainFrame().document();
+    RefPtr document = CheckedRef(m_page.corePage()->focusController())->focusedOrMainFrame().document();
     document->markers().filterMarkers(rangeAndOffset->range, [&] (const DocumentMarker& marker) {
         if (!WTF::holds_alternative<WebCore::DocumentMarker::PlatformTextCheckingData>(marker.data()))