Title: [164818] trunk/Source/WebKit2
Revision
164818
Author
[email protected]
Date
2014-02-27 11:20:08 -0800 (Thu, 27 Feb 2014)

Log Message

[Mac][WK2] Remove hardcoded Cmd+B and Cmd+I from WKView.mm
https://bugs.webkit.org/show_bug.cgi?id=129436

Reviewed by Darin Adler.

* UIProcess/API/mac/WKView.mm: Removed a historic WebKit1 behavior that we don't
need to preserve in WebKit2.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (164817 => 164818)


--- trunk/Source/WebKit2/ChangeLog	2014-02-27 19:11:52 UTC (rev 164817)
+++ trunk/Source/WebKit2/ChangeLog	2014-02-27 19:20:08 UTC (rev 164818)
@@ -1,5 +1,15 @@
 2014-02-27  Alexey Proskuryakov  <[email protected]>
 
+        [Mac][WK2] Remove hardcoded Cmd+B and Cmd+I from WKView.mm
+        https://bugs.webkit.org/show_bug.cgi?id=129436
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/API/mac/WKView.mm: Removed a historic WebKit1 behavior that we don't
+        need to preserve in WebKit2.
+
+2014-02-27  Alexey Proskuryakov  <[email protected]>
+
         [Mac] Remove unused SPI declarations from WKView.mm
         https://bugs.webkit.org/show_bug.cgi?id=129434
 

Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (164817 => 164818)


--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2014-02-27 19:11:52 UTC (rev 164817)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm	2014-02-27 19:20:08 UTC (rev 164818)
@@ -1307,32 +1307,6 @@
         parameters->eventInterpretationHadSideEffects |= eventHandled;
 }
 
-- (BOOL)_handleStyleKeyEquivalent:(NSEvent *)event
-{
-    if (!_data->_page->editorState().isContentEditable)
-        return NO;
-
-    if (([event modifierFlags] & NSDeviceIndependentModifierFlagsMask) != NSCommandKeyMask)
-        return NO;
-    
-    // Here we special case cmd+b and cmd+i but not cmd+u, for historic reason.
-    // This should not be changed, since it could break some Mac applications that
-    // rely on this inherent behavior.
-    // See https://bugs.webkit.org/show_bug.cgi?id=24943
-    
-    NSString *string = [event characters];
-    if ([string caseInsensitiveCompare:@"b"] == NSOrderedSame) {
-        _data->_page->executeEditCommand("ToggleBold");
-        return YES;
-    }
-    if ([string caseInsensitiveCompare:@"i"] == NSOrderedSame) {
-        _data->_page->executeEditCommand("ToggleItalic");
-        return YES;
-    }
-    
-    return NO;
-}
-
 - (BOOL)performKeyEquivalent:(NSEvent *)event
 {
     // There's a chance that responding to this event will run a nested event loop, and
@@ -1354,7 +1328,7 @@
         return YES;
     }
     
-    return [self _handleStyleKeyEquivalent:event] || [super performKeyEquivalent:event];
+    return [super performKeyEquivalent:event];
 }
 
 - (void)keyUp:(NSEvent *)theEvent
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to