Title: [210872] branches/safari-603-branch/Source/WebCore
- Revision
- 210872
- Author
- matthew_han...@apple.com
- Date
- 2017-01-18 12:43:13 -0800 (Wed, 18 Jan 2017)
Log Message
Merge r210795. rdar://problem/24457632
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210871 => 210872)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-18 20:43:11 UTC (rev 210871)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-18 20:43:13 UTC (rev 210872)
@@ -1,5 +1,24 @@
2017-01-18 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210795. rdar://problem/24457632
+
+ 2017-01-16 Antti Koivisto <an...@apple.com>
+
+ CrashTracer: com.apple.WebKit.WebContent at _javascript_Core: WTF::StringImpl::containsOnlyWhitespace
+ https://bugs.webkit.org/show_bug.cgi?id=167106
+ <rdar://problem/24457632>
+
+ Reviewed by Tim Horton.
+
+ Speculative fix.
+
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::DataDetection::detectContentInRange):
+
+ Test before casting to Text.
+
+2017-01-18 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210750. rdar://problem/29995070
2017-01-13 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-603-branch/Source/WebCore/editing/cocoa/DataDetection.mm (210871 => 210872)
--- branches/safari-603-branch/Source/WebCore/editing/cocoa/DataDetection.mm 2017-01-18 20:43:11 UTC (rev 210871)
+++ branches/safari-603-branch/Source/WebCore/editing/cocoa/DataDetection.mm 2017-01-18 20:43:13 UTC (rev 210872)
@@ -577,7 +577,8 @@
auto* parentNode = range->startContainer().parentNode();
if (!parentNode)
continue;
-
+ if (!is<Text>(range->startContainer()))
+ continue;
auto& currentTextNode = downcast<Text>(range->startContainer());
Document& document = currentTextNode.document();
String textNodeData;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
