Title: [258280] trunk/Source/WebKit
- Revision
- 258280
- Author
- achristen...@apple.com
- Date
- 2020-03-11 13:32:07 -0700 (Wed, 11 Mar 2020)
Log Message
Fix the macCatalyst build after r258250
* WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm:
(WebKit::TextCheckingControllerProxy::annotatedSubstringBetweenPositions):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (258279 => 258280)
--- trunk/Source/WebKit/ChangeLog 2020-03-11 20:26:06 UTC (rev 258279)
+++ trunk/Source/WebKit/ChangeLog 2020-03-11 20:32:07 UTC (rev 258280)
@@ -1,3 +1,10 @@
+2020-03-11 Alex Christensen <achristen...@webkit.org>
+
+ Fix the macCatalyst build after r258250
+
+ * WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm:
+ (WebKit::TextCheckingControllerProxy::annotatedSubstringBetweenPositions):
+
2020-03-11 Chris Dumez <cdu...@apple.com>
Terminate the Network / Plugin processes when receiving invalid IPC from them
Modified: trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm (258279 => 258280)
--- trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm 2020-03-11 20:26:06 UTC (rev 258279)
+++ trunk/Source/WebKit/WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.mm 2020-03-11 20:32:07 UTC (rev 258280)
@@ -193,14 +193,14 @@
[string appendAttributedString:[[[NSAttributedString alloc] initWithString:it.text().createNSStringWithoutCopying().get()] autorelease]];
- RefPtr<Range> currentTextRange = it.range();
- auto markers = document->markers().markersInRange(*currentTextRange, DocumentMarker::PlatformTextChecking);
+ SimpleRange currentTextRange = it.range();
+ auto markers = document->markers().markersInRange(createLiveRange(currentTextRange), DocumentMarker::PlatformTextChecking);
for (const auto* marker : markers) {
if (!WTF::holds_alternative<DocumentMarker::PlatformTextCheckingData>(marker->data()))
continue;
auto& textCheckingData = WTF::get<DocumentMarker::PlatformTextCheckingData>(marker->data());
- auto subrange = TextIterator::subrange(*currentTextRange, marker->startOffset(), marker->endOffset() - marker->startOffset());
+ auto subrange = TextIterator::subrange(createLiveRange(currentTextRange), marker->startOffset(), marker->endOffset() - marker->startOffset());
size_t subrangeLocation;
size_t subrangeLength;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
