REGRESSION(r167770): Cannot login in Evernote Safari extension

https://bugs.webkit.org/show_bug.cgi?id=134776

Reviewed by Enrica Casucci.

Unfortunately, NSWindowDidBecomeKeyNotification does not notify us when a popover becomes key
so we need to keep using the SPI (_windowChangedKeyState) I removed in r167770.

* WebView/WebView.mm:
(-[WebView _windowChangedKeyState]):

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

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index a8145fb8c01cb2605c87db724663d02659bf9d89..de96661ad41e0ee3bb9c04794038edc98f549805 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,16 @@
+2014-07-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r167770): Cannot login in Evernote Safari extension
+        https://bugs.webkit.org/show_bug.cgi?id=134776
+
+        Reviewed by Enrica Casucci.
+
+        Unfortunately, NSWindowDidBecomeKeyNotification does not notify us when a popover becomes key
+        so we need to keep using the SPI (_windowChangedKeyState) I removed in r167770.
+
+        * WebView/WebView.mm:
+        (-[WebView _windowChangedKeyState]):
+
 2014-07-09  Enrica Casucci  <enrica@apple.com>
 
         Implement Editor::fontAttributesForSelectionStart() or iOS.

diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm
index 7cda62474470c14f373095d8d1672b3a6e04bcc1..14f077bf277e238cc9f585730a16d5c2d03f12c0 100644 (file)
--- a/Source/WebKit/mac/WebView/WebView.mm
+++ b/Source/WebKit/mac/WebView/WebView.mm
@@ -295,6 +295,7 @@
 - (NSView *)_hitTest:(NSPoint *)aPoint dragTypes:(NSSet *)types;
 - (void)_autoscrollForDraggingInfo:(id)dragInfo timeDelta:(NSTimeInterval)repeatDelta;
 - (BOOL)_shouldAutoscrollForDraggingInfo:(id)dragInfo;
+- (void)_windowChangedKeyState;
 @end
 
 @interface NSWindow (WebNSWindowDetails)
@@ -5274,6 +5275,12 @@ static NSString * const backingPropertyOldScaleFactorKey = @"NSBackingPropertyOl
         _private->page->chrome().windowScreenDidChange((PlatformDisplayID)[[[[[self window] screen] deviceDescription] objectForKey:@"NSScreenNumber"] intValue]);
 }
 
+- (void)_windowChangedKeyState
+{
+    [self _updateActiveState];
+    [super _windowChangedKeyState];
+}
+
 - (void)windowKeyStateChanged:(NSNotification *)notification
 {
     [self _updateActiveState];