Title: [201453] trunk/Source/WebKit2
- Revision
- 201453
- Author
- [email protected]
- Date
- 2016-05-27 10:09:14 -0700 (Fri, 27 May 2016)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (201452 => 201453)
--- trunk/Source/WebKit2/ChangeLog 2016-05-27 16:05:25 UTC (rev 201452)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-27 17:09:14 UTC (rev 201453)
@@ -1,3 +1,16 @@
+2016-05-27 Zalan Bujtas <[email protected]>
+
+ 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-26 Brady Eidson <[email protected]>
Certain NetworkResourceLoader callbacks can deref a null m_networkLoad.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (201452 => 201453)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-27 16:05:25 UTC (rev 201452)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-27 17:09:14 UTC (rev 201453)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
