Title: [193768] tags/Safari-602.1.13.2/Source/WebKit2
- Revision
- 193768
- Author
- [email protected]
- Date
- 2015-12-08 12:33:00 -0800 (Tue, 08 Dec 2015)
Log Message
Merged r193489. rdar://problem/23766021
Modified Paths
Diff
Modified: tags/Safari-602.1.13.2/Source/WebKit2/ChangeLog (193767 => 193768)
--- tags/Safari-602.1.13.2/Source/WebKit2/ChangeLog 2015-12-08 20:31:55 UTC (rev 193767)
+++ tags/Safari-602.1.13.2/Source/WebKit2/ChangeLog 2015-12-08 20:33:00 UTC (rev 193768)
@@ -1,5 +1,21 @@
2015-12-08 Babak Shafiei <[email protected]>
+ Merge r193489.
+
+ 2015-12-04 Beth Dakin <[email protected]>
+
+ Crash in clients using userData in
+ _immediateActionAnimationControllerForHitTestResult
+ https://bugs.webkit.org/show_bug.cgi?id=151887
+
+ Rubber-stamped by Anders Carlsson.
+
+ Follow-up fix to handle null userData.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _web_immediateActionAnimationControllerForHitTestResultInternal:withType:userData:]):
+
+2015-12-08 Babak Shafiei <[email protected]>
+
Merge r193483.
2015-12-04 Beth Dakin <[email protected]>
Modified: tags/Safari-602.1.13.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193767 => 193768)
--- tags/Safari-602.1.13.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-08 20:31:55 UTC (rev 193767)
+++ tags/Safari-602.1.13.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-08 20:33:00 UTC (rev 193768)
@@ -2761,7 +2761,8 @@
- (id)_web_immediateActionAnimationControllerForHitTestResultInternal:(API::HitTestResult*)hitTestResult withType:(uint32_t)type userData:(API::Object*)userData
{
- return [self _immediateActionAnimationControllerForHitTestResult:wrapper(*hitTestResult) withType:(_WKImmediateActionType)type userData:static_cast<id<NSSecureCoding>>(userData->wrapper())];
+ id<NSSecureCoding> data = "" ? static_cast<id<NSSecureCoding>>(userData->wrapper()) : nil;
+ return [self _immediateActionAnimationControllerForHitTestResult:wrapper(*hitTestResult) withType:(_WKImmediateActionType)type userData:data];
}
// We don't expose these various bits of SPI like WKView does,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
