Title: [264249] trunk/Source/WebCore
- Revision
- 264249
- Author
- [email protected]
- Date
- 2020-07-10 18:11:10 -0700 (Fri, 10 Jul 2020)
Log Message
Fix build for PLATFORM(IOS_FAMILY) && !ENABLE(REVEAL), for example tvOS
* editing/cocoa/DictionaryLookup.mm:
(WebCore::DictionaryLookup::rangeForSelection): Update to return SimpleRange.
(WebCore::DictionaryLookup::rangeAtHitTestResult): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (264248 => 264249)
--- trunk/Source/WebCore/ChangeLog 2020-07-11 00:30:24 UTC (rev 264248)
+++ trunk/Source/WebCore/ChangeLog 2020-07-11 01:11:10 UTC (rev 264249)
@@ -1,3 +1,11 @@
+2020-07-10 Darin Adler <[email protected]>
+
+ Fix build for PLATFORM(IOS_FAMILY) && !ENABLE(REVEAL), for example tvOS
+
+ * editing/cocoa/DictionaryLookup.mm:
+ (WebCore::DictionaryLookup::rangeForSelection): Update to return SimpleRange.
+ (WebCore::DictionaryLookup::rangeAtHitTestResult): Ditto.
+
2020-07-08 Darin Adler <[email protected]>
Remove live ranges from Document.h, AlternativeTextController.h, DictionaryLookup.h, and WebPage.h
Modified: trunk/Source/WebCore/editing/cocoa/DictionaryLookup.mm (264248 => 264249)
--- trunk/Source/WebCore/editing/cocoa/DictionaryLookup.mm 2020-07-11 00:30:24 UTC (rev 264248)
+++ trunk/Source/WebCore/editing/cocoa/DictionaryLookup.mm 2020-07-11 01:11:10 UTC (rev 264249)
@@ -533,19 +533,19 @@
#endif // PLATFORM(MAC)
-#elif PLATFORM(IOS_FAMILY) // ENABLE(REVEAL)
+#elif PLATFORM(IOS_FAMILY) // PLATFORM(IOS_FAMILY) && !ENABLE(REVEAL)
-std::tuple<RefPtr<Range>, NSDictionary *> DictionaryLookup::rangeForSelection(const VisibleSelection&)
+Optional<std::tuple<SimpleRange, NSDictionary *>> DictionaryLookup::rangeForSelection(const VisibleSelection&)
{
- return { nullptr, nil };
+ return WTF::nullopt;
}
-std::tuple<RefPtr<Range>, NSDictionary *> DictionaryLookup::rangeAtHitTestResult(const HitTestResult&)
+Optional<std::tuple<SimpleRange, NSDictionary *>> DictionaryLookup::rangeAtHitTestResult(const HitTestResult&)
{
- return { nullptr, nil };
+ return WTF::nullopt;
}
-#endif // ENABLE(REVEAL)
+#endif
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
