Title: [282215] trunk/Source/WebKit
- Revision
- 282215
- Author
- [email protected]
- Date
- 2021-09-09 08:53:49 -0700 (Thu, 09 Sep 2021)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (282214 => 282215)
--- trunk/Source/WebKit/ChangeLog 2021-09-09 15:41:53 UTC (rev 282214)
+++ trunk/Source/WebKit/ChangeLog 2021-09-09 15:53:49 UTC (rev 282215)
@@ -1,3 +1,17 @@
+2021-09-09 Wenson Hsieh <[email protected]>
+
+ 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 <[email protected]>
Categorize WebRTC TCP nw connections like done for WebRTC UDP nw connections
Modified: trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm (282214 => 282215)
--- trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm 2021-09-09 15:41:53 UTC (rev 282214)
+++ trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm 2021-09-09 15:53:49 UTC (rev 282215)
@@ -73,7 +73,7 @@
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();
RefPtr root = frameSelection.rootEditableElementOrDocumentElement();
@@ -97,7 +97,7 @@
void TextCheckingControllerProxy::replaceRelativeToSelection(const WebCore::AttributedString& annotatedString, int64_t selectionOffset, uint64_t length, uint64_t relativeReplacementLocation, uint64_t relativeReplacementLength)
{
Ref frame = CheckedRef(m_page.corePage()->focusController())->focusedOrMainFrame();
- FrameSelection frameSelection = frame.selection();
+ auto& frameSelection = frame->selection();
RefPtr root = frameSelection.rootEditableElementOrDocumentElement();
if (!root)
return;
@@ -107,7 +107,7 @@
return;
auto locationInRoot = rangeAndOffset->locationInRoot;
- auto& markers = frame.document()->markers();
+ auto& markers = frame->document()->markers();
markers.removeMarkers(rangeAndOffset->range, relevantMarkerTypes());
if (relativeReplacementLocation != NSNotFound) {
@@ -114,7 +114,7 @@
if (auto rangeAndOffsetOfReplacement = rangeAndOffsetRelativeToSelection(selectionOffset + relativeReplacementLocation, relativeReplacementLength)) {
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) {
uint64_t selectionLocationToRestore = locationInRoot - selectionOffset;
@@ -155,7 +155,7 @@
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()))
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
