Title: [177336] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 177336
- Author
- [email protected]
- Date
- 2014-12-16 00:02:44 -0800 (Tue, 16 Dec 2014)
Log Message
Merged r177116. <rdar://problem/19198539>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177335 => 177336)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-16 08:01:00 UTC (rev 177335)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-16 08:02:44 UTC (rev 177336)
@@ -1,5 +1,16 @@
2014-12-16 Dana Burkart <[email protected]>
+ Merged r177116. <rdar://problem/19198539>
+
+ 2014-12-10 Beth Dakin <[email protected]>
+
+ Follow-up build fix.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView initWithFrame:context:configuration:webView:]):
+
+2014-12-16 Dana Burkart <[email protected]>
+
Merged r177114. <rdar://problem/19198539>
2014-12-10 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (177335 => 177336)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-16 08:01:00 UTC (rev 177335)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-16 08:02:44 UTC (rev 177336)
@@ -3623,7 +3623,7 @@
}
if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
- RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([[gestureClass alloc] initWithTarget:nil action:NULL]);
+ RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
_data->_immediateActionController = adoptNS([[WKImmediateActionController alloc] initWithPage:*_data->_page view:self]);
[recognizer setDelegate:_data->_immediateActionController.get()];
[self addGestureRecognizer:recognizer.get()];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
