Title: [179834] branches/safari-600.4-branch/Source/WebKit2
- Revision
- 179834
- Author
- [email protected]
- Date
- 2015-02-09 10:24:23 -0800 (Mon, 09 Feb 2015)
Log Message
Merged r179809. rdar://problem/19711203
Modified Paths
Diff
Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (179833 => 179834)
--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-02-09 18:23:13 UTC (rev 179833)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-02-09 18:24:23 UTC (rev 179834)
@@ -1,3 +1,23 @@
+2015-02-09 Babak Shafiei <[email protected]>
+
+ Merge r179809.
+
+ 2015-02-08 Timothy Horton <[email protected]>
+
+ Null deref in _clearImmediateActionState when closing a view with a DataDetectors popover open
+ https://bugs.webkit.org/show_bug.cgi?id=141377
+ <rdar://problem/19711203>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _clearImmediateActionState]):
+ We can have already detached the page when DataDetectors calls us back
+ in interactionStoppedHandler. While we have kept a strong reference to the
+ page in the interactionStoppedHandler block, _page is nulled out.
+ It's OK to avoid doing this work, in any case, because closing a page
+ tears down the TextIndicator anyway.
+
2015-01-29 Matthew Hanson <[email protected]>
Merge r179339. rdar://problem/19619999
Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179833 => 179834)
--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-02-09 18:23:13 UTC (rev 179833)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-02-09 18:24:23 UTC (rev 179834)
@@ -115,7 +115,8 @@
- (void)_clearImmediateActionState
{
- _page->clearTextIndicator();
+ if (_page)
+ _page->clearTextIndicator();
if (_currentActionContext && _hasActivatedActionContext) {
_hasActivatedActionContext = NO;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
