Title: [181743] tags/Safari-601.1.23.3/Source
- Revision
- 181743
- Author
- [email protected]
- Date
- 2015-03-19 02:01:01 -0700 (Thu, 19 Mar 2015)
Log Message
Merged r181679. rdar://problem/20032670
Modified Paths
Diff
Modified: tags/Safari-601.1.23.3/Source/WebKit/mac/ChangeLog (181742 => 181743)
--- tags/Safari-601.1.23.3/Source/WebKit/mac/ChangeLog 2015-03-19 08:58:48 UTC (rev 181742)
+++ tags/Safari-601.1.23.3/Source/WebKit/mac/ChangeLog 2015-03-19 09:01:01 UTC (rev 181743)
@@ -1,5 +1,19 @@
2015-03-19 Babak Shafiei <[email protected]>
+ Merge r181679.
+
+ 2015-03-17 Tim Horton <[email protected]>
+
+ Cannot invoke action menus anymore
+ https://bugs.webkit.org/show_bug.cgi?id=142797
+ <rdar://problem/20032670>
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView otherMouseDown:]):
+ Need a respondsToSelector check.
+
+2015-03-19 Babak Shafiei <[email protected]>
+
Merge r181674.
2015-03-17 Tim Horton <[email protected]>
Modified: tags/Safari-601.1.23.3/Source/WebKit/mac/WebView/WebHTMLView.mm (181742 => 181743)
--- tags/Safari-601.1.23.3/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-03-19 08:58:48 UTC (rev 181742)
+++ tags/Safari-601.1.23.3/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-03-19 09:01:01 UTC (rev 181743)
@@ -5388,7 +5388,7 @@
#if !PLATFORM(IOS)
- (void)otherMouseDown:(NSEvent *)event
{
- if ([event buttonNumber] != 2 || [NSMenu menuTypeForEvent:event] == NSMenuTypeActionMenu) {
+ if ([event buttonNumber] != 2 || ([NSMenu respondsToSelector:@selector(menuTypeForEvent:)] && [NSMenu menuTypeForEvent:event] == NSMenuTypeActionMenu)) {
[super otherMouseDown:event];
return;
}
Modified: tags/Safari-601.1.23.3/Source/WebKit2/ChangeLog (181742 => 181743)
--- tags/Safari-601.1.23.3/Source/WebKit2/ChangeLog 2015-03-19 08:58:48 UTC (rev 181742)
+++ tags/Safari-601.1.23.3/Source/WebKit2/ChangeLog 2015-03-19 09:01:01 UTC (rev 181743)
@@ -1,5 +1,18 @@
2015-03-19 Babak Shafiei <[email protected]>
+ Merge r181679.
+
+ 2015-03-17 Tim Horton <[email protected]>
+
+ Cannot invoke action menus anymore
+ https://bugs.webkit.org/show_bug.cgi?id=142797
+ <rdar://problem/20032670>
+
+ * UIProcess/API/mac/WKView.mm:
+ Need a respondsToSelector check.
+
+2015-03-19 Babak Shafiei <[email protected]>
+
Merge r181668.
2015-03-17 Tim Horton <[email protected]>
Modified: tags/Safari-601.1.23.3/Source/WebKit2/UIProcess/API/mac/WKView.mm (181742 => 181743)
--- tags/Safari-601.1.23.3/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-19 08:58:48 UTC (rev 181742)
+++ tags/Safari-601.1.23.3/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-19 09:01:01 UTC (rev 181743)
@@ -1177,7 +1177,7 @@
}]; \
return; \
} \
- if ([NSMenu menuTypeForEvent:theEvent] == NSMenuTypeActionMenu) { \
+ if ([NSMenu respondsToSelector:@selector(menuTypeForEvent:)] && [NSMenu menuTypeForEvent:theEvent] == NSMenuTypeActionMenu) { \
[super Selector:theEvent]; \
return; \
} \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
