Title: [177335] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 177335
- Author
- dburk...@apple.com
- Date
- 2014-12-16 00:01:00 -0800 (Tue, 16 Dec 2014)
Log Message
Merged r177114. <rdar://problem/19198539>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177334 => 177335)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-16 07:59:49 UTC (rev 177334)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-16 08:01:00 UTC (rev 177335)
@@ -1,3 +1,14 @@
+2014-12-16 Dana Burkart <dburk...@apple.com>
+
+ Merged r177114. <rdar://problem/19198539>
+
+ 2014-12-10 Beth Dakin <bda...@apple.com>
+
+ Speculative build fix.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView initWithFrame:context:configuration:webView:]):
+
2014-12-15 Dana Burkart <dburk...@apple.com>
Merged r177113. <rdar://problem/19198539>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (177334 => 177335)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-16 07:59:49 UTC (rev 177334)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-16 08:01:00 UTC (rev 177335)
@@ -3622,8 +3622,8 @@
self.actionMenu.autoenablesItems = NO;
}
- if (NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
- RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([[NSImmediateActionGestureRecognizer alloc] initWithTarget:nil action:NULL]);
+ if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
+ RetainPtr<NSImmediateActionGestureRecognizer> recognizer = adoptNS([[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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
