Title: [177410] trunk/Source/WebKit/mac
- Revision
- 177410
- Author
- bda...@apple.com
- Date
- 2014-12-16 16:41:40 -0800 (Tue, 16 Dec 2014)
Log Message
Crash getting default animation controller for some text
https://bugs.webkit.org/show_bug.cgi?id=139712
-and corresponding-
rdar://problem/19271707
Reviewed by Tim Horton.
Must null-check the range.
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController _animationControllerForText]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (177409 => 177410)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-17 00:33:49 UTC (rev 177409)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-17 00:41:40 UTC (rev 177410)
@@ -1,3 +1,16 @@
+2014-12-16 Beth Dakin <bda...@apple.com>
+
+ Crash getting default animation controller for some text
+ https://bugs.webkit.org/show_bug.cgi?id=139712
+ -and corresponding-
+ rdar://problem/19271707
+
+ Reviewed by Tim Horton.
+
+ Must null-check the range.
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController _animationControllerForText]):
+
2014-12-16 Timothy Horton <timothy_hor...@apple.com>
Immediate action popovers can get stuck open
Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (177409 => 177410)
--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2014-12-17 00:33:49 UTC (rev 177409)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2014-12-17 00:41:40 UTC (rev 177410)
@@ -346,6 +346,8 @@
NSDictionary *options = nil;
RefPtr<Range> dictionaryRange = rangeForDictionaryLookupAtHitTestResult(_hitTestResult, &options);
+ if (!dictionaryRange)
+ return nil;
DictionaryPopupInfo dictionaryPopupInfo = dictionaryPopupInfoForRange(frame, *dictionaryRange, options, TextIndicatorPresentationTransition::Bounce);
if (!dictionaryPopupInfo.attributedString)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
