Title: [193483] trunk/Source/WebKit2
- Revision
- 193483
- Author
- bda...@apple.com
- Date
- 2015-12-04 15:22:29 -0800 (Fri, 04 Dec 2015)
Log Message
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:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (193482 => 193483)
--- trunk/Source/WebKit2/ChangeLog 2015-12-04 23:15:34 UTC (rev 193482)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-04 23:22:29 UTC (rev 193483)
@@ -1,3 +1,15 @@
+2015-12-04 Beth Dakin <bda...@apple.com>
+
+ 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-04 Gavin Barraclough <barraclo...@apple.com>
Background state not being tracked correctly for PDFs on iOS
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193482 => 193483)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-04 23:15:34 UTC (rev 193482)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-04 23:22:29 UTC (rev 193483)
@@ -2771,7 +2771,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
