Changeset 167770 in webkit

Timestamp:

Apr 24, 2014 1:24:13 PM (10 years ago)

Author:

rniwa@webkit.org

Message:

Text caret disappears in Mail after returning from another application
​https://bugs.webkit.org/show_bug.cgi?id=132111

Reviewed by Darin Adler.

The bug was caused by our SPI _windowChangedKeyState not getting called upon deminiaturization.

Fixed the bug by using the standard NSWindowDidBecomeKeyNotification and NSWindowDidResignKeyNotification
notifications as done in WebKit2 since they DO get called upon deminiaturization.

• WebView/WebView.mm:

(-[WebView addWindowObserversForWindow:]):
(-[WebView removeWindowObservers]):
(-[WebView _windowKeyStateChanged:]):
(-[WebView _windowChangedKeyState]): Deleted.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (4 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-04-24  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Text caret disappears in Mail after returning from another application
+        https://bugs.webkit.org/show_bug.cgi?id=132111
+
+        Reviewed by Darin Adler.
+
+        The bug was caused by our SPI _windowChangedKeyState not getting called upon deminiaturization.
+
+        Fixed the bug by using the standard NSWindowDidBecomeKeyNotification and NSWindowDidResignKeyNotification
+        notifications as done in WebKit2 since they DO get called upon deminiaturization.
+
+        * WebView/WebView.mm:
+        (-[WebView addWindowObserversForWindow:]):
+        (-[WebView removeWindowObservers]):
+        (-[WebView _windowKeyStateChanged:]):
+        (-[WebView _windowChangedKeyState]): Deleted.
+
 2014-04-24  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -292 +292 @@
 - (void)_autoscrollForDraggingInfo:(id)dragInfo timeDelta:(NSTimeInterval)repeatDelta;
 - (BOOL)_shouldAutoscrollForDraggingInfo:(id)dragInfo;
-- (void)_windowChangedKeyState;
 @end
 
@@ -5228 +5227 @@
 {
     if (window) {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowKeyStateChanged:)
+            name:NSWindowDidBecomeKeyNotification object:window];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowKeyStateChanged:)
+            name:NSWindowDidResignKeyNotification object:window];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowWillOrderOnScreen:)
             name:WKWindowWillOrderOnScreenNotification() object:window];
@@ -5252 +5255 @@
     if (window) {
         [[NSNotificationCenter defaultCenter] removeObserver:self
+            name:NSWindowDidBecomeKeyNotification object:window];
+        [[NSNotificationCenter defaultCenter] removeObserver:self
+            name:NSWindowDidResignKeyNotification object:window];
+        [[NSNotificationCenter defaultCenter] removeObserver:self
             name:WKWindowWillOrderOnScreenNotification() object:window];
         [[NSNotificationCenter defaultCenter] removeObserver:self
@@ -5338 +5345 @@
 }
 
-- (void)_windowChangedKeyState
+- (void)windowKeyStateChanged:(NSNotification *)notification
 {
     [self _updateActiveState];
-
-    [super _windowChangedKeyState];
 }