Title: [181679] trunk/Source
- Revision
- 181679
- Author
- timothy_hor...@apple.com
- Date
- 2015-03-17 18:34:25 -0700 (Tue, 17 Mar 2015)
Log Message
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.
* WebView/WebHTMLView.mm:
(-[WebHTMLView otherMouseDown:]):
Need a respondsToSelector check.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (181678 => 181679)
--- trunk/Source/WebKit/mac/ChangeLog 2015-03-18 01:32:27 UTC (rev 181678)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-03-18 01:34:25 UTC (rev 181679)
@@ -1,5 +1,15 @@
2015-03-17 Tim Horton <timothy_hor...@apple.com>
+ 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-17 Tim Horton <timothy_hor...@apple.com>
+
Fix the iOS build
* WebView/WebHTMLView.mm:
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (181678 => 181679)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-03-18 01:32:27 UTC (rev 181678)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-03-18 01:34:25 UTC (rev 181679)
@@ -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: trunk/Source/WebKit2/ChangeLog (181678 => 181679)
--- trunk/Source/WebKit2/ChangeLog 2015-03-18 01:32:27 UTC (rev 181678)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-18 01:34:25 UTC (rev 181679)
@@ -4,6 +4,15 @@
https://bugs.webkit.org/show_bug.cgi?id=142797
<rdar://problem/20032670>
+ * UIProcess/API/mac/WKView.mm:
+ Need a respondsToSelector check.
+
+2015-03-17 Tim Horton <timothy_hor...@apple.com>
+
+ Cannot invoke action menus anymore
+ https://bugs.webkit.org/show_bug.cgi?id=142797
+ <rdar://problem/20032670>
+
Reviewed by Beth Dakin.
* UIProcess/API/mac/WKView.mm:
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (181678 => 181679)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-18 01:32:27 UTC (rev 181678)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-18 01:34:25 UTC (rev 181679)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
