Remove call to WKShowKeyAndMain
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Apr 2017 21:44:20 +0000 (21:44 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Apr 2017 21:44:20 +0000 (21:44 +0000)
https://bugs.webkit.org/show_bug.cgi?id=170691
rdar://problem/31050032

Reviewed by Beth Dakin.

* Carbon/CarbonWindowAdapter.mm:
(-[CarbonWindowAdapter makeKeyWindow]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@215204 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm
Source/WebKit/mac/ChangeLog

index 83d737a..6009dfc 100644 (file)
@@ -661,14 +661,13 @@ static OSStatus NSCarbonWindowHandleEvent(EventHandlerCallRef inEventHandlerCall
        }
 }
 
-- (void)makeKeyWindow {
-       [NSApp _setMouseActivationInProgress:NO];
-       [NSApp setIsActive:YES];
-       [super makeKeyWindow];
-       WKShowKeyAndMain();
+- (void)makeKeyWindow
+{
+    [NSApp _setMouseActivationInProgress:NO];
+    [NSApp setIsActive:YES];
+    [super makeKeyWindow];
 }
 
-
 // Do the right thing for a Carbon window.
 - (BOOL)canBecomeKeyWindow {
 
index 9ccd8a0..e6d7389 100644 (file)
@@ -1,3 +1,14 @@
+2017-04-10  Anders Carlsson  <andersca@apple.com>
+
+        Remove call to WKShowKeyAndMain
+        https://bugs.webkit.org/show_bug.cgi?id=170691
+        rdar://problem/31050032
+
+        Reviewed by Beth Dakin.
+
+        * Carbon/CarbonWindowAdapter.mm:
+        (-[CarbonWindowAdapter makeKeyWindow]):
+
 2017-04-10  Jeremy Jones  <jeremyj@apple.com>
 
         Add CoreAudioCaptureSource.