Title: [239280] trunk/Source
- Revision
- 239280
- Author
- za...@apple.com
- Date
- 2018-12-17 12:18:18 -0800 (Mon, 17 Dec 2018)
Log Message
Unreviewed build fix.
Source/WebCore:
* page/ios/FrameIOS.mm:
(WebCore::Frame::interpretationsForCurrentRoot const):
Source/WebKitLegacy/ios:
* WebCoreSupport/WebVisiblePosition.mm:
(-[WebVisiblePosition enclosingRangeWithDictationPhraseAlternatives:]):
(-[WebVisiblePosition enclosingRangeWithCorrectionIndicator]):
Source/WebKitLegacy/mac:
* WebView/WebFrame.mm:
(-[WebFrame getDictationResultRanges:andMetadatas:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (239279 => 239280)
--- trunk/Source/WebCore/ChangeLog 2018-12-17 19:42:55 UTC (rev 239279)
+++ trunk/Source/WebCore/ChangeLog 2018-12-17 20:18:18 UTC (rev 239280)
@@ -1,5 +1,12 @@
2018-12-17 Zalan Bujtas <za...@apple.com>
+ Unreviewed build fix.
+
+ * page/ios/FrameIOS.mm:
+ (WebCore::Frame::interpretationsForCurrentRoot const):
+
+2018-12-17 Zalan Bujtas <za...@apple.com>
+
Reproducible ASSERTion failure when toggling layer borders with find-in-page up
https://bugs.webkit.org/show_bug.cgi?id=192762
<rdar://problem/46676873>
Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (239279 => 239280)
--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2018-12-17 19:42:55 UTC (rev 239279)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2018-12-17 20:18:18 UTC (rev 239280)
@@ -625,7 +625,8 @@
Node* pastLastNode = rangeOfRootContents->pastLastNode();
for (Node* node = rangeOfRootContents->firstNode(); node != pastLastNode; node = NodeTraversal::next(*node)) {
- for (auto* marker : document()->markers().markersFor(node, DocumentMarker::DictationPhraseWithAlternatives)) {
+ ASSERT(node);
+ for (auto* marker : document()->markers().markersFor(*node, DocumentMarker::DictationPhraseWithAlternatives)) {
// First, add text that precede the marker.
if (precedingTextStartPosition != createLegacyEditingPosition(node, marker->startOffset())) {
RefPtr<Range> precedingTextRange = Range::create(*document(), precedingTextStartPosition, createLegacyEditingPosition(node, marker->startOffset()));
Modified: trunk/Source/WebKitLegacy/ios/ChangeLog (239279 => 239280)
--- trunk/Source/WebKitLegacy/ios/ChangeLog 2018-12-17 19:42:55 UTC (rev 239279)
+++ trunk/Source/WebKitLegacy/ios/ChangeLog 2018-12-17 20:18:18 UTC (rev 239280)
@@ -1,3 +1,11 @@
+2018-12-17 Zalan Bujtas <za...@apple.com>
+
+ Unreviewed build fix.
+
+ * WebCoreSupport/WebVisiblePosition.mm:
+ (-[WebVisiblePosition enclosingRangeWithDictationPhraseAlternatives:]):
+ (-[WebVisiblePosition enclosingRangeWithCorrectionIndicator]):
+
2018-12-05 Wenson Hsieh <wenson_hs...@apple.com>
Turn WritingDirection into an enum class
Modified: trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebVisiblePosition.mm (239279 => 239280)
--- trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebVisiblePosition.mm 2018-12-17 19:42:55 UTC (rev 239279)
+++ trunk/Source/WebKitLegacy/ios/WebCoreSupport/WebVisiblePosition.mm 2018-12-17 20:18:18 UTC (rev 239280)
@@ -421,7 +421,7 @@
Node* node = p.deepEquivalent().anchorNode();
Document& document = node->document();
- const auto& markers = document.markers().markersFor(node, DocumentMarker::DictationPhraseWithAlternatives);
+ const auto& markers = document.markers().markersFor(*node, DocumentMarker::DictationPhraseWithAlternatives);
if (markers.isEmpty())
return nil;
@@ -455,7 +455,7 @@
Node* node = p.deepEquivalent().anchorNode();
Document& document = node->document();
- const auto& markers = document.markers().markersFor(node, DocumentMarker::Spelling);
+ const auto& markers = document.markers().markersFor(*node, DocumentMarker::Spelling);
if (markers.isEmpty())
return nil;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (239279 => 239280)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-12-17 19:42:55 UTC (rev 239279)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-12-17 20:18:18 UTC (rev 239280)
@@ -1,3 +1,10 @@
+2018-12-17 Zalan Bujtas <za...@apple.com>
+
+ Unreviewed build fix.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame getDictationResultRanges:andMetadatas:]):
+
2018-12-15 Darin Adler <da...@apple.com>
Use warning-ignoring macros more consistently and simply
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm (239279 => 239280)
--- trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm 2018-12-17 19:42:55 UTC (rev 239279)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm 2018-12-17 20:18:18 UTC (rev 239280)
@@ -1733,7 +1733,7 @@
id previousMetadata = nil;
for (Node* node = root; node; node = NodeTraversal::next(*node)) {
- auto markers = document->markers().markersFor(node);
+ auto markers = document->markers().markersFor(*node);
for (auto* marker : markers) {
if (marker->type() != DocumentMarker::DictationResult)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
