Title: [201460] tags/Safari-602.1.34.1/Source/WebKit2
- Revision
- 201460
- Author
- matthew_han...@apple.com
- Date
- 2016-05-27 12:22:09 -0700 (Fri, 27 May 2016)
Log Message
Merge r201453. rdar://problem/26502712
Modified Paths
Diff
Modified: tags/Safari-602.1.34.1/Source/WebKit2/ChangeLog (201459 => 201460)
--- tags/Safari-602.1.34.1/Source/WebKit2/ChangeLog 2016-05-27 19:08:33 UTC (rev 201459)
+++ tags/Safari-602.1.34.1/Source/WebKit2/ChangeLog 2016-05-27 19:22:09 UTC (rev 201460)
@@ -1,3 +1,20 @@
+2016-05-27 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r201453. rdar://problem/26502712
+
+ 2016-05-27 Zalan Bujtas <za...@apple.com>
+
+ Regression(r200972): Webcore::Range::collectSelectionsRects() asserts in startContainer() while selecting text.
+ https://bugs.webkit.org/show_bug.cgi?id=158155
+ <rdar://problem/26502712>
+
+ Reviewed by Chris Dumez.
+
+ This patch ensures that we still have a valid paragraphRange after returning from enclosingTextUnitOfGranularity().
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::selectTextWithGranularityAtPoint):
+
2016-05-25 Fujii Hironori <hironori.fu...@sony.com>
[Unix] Potential buffer overrun of m_fileDescriptors in readBytesFromSocket of ConnectionUnix.cpp
Modified: tags/Safari-602.1.34.1/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (201459 => 201460)
--- tags/Safari-602.1.34.1/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-27 19:08:33 UTC (rev 201459)
+++ tags/Safari-602.1.34.1/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-27 19:22:09 UTC (rev 201460)
@@ -1879,9 +1879,9 @@
if (renderer->style().preserveNewline())
m_blockRectForTextSelection = renderer->absoluteBoundingBoxRect(true);
else {
- auto* paragraphRange = enclosingTextUnitOfGranularity(visiblePositionInFocusedNodeForPoint(frame, point, isInteractingWithAssistedNode), ParagraphGranularity, DirectionForward).get();
+ auto paragraphRange = enclosingTextUnitOfGranularity(visiblePositionInFocusedNodeForPoint(frame, point, isInteractingWithAssistedNode), ParagraphGranularity, DirectionForward);
if (paragraphRange && !paragraphRange->collapsed())
- m_blockRectForTextSelection = selectionBoxForRange(paragraphRange);
+ m_blockRectForTextSelection = selectionBoxForRange(paragraphRange.get());
}
if (rectIsTooBigForSelection(m_blockRectForTextSelection, frame))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
