Changeset 181743 in webkit

Timestamp:

Mar 19, 2015, 2:01:01 AM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r181679. rdar://problem/20032670

Location:

tags/Safari-601.1.23.3/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/mac/WKView.mm (modified) (1 diff)

tags/Safari-601.1.23.3/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-03-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r181679.
+
+    2015-03-17  Tim Horton  <timothy_horton@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-19  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-601.1.23.3/Source/WebKit/mac/WebView/WebHTMLView.mm

@@ -5389 +5389 @@
 - (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;

tags/Safari-601.1.23.3/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r181679.
+
+    2015-03-17  Tim Horton  <timothy_horton@apple.com>
+
+            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  <bshafiei@apple.com>
 

tags/Safari-601.1.23.3/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -1178 +1178 @@
             return; \
         } \
-        if ([NSMenu menuTypeForEvent:theEvent] == NSMenuTypeActionMenu) { \
+        if ([NSMenu respondsToSelector:@selector(menuTypeForEvent:)] && [NSMenu menuTypeForEvent:theEvent] == NSMenuTypeActionMenu) { \
             [super Selector:theEvent]; \
             return; \