Changeset 179834 in webkit

Timestamp:

Feb 9, 2015, 10:24:23 AM (12 years ago)

Author:

bshafiei@apple.com

Message:

Merged r179809. rdar://problem/19711203

Location:

branches/safari-600.4-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKImmediateActionController.mm (modified) (1 diff)

branches/safari-600.4-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-09  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r179809.
+
+    2015-02-08  Timothy Horton  <timothy_horton@apple.com>
+
+            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  <matthew_hanson@apple.com>
 

branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm

@@ -116 +116 @@
 - (void)_clearImmediateActionState
 {
-    _page->clearTextIndicator();
+    if (_page)
+        _page->clearTextIndicator();
 
     if (_currentActionContext && _hasActivatedActionContext) {