Title: [193767] tags/Safari-602.1.13.2/Source/WebKit2
- Revision
- 193767
- Author
- [email protected]
- Date
- 2015-12-08 12:31:55 -0800 (Tue, 08 Dec 2015)
Log Message
Merged r193483. rdar://problem/23766021
Modified Paths
Diff
Modified: tags/Safari-602.1.13.2/Source/WebKit2/ChangeLog (193766 => 193767)
--- tags/Safari-602.1.13.2/Source/WebKit2/ChangeLog 2015-12-08 20:24:04 UTC (rev 193766)
+++ tags/Safari-602.1.13.2/Source/WebKit2/ChangeLog 2015-12-08 20:31:55 UTC (rev 193767)
@@ -1,3 +1,19 @@
+2015-12-08 Babak Shafiei <[email protected]>
+
+ Merge r193483.
+
+ 2015-12-04 Beth Dakin <[email protected]>
+
+ Crash in clients using userData in
+ _immediateActionAnimationControllerForHitTestResult
+ https://bugs.webkit.org/show_bug.cgi?id=151887
+
+ Reviewed by Sam Weinig.
+
+ Cast this correctly.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _web_immediateActionAnimationControllerForHitTestResultInternal:withType:userData:]):
+
2015-12-06 Babak Shafiei <[email protected]>
Roll out r192796.
Modified: tags/Safari-602.1.13.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193766 => 193767)
--- tags/Safari-602.1.13.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-08 20:24:04 UTC (rev 193766)
+++ tags/Safari-602.1.13.2/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-08 20:31:55 UTC (rev 193767)
@@ -2761,7 +2761,7 @@
- (id)_web_immediateActionAnimationControllerForHitTestResultInternal:(API::HitTestResult*)hitTestResult withType:(uint32_t)type userData:(API::Object*)userData
{
- return [self _immediateActionAnimationControllerForHitTestResult:wrapper(*hitTestResult) withType:(_WKImmediateActionType)type userData:(id)userData];
+ return [self _immediateActionAnimationControllerForHitTestResult:wrapper(*hitTestResult) withType:(_WKImmediateActionType)type userData:static_cast<id<NSSecureCoding>>(userData->wrapper())];
}
// 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
